Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-801] Resolve merge conflict

This commit is contained in:
Christian Holzer 2015-10-29 16:26:26 +01:00
parent 483ee9de15
commit a794f7ee7a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
View File

@ -278,7 +278,7 @@ public class Parser {
if (option.name.startsWith(AT)) { if (option.name.startsWith(AT)) {
final FilterExpressionEOFContext filterExpCtx = final FilterExpressionEOFContext filterExpCtx =
(FilterExpressionEOFContext) parseRule(option.value, ParserEntryRules.FilterExpression); (FilterExpressionEOFContext) parseRule(option.value, ParserEntryRules.FilterExpression);
final ExpressionImpl expression = ((FilterOptionImpl) uriParseTreeVisitor final ExpressionImpl expression = (ExpressionImpl)((FilterOptionImpl) uriParseTreeVisitor
.visitFilterExpressionEOF(filterExpCtx)).getExpression(); .visitFilterExpressionEOF(filterExpCtx)).getExpression();
final UriParameterImpl parameter = new UriParameterImpl(); final UriParameterImpl parameter = new UriParameterImpl();

2
lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
View File

@ -2143,7 +2143,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> {
@Override @Override
public Object visitSelectEOF(final SelectEOFContext ctx) { public Object visitSelectEOF(final SelectEOFContext ctx) {
context.contextReadingQueryPart = true; context.contextReadingQueryPart = true;
List<SelectItemImpl> selectItems = new ArrayList<SelectItemImpl>(); List<SelectItem> selectItems = new ArrayList<SelectItem>();
for (SelectItemContext si : ctx.vlSI) { for (SelectItemContext si : ctx.vlSI) {
selectItems.add((SelectItem) si.accept(this)); selectItems.add((SelectItem) si.accept(this));
} }

2
lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
View File

@ -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.EdmProperty;
import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType; 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.OData;
import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.edmx.EdmxReference; 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.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; 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.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.UriParserSemanticException.MessageKeys;
import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException;
import org.apache.olingo.server.core.uri.testutil.FilterValidator; import org.apache.olingo.server.core.uri.testutil.FilterValidator;