Repository: olingo-odata4 Updated Branches: refs/heads/master 483ee9de1 -> a794f7ee7
[OLINGO-801] Resolve merge conflict Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a794f7ee Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a794f7ee Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a794f7ee Branch: refs/heads/master Commit: a794f7ee7a03426082f0153e9c15f10f636c4730 Parents: 483ee9d Author: Christian Holzer <[email protected]> Authored: Thu Oct 29 16:26:26 2015 +0100 Committer: Christian Holzer <[email protected]> Committed: Thu Oct 29 16:26:26 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/olingo/server/core/uri/parser/Parser.java | 2 +- .../apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java | 2 +- .../apache/olingo/server/core/uri/antlr/TestFullResourcePath.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a794f7ee/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java index 9beb251..8732341 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java @@ -278,7 +278,7 @@ public class Parser { if (option.name.startsWith(AT)) { final FilterExpressionEOFContext filterExpCtx = (FilterExpressionEOFContext) parseRule(option.value, ParserEntryRules.FilterExpression); - final ExpressionImpl expression = ((FilterOptionImpl) uriParseTreeVisitor + final ExpressionImpl expression = (ExpressionImpl)((FilterOptionImpl) uriParseTreeVisitor .visitFilterExpressionEOF(filterExpCtx)).getExpression(); final UriParameterImpl parameter = new UriParameterImpl(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a794f7ee/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java index 42ca097..eaf1075 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java @@ -2143,7 +2143,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public Object visitSelectEOF(final SelectEOFContext ctx) { context.contextReadingQueryPart = true; - List<SelectItemImpl> selectItems = new ArrayList<SelectItemImpl>(); + List<SelectItem> selectItems = new ArrayList<SelectItem>(); for (SelectItemContext si : ctx.vlSI) { selectItems.add((SelectItem) si.accept(this)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a794f7ee/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java index 566318c..d5d4257 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java @@ -32,6 +32,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.commons.core.Encoder; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.edmx.EdmxReference; @@ -41,6 +42,7 @@ import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKin import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; import org.apache.olingo.server.core.uri.parser.UriParserException; +import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException.MessageKeys; import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; import org.apache.olingo.server.core.uri.testutil.FilterValidator;
