http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java index b6b6fda..b0312ce 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -63,19 +63,20 @@ public class UriContext { */ public ExpandItemImpl contextExpandItemPath; // CHECKSTYLE:ON (Maven checkstyle) - - //CHECKSTYLE:OFF (Maven checkstyle) + + // CHECKSTYLE:OFF (Maven checkstyle) /** - * Set to true in method {@link UriParseTreeVisitor#visitExpandPath} right before - * calling {@link org.apache.olingo.server.core.uri.parser.UriParseTreeVisitor#readResourcePathSegment} - * After reading the path the variable is set back to false - * - * readResourcePathSegment handles all navigation properties, it depends on the context if key predicates are allowed or not. - * In case of expand + * Set to true in method {@link UriParseTreeVisitor#visitExpandPath} right before + * calling {@link org.apache.olingo.server.core.uri.parser.UriParseTreeVisitor#readResourcePathSegment} After reading + * the path the variable is set back to false + * + * readResourcePathSegment handles all navigation properties, it depends on the context if key predicates are allowed + * or not. + * In case of expand */ public boolean contextVisitExpandResourcePath; - //CHECKSTYLE:ON (Maven checkstyle) - + // CHECKSTYLE:ON (Maven checkstyle) + // CHECKSTYLE:OFF (Maven checkstyle) /** * Set within method @@ -95,12 +96,12 @@ public class UriContext { */ public UriInfoImpl contextUriInfo; public boolean contextReadingFunctionParameters; - + /** * Set to true if the parser operates on query part. */ public boolean contextReadingQueryPart; - + public UriContext() { contextExpandItemPath = null;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java index 4649ac5..72bab53 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -93,7 +93,7 @@ public class UriDecoder { * @return list of elements (can be empty) */ static List<String> splitSkipEmpty(final String input, final char c) { - if(input.isEmpty() || input.length() == 1 && input.charAt(0) == c) { + if (input.isEmpty() || input.length() == 1 && input.charAt(0) == c) { return Collections.emptyList(); } @@ -103,13 +103,13 @@ public class UriDecoder { int end; while ((end = input.indexOf(c, start)) >= 0) { - if(start != end) { + if (start != end) { list.add(input.substring(start, end)); } start = end + 1; } - if(input.charAt(input.length()-1) != c) { + if (input.charAt(input.length() - 1) != c) { list.add(input.substring(start)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/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 1e33a19..e4772c4 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 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -82,9 +82,7 @@ import org.apache.olingo.server.core.uri.UriResourceStartingTypeFilterImpl; import org.apache.olingo.server.core.uri.UriResourceTypedImpl; import org.apache.olingo.server.core.uri.UriResourceValueImpl; import org.apache.olingo.server.core.uri.UriResourceWithKeysImpl; -import org.apache.olingo.server.core.uri.antlr.UriLexer; -import org.apache.olingo.server.core.uri.antlr.UriParserBaseVisitor; -import org.apache.olingo.server.core.uri.antlr.UriParserParser; +import org.apache.olingo.server.core.uri.antlr.*; import org.apache.olingo.server.core.uri.antlr.UriParserParser.AllEOFContext; import org.apache.olingo.server.core.uri.antlr.UriParserParser.AllExprContext; import org.apache.olingo.server.core.uri.antlr.UriParserParser.AltAddContext; @@ -311,7 +309,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { final boolean checkFirst = context.contextUriInfo.getLastResourcePart() == null - || context.contextUriInfo.getLastResourcePart() instanceof UriResourceRootImpl; + || context.contextUriInfo.getLastResourcePart() instanceof UriResourceRootImpl; String odi = ctx.vODI.getText(); @@ -335,7 +333,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { EdmEntitySet edmEntitySet = edmEntityContainer.getEntitySet(odi); if (edmEntitySet != null && (parts.isEmpty() || !(parts.get(0) instanceof UriResourcePartTyped) - || parts.get(0) instanceof UriResourceRoot)) { + || parts.get(0) instanceof UriResourceRoot)) { ensureNamespaceIsNull(ctx.vNS); context.contextUriInfo.addResourcePart( new UriResourceEntitySetImpl().setEntitSet(edmEntitySet)); @@ -346,7 +344,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { EdmSingleton edmSingleton = edmEntityContainer.getSingleton(odi); if (edmSingleton != null && (parts.isEmpty() || !(parts.get(0) instanceof UriResourcePartTyped) - || parts.get(0) instanceof UriResourceRoot)) { + || parts.get(0) instanceof UriResourceRoot)) { ensureNamespaceIsNull(ctx.vNS); context.contextUriInfo.addResourcePart( new UriResourceSingletonImpl().setSingleton(edmSingleton)); @@ -357,7 +355,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { EdmActionImport edmActionImport = edmEntityContainer.getActionImport(odi); if (edmActionImport != null && (parts.isEmpty() || !(parts.get(0) instanceof UriResourcePartTyped) - || parts.get(0) instanceof UriResourceRoot)) { + || parts.get(0) instanceof UriResourceRoot)) { ensureNamespaceIsNull(ctx.vNS); context.contextUriInfo.addResourcePart( new UriResourceActionImpl().setActionImport(edmActionImport)); @@ -366,15 +364,15 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { // check FunctionImport EdmFunctionImport edmFunctionImport = edmEntityContainer.getFunctionImport(odi); - - if(edmFunctionImport != null && context.contextReadingQueryPart) { - throw wrap(new UriParserSemanticException("Function Imports are not allowed in $filter or $orderby", + + if (edmFunctionImport != null && context.contextReadingQueryPart) { + throw wrap(new UriParserSemanticException("Function Imports are not allowed in $filter or $orderby", UriParserSemanticException.MessageKeys.FUNCTION_IMPORT_NOT_ALLOWED, odi)); } - + if (edmFunctionImport != null && (parts.isEmpty() || !(parts.get(0) instanceof UriResourcePartTyped) - || parts.get(0) instanceof UriResourceRoot)) { + || parts.get(0) instanceof UriResourceRoot)) { // read the URI parameters if (ctx.vlNVO.isEmpty()) { @@ -391,7 +389,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { ctx.vlNVO.remove(0); UriResourceFunctionImpl uriResource = new UriResourceFunctionImpl() - .setFunctionImport(edmFunctionImport, parameters); + .setFunctionImport(edmFunctionImport, parameters); // collect parameter names List<String> names = new ArrayList<String>(); @@ -479,7 +477,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { ctx.depth() > 2 ? // path evaluation inside an expression or for the resource path? UriParserSemanticException.MessageKeys.EXPRESSION_PROPERTY_NOT_IN_TYPE : UriParserSemanticException.MessageKeys.PROPERTY_NOT_IN_TYPE, - structType.getFullQualifiedName().getFullQualifiedNameAsString(), odi)); + structType.getFullQualifiedName().getFullQualifiedNameAsString(), odi)); } if (property instanceof EdmProperty) { @@ -488,13 +486,13 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { || property.getType().getKind() == EdmTypeKind.DEFINITION) { // create simple property UriResourcePrimitivePropertyImpl simpleResource = new UriResourcePrimitivePropertyImpl() - .setProperty((EdmProperty) property); + .setProperty((EdmProperty) property); context.contextUriInfo.addResourcePart(simpleResource); return null; } else { // create complex property UriResourceComplexPropertyImpl complexResource = new UriResourceComplexPropertyImpl() - .setProperty((EdmProperty) property); + .setProperty((EdmProperty) property); context.contextUriInfo.addResourcePart(complexResource); return null; } @@ -507,7 +505,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { } UriResourceNavigationPropertyImpl navigationResource = new UriResourceNavigationPropertyImpl() - .setNavigationProperty((EdmNavigationProperty) property); + .setNavigationProperty((EdmNavigationProperty) property); context.contextUriInfo.addResourcePart(navigationResource); return null; } else { @@ -534,8 +532,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { if (lastResourcePart == null) { // this may be the case if a member expression within a filter starts with a typeCast UriResourceStartingTypeFilterImpl uriResource = new UriResourceStartingTypeFilterImpl() - .setType(filterEntityType) - .setCollection(source.isCollection); + .setType(filterEntityType) + .setCollection(source.isCollection); if (source.isCollection) { uriResource.setCollectionTypeFilter(filterEntityType); } else { @@ -601,15 +599,15 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { throw wrap(new UriParserSemanticException( "Complex typefilter '" + getName(source.type) + "'not compatible type of previous path segment '" + getName(filterComplexType) + "'", - UriParserSemanticException.MessageKeys.INCOMPATIBLE_TYPE_FILTER, getName(source.type))); + UriParserSemanticException.MessageKeys.INCOMPATIBLE_TYPE_FILTER, getName(source.type))); } // is simple complex type cast if (lastResourcePart == null) { // this may be the case if a member expression within a filter starts with a typeCast UriResourceStartingTypeFilterImpl uriResource = new UriResourceStartingTypeFilterImpl() - .setType(filterComplexType) - .setCollection(source.isCollection); + .setType(filterComplexType) + .setCollection(source.isCollection); if (source.isCollection) { uriResource.setCollectionTypeFilter(filterComplexType); @@ -698,8 +696,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { if (function != null) { UriResourceFunctionImpl pathInfoFunction = new UriResourceFunctionImpl() - .setFunction(function) - .setParameters(parameters); + .setFunction(function) + .setParameters(parameters); context.contextUriInfo.addResourcePart(pathInfoFunction); // mark parameters as consumed @@ -712,8 +710,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { if (function != null) { UriResourceFunctionImpl pathInfoFunction = new UriResourceFunctionImpl() - .setFunction(function) - .setParameters(parameters); + .setFunction(function) + .setParameters(parameters); context.contextUriInfo.addResourcePart(pathInfoFunction); // mark parameters as consumed @@ -1073,16 +1071,16 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitCeilingMethodCallExpr(final CeilingMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.CEILING) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.CEILING) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitConcatMethodCallExpr(final ConcatMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.CONCAT) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.CONCAT) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override @@ -1141,9 +1139,9 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitContainsMethodCallExpr(final ContainsMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.CONTAINS) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.CONTAINS) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override @@ -1176,31 +1174,31 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public Object visitDateMethodCallExpr(final DateMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.DATE) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.DATE) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitDayMethodCallExpr(final DayMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.DAY) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.DAY) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitGeoDistanceMethodCallExpr(final GeoDistanceMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.GEODISTANCE) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.GEODISTANCE) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override public Object visitEndsWithMethodCallExpr(final EndsWithMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.ENDSWITH) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.ENDSWITH) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override @@ -1332,7 +1330,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { return expandItem; } - private void validate(UriInfoResource uriInfoResource, ExpandItemImpl expandItem) { + private void validate(final UriInfoResource uriInfoResource, final ExpandItemImpl expandItem) { if (uriInfoResource != null) { EdmEntityType type = getEntityType(uriInfoResource); EdmEntityType name = getEntityType(expandItem.getResourcePath()); @@ -1343,15 +1341,15 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { throw wrap(new UriParserSemanticException( "NavigationProperty '" + name.getName() + "' not found in type '" + type.getFullQualifiedName().getFullQualifiedNameAsString() + "'", - UriParserSemanticException.MessageKeys.EXPRESSION_PROPERTY_NOT_IN_TYPE, - name.getFullQualifiedName().getFullQualifiedNameAsString(), - type.getFullQualifiedName().getFullQualifiedNameAsString())); + UriParserSemanticException.MessageKeys.EXPRESSION_PROPERTY_NOT_IN_TYPE, + name.getFullQualifiedName().getFullQualifiedNameAsString(), + type.getFullQualifiedName().getFullQualifiedNameAsString())); } } } } - private EdmEntityType getEntityType(UriInfoResource test) { + private EdmEntityType getEntityType(final UriInfoResource test) { List<UriResource> parts = test.getUriResourceParts(); if (!parts.isEmpty()) { UriResource lastPart = parts.get(parts.size() - 1); @@ -1419,7 +1417,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { public Object visitFilter(final FilterContext ctx) { context.contextReadingQueryPart = true; final FilterOptionImpl result = new FilterOptionImpl().setExpression((ExpressionImpl) ctx.children.get(2) - .accept(this)); + .accept(this)); context.contextReadingQueryPart = false; return result; @@ -1429,7 +1427,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { public Object visitFilterExpressionEOF(final FilterExpressionEOFContext ctx) { context.contextReadingQueryPart = true; final FilterOptionImpl result = new FilterOptionImpl().setExpression((ExpressionImpl) ctx.children.get(0) - .accept(this)); + .accept(this)); context.contextReadingQueryPart = false; return result; @@ -1438,53 +1436,53 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitFloorMethodCallExpr(final FloorMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.FLOOR) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.FLOOR) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitFractionalsecondsMethodCallExpr(final FractionalsecondsMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.FRACTIONALSECONDS) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.FRACTIONALSECONDS) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitGeoLengthMethodCallExpr(final GeoLengthMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.GEOLENGTH) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.GEOLENGTH) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitHourMethodCallExpr(final HourMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.HOUR) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.HOUR) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitIndexOfMethodCallExpr(final IndexOfMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.INDEXOF) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.INDEXOF) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override public Object visitInlinecount(final InlinecountContext ctx) { final String text = ctx.children.get(2).getText(); return new CountOptionImpl() - .setValue(text.equalsIgnoreCase("true") ? true : false) - .setText(text); + .setValue(text.equalsIgnoreCase("true") ? true : false) + .setText(text); } @Override public ExpressionImpl visitGeoIntersectsMethodCallExpr(final GeoIntersectsMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.GEOINTERSECTS) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.GEOINTERSECTS) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override @@ -1509,8 +1507,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitLengthMethodCallExpr(final LengthMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.LENGTH) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.LENGTH) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override @@ -1534,7 +1532,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitMaxDateTimeMethodCallExpr(final MaxDateTimeMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.MAXDATETIME); + .setMethod(MethodKind.MAXDATETIME); } @Override @@ -1589,21 +1587,21 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitMinDateTimeMethodCallExpr(final MinDateTimeMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.MINDATETIME); + .setMethod(MethodKind.MINDATETIME); } @Override public ExpressionImpl visitMinuteMethodCallExpr(final MinuteMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.MINUTE) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.MINUTE) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitMonthMethodCallExpr(final MonthMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.MONTH) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.MONTH) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override @@ -1646,9 +1644,9 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { if (lastKeyPredicates.size() == 1) { return Collections.singletonList(new UriParameterImpl() - .setName(lastKeyPredicates.get(0)) - .setText(valueText) - .setExpression(expression)); + .setName(lastKeyPredicates.get(0)) + .setText(valueText) + .setExpression(expression)); } else { throw wrap(new UriParserSemanticException("Wrong number of key properties.", UriParserSemanticException.MessageKeys.WRONG_NUMBER_OF_KEY_PROPERTIES, @@ -1666,9 +1664,9 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { // so fill the keylist with this key and return. if (lastKeyPredicates.size() == 1) { return Collections.singletonList(new UriParameterImpl() - .setName(lastKeyPredicates.get(0)) - .setText(valueText) - .setExpression(expression)); + .setName(lastKeyPredicates.get(0)) + .setText(valueText) + .setExpression(expression)); } // There are more keys defined in the EDM, but only one is written in the URI. This is allowed only if @@ -1825,8 +1823,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { final UriResource last = context.contextUriInfo.getLastResourcePart(); final int number = last instanceof UriResourcePartTyped ? ((EdmEntityType) ((UriResourcePartTyped) last) .getType()).getKeyPredicateNames().size() : 0; - throw wrap(new UriParserSemanticException("Wrong number of key properties.", - UriParserSemanticException.MessageKeys.WRONG_NUMBER_OF_KEY_PROPERTIES, Integer.toString(number), "0")); + throw wrap(new UriParserSemanticException("Wrong number of key properties.", + UriParserSemanticException.MessageKeys.WRONG_NUMBER_OF_KEY_PROPERTIES, Integer.toString(number), "0")); } } } @@ -1856,7 +1854,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitNowMethodCallExpr(final NowMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.NOW); + .setMethod(MethodKind.NOW); } @Override @@ -1888,7 +1886,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public Object visitOrderByEOF(final OrderByEOFContext ctx) { context.contextReadingQueryPart = true; - + OrderByOptionImpl orderBy = new OrderByOptionImpl(); for (OrderByItemContext item : ((OrderListContext) ctx.getChild(0)).vlOI) { @@ -1917,7 +1915,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { /* * if (contextUriInfo.getLastResourcePart() == null || * contextUriInfo.getLastResourcePart() instanceof UriResourceRootImpl) { - * + * * } else { * readNextPathInfoSegment(ctx); * } @@ -1936,7 +1934,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @SuppressWarnings("unchecked") List<UriParameter> list = (List<UriParameter>) ctx.vlNVO.get(0).accept(this); ((UriResourceWithKeysImpl) pathInfoSegment) - .setKeyPredicates(list); + .setKeyPredicates(list); } else { throw wrap(new UriParserSemanticException("Key properties not allowed", UriParserSemanticException.MessageKeys.KEY_NOT_ALLOWED)); @@ -1986,7 +1984,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { } @Override - public Object visitBinaryLiteral(BinaryLiteralContext ctx) { + public Object visitBinaryLiteral(final BinaryLiteralContext ctx) { return new LiteralImpl().setText(ctx.getText()) .setType(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary)); } @@ -2002,7 +2000,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { final EdmType type = EdmPrimitiveTypeFactory.getInstance( ctx.getText().contains("e") || ctx.getText().contains("E") ? EdmPrimitiveTypeKind.Double : - EdmPrimitiveTypeKind.Decimal); + EdmPrimitiveTypeKind.Decimal); return new LiteralImpl().setText(ctx.getText()).setType(type); } @@ -2119,22 +2117,22 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { } return new MemberImpl() - .setResourcePath(uriInfoImplpath); + .setResourcePath(uriInfoImplpath); } @Override public ExpressionImpl visitRoundMethodCallExpr(final RoundMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.ROUND) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.ROUND) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitSecondMethodCallExpr(final SecondMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.SECOND) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.SECOND) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override @@ -2157,7 +2155,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { final QueryOptionImpl result = new SelectOptionImpl().setSelectItems(selectItems).setText(ctx.getText()); context.contextReadingQueryPart = false; - + return result; } @@ -2353,7 +2351,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { * if ((et.compatibleTo((EdmStructuralType) prevType))) { * UriResourceStartingTypeFilterImpl resourcePart = new UriResourceStartingTypeFilterImpl(); * resourcePart.setEntryTypeFilter(et); - * + * * uriInfo.addResourcePart(resourcePart); * return this; * } @@ -2409,8 +2407,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { public Object visitSkip(final SkipContext ctx) { final String text = ctx.children.get(2).getText(); return new SkipOptionImpl() - .setValue(Integer.parseInt(text)) - .setText(text); + .setValue(Integer.parseInt(text)) + .setText(text); } @Override @@ -2422,9 +2420,9 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitStartsWithMethodCallExpr(final StartsWithMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.STARTSWITH) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)) - .addParameter((ExpressionImpl) ctx.vE2.accept(this)); + .setMethod(MethodKind.STARTSWITH) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)) + .addParameter((ExpressionImpl) ctx.vE2.accept(this)); } @Override @@ -2445,58 +2443,58 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { @Override public ExpressionImpl visitTimeMethodCallExpr(final TimeMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.TIME) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.TIME) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public Object visitTop(final TopContext ctx) { final String text = ctx.children.get(2).getText(); return new TopOptionImpl() - .setValue(Integer.parseInt(text)) - .setText(text); + .setValue(Integer.parseInt(text)) + .setText(text); } @Override public ExpressionImpl visitToLowerMethodCallExpr(final ToLowerMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.TOLOWER) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.TOLOWER) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitTotalOffsetMinutesMethodCallExpr(final TotalOffsetMinutesMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.TOTALOFFSETMINUTES) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.TOTALOFFSETMINUTES) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitTotalsecondsMethodCallExpr(final TotalsecondsMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.TOTALSECONDS) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.TOTALSECONDS) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitToUpperMethodCallExpr(final ToUpperMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.TOUPPER) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.TOUPPER) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitTrimMethodCallExpr(final TrimMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.TRIM) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.TRIM) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } @Override public ExpressionImpl visitYearMethodCallExpr(final YearMethodCallExprContext ctx) { return new MethodImpl() - .setMethod(MethodKind.YEAR) - .addParameter((ExpressionImpl) ctx.vE1.accept(this)); + .setMethod(MethodKind.YEAR) + .addParameter((ExpressionImpl) ctx.vE1.accept(this)); } private ParseCancellationException wrap(final UriParserException uriParserException) { @@ -2533,13 +2531,13 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> { return new LiteralImpl().setText(ctx.getText()).setType(null); } - + @Override - public Object visitExpandItemsEOF(ExpandItemsEOFContext ctx) { + public Object visitExpandItemsEOF(final ExpandItemsEOFContext ctx) { context.contextReadingQueryPart = true; final Object result = super.visitExpandItemsEOF(ctx); context.contextReadingQueryPart = false; - + return result; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java index 8623d12..44b3783 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java index 9135dd8..33dd321 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -79,12 +79,12 @@ public class UriParserSemanticException extends UriParserException { /** parameter: not implemented part */ NOT_IMPLEMENTED, /** parameter: namespace **/ - NAMESPACE_NOT_ALLOWED_AT_FIRST_ELEMENT, + NAMESPACE_NOT_ALLOWED_AT_FIRST_ELEMENT, /** parameter: complex parameter value */ - COMPLEX_PARAMETER_IN_RESOURCE_PATH, + COMPLEX_PARAMETER_IN_RESOURCE_PATH, /** parameter: function import name */ FUNCTION_IMPORT_NOT_ALLOWED; - + @Override public String getKey() { return name(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSyntaxException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSyntaxException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSyntaxException.java index 31f69d3..895e31e 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSyntaxException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSyntaxException.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -35,7 +35,7 @@ public class UriParserSyntaxException extends UriParserException { /** parameter: $format option value */ WRONG_VALUE_FOR_SYSTEM_QUERY_OPTION_FORMAT, SYSTEM_QUERY_OPTION_LEVELS_NOT_ALLOWED_HERE, - SYNTAX, + SYNTAX, /** parameter: alias name */ DUPLICATED_ALIAS; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchBinaryImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchBinaryImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchBinaryImpl.java index 418d9e7..950383c 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchBinaryImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchBinaryImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,7 +28,8 @@ public class SearchBinaryImpl extends SearchExpressionImpl implements SearchBina private final SearchExpression left; private final SearchExpression right; - public SearchBinaryImpl(SearchExpression left, SearchBinaryOperatorKind operator, SearchExpression right) { + public SearchBinaryImpl(final SearchExpression left, final SearchBinaryOperatorKind operator, + final SearchExpression right) { this.left = left; this.operator = operator; this.right = right; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchExpressionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchExpressionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchExpressionImpl.java index ee5a197..b2970bd 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchExpressionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchExpressionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java index ac0bb7d..4fccb81 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -31,11 +31,11 @@ import org.apache.olingo.server.core.uri.queryoption.SearchOptionImpl; /* * Rewritten grammar * - * SearchExpr ::= ExprOR - * ExprOR ::= ExprAnd ('OR' ExprAnd)* - * ExprAnd ::= Term ('AND'? Term)* - * Term ::= ('NOT')? (Word | Phrase) - * | '(' Expr ')' + * SearchExpr ::= ExprOR + * ExprOR ::= ExprAnd ('OR' ExprAnd)* + * ExprAnd ::= Term ('AND'? Term)* + * Term ::= ('NOT')? (Word | Phrase) + * | '(' Expr ')' */ public class SearchParser { @@ -43,7 +43,7 @@ public class SearchParser { private Iterator<SearchQueryToken> tokens; private SearchQueryToken token; - public SearchOption parse(String searchQuery) throws SearchParserException, SearchTokenizerException { + public SearchOption parse(final String searchQuery) throws SearchParserException, SearchTokenizerException { SearchTokenizer tokenizer = new SearchTokenizer(); SearchExpression searchExpression; try { @@ -51,21 +51,21 @@ public class SearchParser { } catch (SearchTokenizerException e) { String message = e.getMessage(); throw new SearchParserException("Tokenizer exception with message: " + message, - SearchParserException.MessageKeys.TOKENIZER_EXCEPTION, message); + SearchParserException.MessageKeys.TOKENIZER_EXCEPTION, message); } final SearchOptionImpl searchOption = new SearchOptionImpl(); searchOption.setSearchExpression(searchExpression); return searchOption; } - protected SearchExpression parse(List<SearchQueryToken> tokens) throws SearchParserException { + protected SearchExpression parse(final List<SearchQueryToken> tokens) throws SearchParserException { this.tokens = tokens.iterator(); nextToken(); if (token == null) { throw new SearchParserException("No search String", SearchParserException.MessageKeys.NO_EXPRESSION_FOUND); } SearchExpression searchExpression = processSearchExpression(); - if(!isEof()) { + if (!isEof()) { throw new SearchParserException("Token left after end of search query parsing.", SearchParserException.MessageKeys.INVALID_END_OF_QUERY, getTokenAsString()); } @@ -73,41 +73,41 @@ public class SearchParser { } private SearchExpression processSearchExpression() throws SearchParserException { - return processExprOr(); + return processExprOr(); } private SearchExpression processExprOr() throws SearchParserException { SearchExpression left = processExprAnd(); - - while(isToken(Token.OR)) { - nextToken(); // Match OR + + while (isToken(Token.OR)) { + nextToken(); // Match OR final SearchExpression right = processExprAnd(); left = new SearchBinaryImpl(left, SearchBinaryOperatorKind.OR, right); } - + return left; } private SearchExpression processExprAnd() throws SearchParserException { SearchExpression left = processTerm(); - - while(isToken(Token.AND) || isTerm()) { - if(isToken(Token.AND)) { - nextToken(); // Match AND + + while (isToken(Token.AND) || isTerm()) { + if (isToken(Token.AND)) { + nextToken(); // Match AND } final SearchExpression right = processTerm(); left = new SearchBinaryImpl(left, SearchBinaryOperatorKind.AND, right); } - + return left; } private SearchExpression processTerm() throws SearchParserException { - if(isToken(SearchQueryToken.Token.OPEN)) { - nextToken(); // Match OPEN + if (isToken(SearchQueryToken.Token.OPEN)) { + nextToken(); // Match OPEN final SearchExpression expr = processExprOr(); processClose(); - + return expr; } else { // ('NOT')? (Word | Phrase) @@ -137,14 +137,14 @@ public class SearchParser { throw new SearchParserException("NOT must be followed by a term not a " + tokenAsString, SearchParserException.MessageKeys.INVALID_NOT_OPERAND, tokenAsString); } - + private SearchTerm processWordOrPhrase() throws SearchParserException { if (isToken(Token.PHRASE)) { return processPhrase(); } else if (isToken(Token.WORD)) { return processWord(); } - + final String tokenName = getTokenAsString(); throw new SearchParserException("Expected PHRASE||WORD found: " + tokenName, SearchParserException.MessageKeys.EXPECTED_DIFFERENT_TOKEN, @@ -160,21 +160,21 @@ public class SearchParser { private SearchTerm processPhrase() { String literal = token.getLiteral(); nextToken(); - return new SearchTermImpl(literal.substring(1,literal.length()-1)); + return new SearchTermImpl(literal.substring(1, literal.length() - 1)); } - + private boolean isTerm() { return isToken(SearchQueryToken.Token.NOT) || isToken(SearchQueryToken.Token.PHRASE) || isToken(SearchQueryToken.Token.WORD) || isToken(SearchQueryToken.Token.OPEN); } - + private boolean isEof() { return token == null; } - private boolean isToken(SearchQueryToken.Token toCheckToken) { + private boolean isToken(final SearchQueryToken.Token toCheckToken) { return token != null && token.getToken() == toCheckToken; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParserException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParserException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParserException.java index d7af4d4..293bc31 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParserException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParserException.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -36,7 +36,7 @@ public class SearchParserException extends UriParserSyntaxException { EXPECTED_DIFFERENT_TOKEN, /** parameter: actual token */ INVALID_END_OF_QUERY; - + @Override public String getKey() { return name(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchQueryToken.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchQueryToken.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchQueryToken.java index 3fb66f1..0fbab47 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchQueryToken.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchQueryToken.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,8 +19,11 @@ package org.apache.olingo.server.core.uri.parser.search; public interface SearchQueryToken { - enum Token {OPEN, NOT, AND, OR, WORD, PHRASE, CLOSE} + enum Token { + OPEN, NOT, AND, OR, WORD, PHRASE, CLOSE + } Token getToken(); + String getLiteral(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTermImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTermImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTermImpl.java index efd7280..54f7075 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTermImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTermImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,7 +23,7 @@ import org.apache.olingo.server.api.uri.queryoption.search.SearchTerm; public class SearchTermImpl extends SearchExpressionImpl implements SearchTerm { private final String term; - public SearchTermImpl(String term) { + public SearchTermImpl(final String term) { this.term = term; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java index 546135d..4b88869 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -62,39 +62,40 @@ public class SearchTokenizer { protected static final char CHAR_CLOSE = ')'; protected static final char CHAR_OPEN = '('; - public State() { - } - public State(Token t) { + public State() {} + + public State(final Token t) { token = t; } - public State(Token t, boolean finished) { + + public State(final Token t, final boolean finished) { this(t); this.finished = finished; } protected abstract State nextChar(char c) throws SearchTokenizerException; - public State allowed(char c) { + public State allowed(final char c) { return this; } - public State forbidden(char c) throws SearchTokenizerException { - throw new SearchTokenizerException("Forbidden character in state " + this.getToken() + "->" + c, + public State forbidden(final char c) throws SearchTokenizerException { + throw new SearchTokenizerException("Forbidden character in state " + getToken() + "->" + c, SearchTokenizerException.MessageKeys.FORBIDDEN_CHARACTER, "" + c); } public State invalid() throws SearchTokenizerException { - throw new SearchTokenizerException("Token " + this.getToken() + " is in invalid state.", + throw new SearchTokenizerException("Token " + getToken() + " is in invalid state.", SearchTokenizerException.MessageKeys.INVALID_TOKEN_STATE); } public State finish() { - this.finished = true; + finished = true; return this; } - public State finishAs(Token token) { - this.finished = true; + public State finishAs(final Token token) { + finished = true; return changeToken(token); } @@ -102,12 +103,13 @@ public class SearchTokenizer { return finished; } + @Override public Token getToken() { return token; } public String getTokenName() { - if(token == null) { + if (token == null) { return "NULL"; } return token.name(); @@ -117,7 +119,7 @@ public class SearchTokenizer { return this; } - protected State changeToken(Token token) { + protected State changeToken(final Token token) { this.token = token; return this; } @@ -172,13 +174,12 @@ public class SearchTokenizer { return isQCharUnescaped(character) || character == '%'; } - /** * qchar-unescaped = unreserved / pct-encoded-unescaped / other-delims / ":" / "@" / "/" / "?" / "$" / "'" / "=" * @param character which is checked * @return true if character is allowed */ - private static boolean isQCharUnescaped(char character) { + private static boolean isQCharUnescaped(final char character) { return isUnreserved(character) || isOtherDelims(character) || character == ':' @@ -194,7 +195,7 @@ public class SearchTokenizer { * @param character which is checked * @return true if character is allowed */ - private static boolean isOtherDelims(char character) { + private static boolean isOtherDelims(final char character) { return character == '!' || character == '(' || character == ')' @@ -209,7 +210,7 @@ public class SearchTokenizer { * @param character which is checked * @return true if character is allowed */ - private static boolean isUnreserved(char character) { + private static boolean isUnreserved(final char character) { return isAlphaOrDigit(character) || character == '-' || character == '.' @@ -223,7 +224,7 @@ public class SearchTokenizer { * @param character which is checked * @return true if character is allowed */ - private static boolean isAlphaOrDigit(char character) { + private static boolean isAlphaOrDigit(final char character) { return 'A' <= character && character <= 'Z' // case A..Z || 'a' <= character && character <= 'z' // case a..z || '0' <= character && character <= '9'; // case 0..9 @@ -248,20 +249,23 @@ public class SearchTokenizer { private static abstract class LiteralState extends State { protected final StringBuilder literal = new StringBuilder(); + public LiteralState() { super(); } - public LiteralState(Token t, char c) throws SearchTokenizerException { + + public LiteralState(final Token t, final char c) throws SearchTokenizerException { super(t); init(c); } - public LiteralState(Token t, String initLiteral) { + public LiteralState(final Token t, final String initLiteral) { super(t); literal.append(initLiteral); } - public State allowed(char c) { + @Override + public State allowed(final char c) { literal.append(c); return this; } @@ -271,7 +275,7 @@ public class SearchTokenizer { return literal.toString(); } - public State init(char c) throws SearchTokenizerException { + public State init(final char c) throws SearchTokenizerException { if (isFinished()) { throw new SearchTokenizerException(toString() + " is already finished.", SearchTokenizerException.MessageKeys.ALREADY_FINISHED, getTokenName()); @@ -283,7 +287,7 @@ public class SearchTokenizer { private class SearchExpressionState extends LiteralState { @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (c == CHAR_OPEN) { return new OpenState(); } else if (isWhitespace(c)) { @@ -296,14 +300,14 @@ public class SearchTokenizer { } @Override - public State init(char c) throws SearchTokenizerException { + public State init(final char c) throws SearchTokenizerException { return nextChar(c); } } private class SearchTermState extends LiteralState { @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (c == CHAR_N) { return new NotState(c); } else if (c == QUOTATION_MARK) { @@ -315,20 +319,20 @@ public class SearchTokenizer { } @Override - public State init(char c) throws SearchTokenizerException { + public State init(final char c) throws SearchTokenizerException { return nextChar(c); } } private class SearchWordState extends LiteralState { - public SearchWordState(char c) throws SearchTokenizerException { + public SearchWordState(final char c) throws SearchTokenizerException { super(Token.WORD, c); if (!isAllowedWord(c)) { forbidden(c); } } - public SearchWordState(State toConsume) throws SearchTokenizerException { + public SearchWordState(final State toConsume) throws SearchTokenizerException { super(Token.WORD, toConsume.getLiteral()); for (int i = 0; i < literal.length(); i++) { if (!isAllowedWord(literal.charAt(i))) { @@ -338,7 +342,7 @@ public class SearchTokenizer { } @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (isAllowedWord(c)) { return allowed(c); } else if (c == CHAR_CLOSE) { @@ -354,13 +358,13 @@ public class SearchTokenizer { @Override public State finish() { String tmpLiteral = literal.toString(); - if(tmpLiteral.length() == 3) { - if(Token.AND.name().equals(tmpLiteral)) { + if (tmpLiteral.length() == 3) { + if (Token.AND.name().equals(tmpLiteral)) { return finishAs(Token.AND); - } else if(Token.NOT.name().equals(tmpLiteral)) { + } else if (Token.NOT.name().equals(tmpLiteral)) { return finishAs(Token.NOT); } - } else if(tmpLiteral.length() == 2 && Token.OR.name().equals(tmpLiteral)) { + } else if (tmpLiteral.length() == 2 && Token.OR.name().equals(tmpLiteral)) { return finishAs(Token.OR); } return super.finish(); @@ -375,7 +379,8 @@ public class SearchTokenizer { private class SearchPhraseState extends LiteralState { private boolean closed = false; private boolean escaped = false; - public SearchPhraseState(char c) throws SearchTokenizerException { + + public SearchPhraseState(final char c) throws SearchTokenizerException { super(Token.PHRASE, c); if (c != QUOTATION_MARK) { forbidden(c); @@ -383,22 +388,22 @@ public class SearchTokenizer { } @Override - public State nextChar(char c) throws SearchTokenizerException { - if(closed) { + public State nextChar(final char c) throws SearchTokenizerException { + if (closed) { finish(); if (c == CHAR_CLOSE) { return new CloseState(); } else if (isWhitespace(c)) { return new RwsState(); } - } else if(escaped) { + } else if (escaped) { escaped = false; - if(c == QUOTATION_MARK || c == PHRASE_ESCAPE_CHAR) { + if (c == QUOTATION_MARK || c == PHRASE_ESCAPE_CHAR) { return allowed(c); } else { return forbidden(c); } - } else if(c == PHRASE_ESCAPE_CHAR) { + } else if (c == PHRASE_ESCAPE_CHAR) { escaped = true; return this; } else if (isAllowedPhrase(c)) { @@ -406,7 +411,7 @@ public class SearchTokenizer { } else if (isWhitespace(c)) { return allowed(c); } else if (c == QUOTATION_MARK) { - if(literal.length() == 1) { + if (literal.length() == 1) { return invalid(); } closed = true; @@ -417,7 +422,7 @@ public class SearchTokenizer { @Override public State close() throws SearchTokenizerException { - if(closed) { + if (closed) { return finish(); } return invalid(); @@ -430,7 +435,7 @@ public class SearchTokenizer { } @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { finish(); if (isWhitespace(c)) { return forbidden(c); @@ -445,13 +450,13 @@ public class SearchTokenizer { } @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { return new SearchExpressionState().init(c); } } private class NotState extends LiteralState { - public NotState(char c) throws SearchTokenizerException { + public NotState(final char c) throws SearchTokenizerException { super(Token.NOT, c); if (c != CHAR_N) { forbidden(c); @@ -459,7 +464,7 @@ public class SearchTokenizer { } @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (literal.length() == 1 && c == CHAR_O) { return allowed(c); } else if (literal.length() == 2 && c == CHAR_T) { @@ -467,16 +472,17 @@ public class SearchTokenizer { } else if (literal.length() == 3 && isWhitespace(c)) { finish(); return new BeforePhraseOrWordRwsState(); - } else if(isWhitespace(c)) { + } else if (isWhitespace(c)) { changeToken(Token.WORD).finish(); return new RwsState(); } literal.append(c); return new SearchWordState(this); } + @Override public State close() throws SearchTokenizerException { - if(Token.NOT.name().equals(literal.toString())) { + if (Token.NOT.name().equals(literal.toString())) { return finish(); } return changeToken(Token.WORD).finish(); @@ -484,7 +490,7 @@ public class SearchTokenizer { } private class AndState extends LiteralState { - public AndState(char c) throws SearchTokenizerException { + public AndState(final char c) throws SearchTokenizerException { super(Token.AND, c); if (c != CHAR_A) { forbidden(c); @@ -492,7 +498,7 @@ public class SearchTokenizer { } @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (literal.length() == 1 && c == CHAR_N) { return allowed(c); } else if (literal.length() == 2 && c == CHAR_D) { @@ -500,16 +506,17 @@ public class SearchTokenizer { } else if (literal.length() == 3 && isWhitespace(c)) { finish(); return new BeforeSearchExpressionRwsState(); - } else if(isWhitespace(c)) { + } else if (isWhitespace(c)) { changeToken(Token.WORD).finish(); return new RwsState(); } literal.append(c); return new SearchWordState(this); } + @Override public State close() throws SearchTokenizerException { - if(Token.AND.name().equals(literal.toString())) { + if (Token.AND.name().equals(literal.toString())) { return finish(); } return changeToken(Token.WORD).finish(); @@ -517,29 +524,31 @@ public class SearchTokenizer { } private class OrState extends LiteralState { - public OrState(char c) throws SearchTokenizerException { + public OrState(final char c) throws SearchTokenizerException { super(Token.OR, c); if (c != CHAR_O) { forbidden(c); } } + @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (literal.length() == 1 && (c == CHAR_R)) { return allowed(c); } else if (literal.length() == 2 && isWhitespace(c)) { finish(); return new BeforeSearchExpressionRwsState(); - } else if(isWhitespace(c)) { + } else if (isWhitespace(c)) { changeToken(Token.WORD).finish(); return new RwsState(); } literal.append(c); return new SearchWordState(this); } + @Override public State close() throws SearchTokenizerException { - if(Token.OR.name().equals(literal.toString())) { + if (Token.OR.name().equals(literal.toString())) { return finish(); } return changeToken(Token.WORD).finish(); @@ -550,7 +559,7 @@ public class SearchTokenizer { // RWS [ 'AND' RWS ] searchExpr private class BeforeSearchExpressionRwsState extends State { @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (isWhitespace(c)) { return allowed(c); } else { @@ -561,7 +570,7 @@ public class SearchTokenizer { private class BeforePhraseOrWordRwsState extends State { @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (isWhitespace(c)) { return allowed(c); } else if (c == QUOTATION_MARK) { @@ -574,7 +583,7 @@ public class SearchTokenizer { private class RwsState extends State { @Override - public State nextChar(char c) throws SearchTokenizerException { + public State nextChar(final char c) throws SearchTokenizerException { if (isWhitespace(c)) { return allowed(c); } else if (c == CHAR_O) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java index 6ebec5a..bf3baf2 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ public class SearchTokenizerException extends UriParserSyntaxException { private static final long serialVersionUID = -8295456415309640166L; public enum MessageKeys implements MessageKey { - /** parameter: character, TOKEN */ + /** parameter: character, TOKEN */ FORBIDDEN_CHARACTER, /** parameter: TOKEN */ NOT_EXPECTED_TOKEN, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchUnaryImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchUnaryImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchUnaryImpl.java index 51e3a24..8e9335f 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchUnaryImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchUnaryImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ import org.apache.olingo.server.api.uri.queryoption.search.SearchUnaryOperatorKi public class SearchUnaryImpl extends SearchExpressionImpl implements SearchUnary { private final SearchTerm operand; - public SearchUnaryImpl(SearchTerm operand) { + public SearchUnaryImpl(final SearchTerm operand) { this.operand = operand; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/AliasQueryOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/AliasQueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/AliasQueryOptionImpl.java index 3a4fdf1..2f94925 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/AliasQueryOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/AliasQueryOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java index fa35d2e..c4bfa7d 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CountOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CustomQueryOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CustomQueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CustomQueryOptionImpl.java index 371377c..2fe8a01 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CustomQueryOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/CustomQueryOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java index fb1a84e..3ccea06 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -81,7 +81,7 @@ public class ExpandItemImpl implements ExpandItem { topOption = (TopOption) sysItem; } else if (sysItem instanceof LevelsExpandOption) { if (levelsExpandOption != null) { - throw new ODataRuntimeException("$levels"); + throw new ODataRuntimeException("$levels"); } levelsExpandOption = (LevelsExpandOption) sysItem; } @@ -90,7 +90,7 @@ public class ExpandItemImpl implements ExpandItem { private void validateDoubleSystemQueryOption(final SystemQueryOption oldOption, final SystemQueryOption newOption) { if (oldOption != null) { - throw new ODataRuntimeException(newOption.getName()); + throw new ODataRuntimeException(newOption.getName()); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java index bb4986d..05ee260 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java index 50e8c46..4ca1f44 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FilterOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java index 607afbb..e0a47b8 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/FormatOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java index 309b30a..4295630 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/IdOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java index dc17fdc..4388a05 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/LevelsOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByItemImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByItemImpl.java index aac33f0..a1276d3 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByItemImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByItemImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java index 5ff50dc..c23ddb6 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionImpl.java index ac3f721..26fb22d 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java index 51323a8..45a0cd4 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SearchOptionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -35,7 +35,7 @@ public class SearchOptionImpl extends SystemQueryOptionImpl implements SearchOpt return searchExpression; } - public void setSearchExpression(SearchExpression searchExpression) { + public void setSearchExpression(final SearchExpression searchExpression) { this.searchExpression = searchExpression; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/371bf9a5/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectItemImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectItemImpl.java index 13d6436..8ead489 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectItemImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectItemImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
