Mercurial > hg > release > thermostat-1.0
changeset 1286:f1ce8301fdcf
ParsedStatement API clean-up.
Reviewed-by: neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-October/008542.html
| author | Severin Gehwolf <sgehwolf@redhat.com> |
|---|---|
| date | Tue, 22 Oct 2013 18:38:25 +0200 |
| parents | 4b729a28bcad |
| children | 4b1b5692a596 |
| files | storage/core/src/main/java/com/redhat/thermostat/storage/core/ParsedStatement.java storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/ParsedStatementImpl.java storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/PreparedStatementImpl.java storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/SemanticsEnabledDescriptorParser.java |
| diffstat | 4 files changed, 13 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/ParsedStatement.java Fri Oct 18 18:11:03 2013 -0400 +++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/ParsedStatement.java Tue Oct 22 18:38:25 2013 +0200 @@ -40,7 +40,7 @@ /** * An intermediary representation of a {@link PreparedStatement}. - * + * */ public interface ParsedStatement<T extends Pojo> { @@ -56,16 +56,12 @@ */ Statement<T> patchStatement(PreparedParameter[] params) throws IllegalPatchException; - + /** * - * @return The number of free variables. + * @return The number of free variables which the original prepared + * statement string descriptor contained. */ int getNumParams(); - - /** - * - * @return The raw statement. - */ - Statement<T> getRawStatement(); + }
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/ParsedStatementImpl.java Fri Oct 18 18:11:03 2013 -0400 +++ b/storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/ParsedStatementImpl.java Tue Oct 22 18:38:25 2013 +0200 @@ -72,11 +72,6 @@ } @Override - public Statement<T> getRawStatement() { - return statement; - } - - @Override public Statement<T> patchStatement(PreparedParameter[] params) throws IllegalPatchException { if (suffixExpn == null) { String msg = "Suffix expression must be set before patching!"; @@ -188,6 +183,10 @@ throw new IllegalPatchException(invalid); } } + + Statement<T> getRawStatement() { + return statement; + } void setNumFreeParams(int num) { this.numParams = num;
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/PreparedStatementImpl.java Fri Oct 18 18:11:03 2013 -0400 +++ b/storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/PreparedStatementImpl.java Tue Oct 22 18:38:25 2013 +0200 @@ -61,12 +61,12 @@ private Query<T> query; private DataModifyingStatement<T> dmlStatement; private final PreparedParameters params; - private final ParsedStatement<T> parsedStatement; + private final ParsedStatementImpl<T> parsedStatement; public PreparedStatementImpl(BackingStorage storage, StatementDescriptor<T> desc) throws DescriptorParsingException { this.desc = desc; StatementDescriptorParser<T> parser = new SemanticsEnabledDescriptorParser<>(storage, desc); - this.parsedStatement = parser.parse(); + this.parsedStatement = (ParsedStatementImpl<T>)parser.parse(); int numParams = parsedStatement.getNumParams(); params = new PreparedParameters(numParams); Statement<T> statement = parsedStatement.getRawStatement();
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/SemanticsEnabledDescriptorParser.java Fri Oct 18 18:11:03 2013 -0400 +++ b/storage/core/src/main/java/com/redhat/thermostat/storage/internal/statement/SemanticsEnabledDescriptorParser.java Tue Oct 22 18:38:25 2013 +0200 @@ -65,12 +65,12 @@ } public ParsedStatement<T> parse() throws DescriptorParsingException { - ParsedStatement<T> parsed = super.parse(); + ParsedStatementImpl<T> parsed = (ParsedStatementImpl<T>)super.parse(); doSemanticAnalysis(parsed); return parsed; } - private void doSemanticAnalysis(ParsedStatement<T> parsed) throws DescriptorParsingException { + private void doSemanticAnalysis(ParsedStatementImpl<T> parsed) throws DescriptorParsingException { Statement<T> stmt = parsed.getRawStatement(); // statement should never be null Objects.requireNonNull(stmt);