From 9593b53cc80646cb7649a15602a937edbbf3a643 Mon Sep 17 00:00:00 2001 From: Christian Amend Date: Mon, 17 Feb 2014 16:44:32 +0100 Subject: [PATCH] [OLINGO-161] Refactored Java package names --- .../api/ODataConsumer.java | 4 +- .../api/deserializer/AnnotationProperty.java | 2 +- .../api/deserializer/ComplexValue.java | 2 +- .../api/deserializer/ConsumerException.java | 2 +- .../api/deserializer/Entity.java | 2 +- .../api/deserializer/EntitySet.java | 2 +- .../api/deserializer/NavigationProperty.java | 2 +- .../api/deserializer/Property.java | 2 +- .../api/deserializer/Reader.java | 2 +- .../api/deserializer/StructuralProperty.java | 2 +- .../api/deserializer/Value.java | 2 +- .../core/ODataConsumerImpl.java | 4 +- .../deserializer/AnnotationPropertyImpl.java | 4 +- .../core/deserializer/ComplexValueImpl.java | 12 +- .../core/deserializer/EntityImpl.java | 12 +- .../core/deserializer/EntitySetBuilder.java | 4 +- .../core/deserializer/EntitySetImpl.java | 6 +- .../core/deserializer/JsonReader.java | 14 +- .../deserializer/NavigationPropertyImpl.java | 4 +- .../core/deserializer/PrimitiveValue.java | 4 +- .../core/deserializer/PropertyCollection.java | 10 +- .../PropertyCollectionBuilder.java | 16 +- .../deserializer/StructuralPropertyImpl.java | 6 +- .../core/ODataConsumerTest.java | 4 +- .../deserializer/JsonReaderPerformance.java | 13 +- .../core/deserializer/JsonReaderTest.java | 17 +- .../core/testutil/StringHelper.java | 2 +- .../{producer => server}/api/uri/UriInfo.java | 2 +- .../api/uri/UriInfoAll.java | 2 +- .../api/uri/UriInfoBatch.java | 2 +- .../api/uri/UriInfoCrossjoin.java | 2 +- .../api/uri/UriInfoEntityId.java | 12 +- .../api/uri/UriInfoKind.java | 2 +- .../api/uri/UriInfoMetadata.java | 4 +- .../api/uri/UriInfoResource.java | 26 +- .../api/uri/UriInfoService.java | 2 +- .../api/uri/UriParameter.java | 4 +- .../api/uri/UriResource.java | 2 +- .../api/uri/UriResourceAction.java | 2 +- .../api/uri/UriResourceComplexProperty.java | 2 +- .../api/uri/UriResourceCount.java | 2 +- .../api/uri/UriResourceEntitySet.java | 2 +- .../api/uri/UriResourceFunction.java | 2 +- .../api/uri/UriResourceIt.java | 2 +- .../api/uri/UriResourceKind.java | 2 +- .../api/uri/UriResourceLambdaAll.java | 4 +- .../api/uri/UriResourceLambdaAny.java | 4 +- .../api/uri/UriResourceLambdaRef.java | 2 +- .../api/uri/UriResourceNavigation.java | 2 +- .../api/uri/UriResourcePartTyped.java | 2 +- .../api/uri/UriResourcePrimitiveProperty.java | 2 +- .../api/uri/UriResourceProperty.java | 2 +- .../api/uri/UriResourceRef.java | 2 +- .../api/uri/UriResourceRoot.java | 2 +- .../api/uri/UriResourceSingleton.java | 2 +- .../uri/UriResourceStartingTypeFilter.java | 2 +- .../api/uri/UriResourceValue.java | 2 +- .../api/uri/optiontree/OptionNode.java | 16 +- .../api/uri/optiontree/OptionProperty.java | 2 +- .../api/uri/queryoption/AliasQueryOption.java | 4 +- .../uri/queryoption/CustomQueryOption.java | 2 +- .../uri/queryoption/ExceptionVisitExpand.java | 2 +- .../api/uri/queryoption/ExpandItem.java | 4 +- .../api/uri/queryoption/ExpandOption.java | 2 +- .../api/uri/queryoption/FilterOption.java | 4 +- .../api/uri/queryoption/FormatOption.java | 2 +- .../api/uri/queryoption/IdOption.java | 2 +- .../uri/queryoption/InlineCountOption.java | 2 +- .../uri/queryoption/LevelsExpandOption.java | 2 +- .../api/uri/queryoption/OrderByItem.java | 4 +- .../api/uri/queryoption/OrderByOption.java | 2 +- .../api/uri/queryoption/QueryOption.java | 2 +- .../api/uri/queryoption/SearchOption.java | 4 +- .../api/uri/queryoption/SelectItem.java | 4 +- .../api/uri/queryoption/SelectOption.java | 2 +- .../api/uri/queryoption/SkipOption.java | 2 +- .../api/uri/queryoption/SkipTokenOption.java | 2 +- .../queryoption/SupportedQueryOptions.java | 2 +- .../uri/queryoption/SystemQueryOption.java | 2 +- .../api/uri/queryoption/TopOption.java | 2 +- .../expression/AliasExpression.java | 2 +- .../expression/BinaryExpression.java | 2 +- .../uri/queryoption/expression/Constant.java | 2 +- .../queryoption/expression/Enumeration.java | 2 +- .../expression/ExceptionVisitExpression.java | 2 +- .../queryoption/expression/Expression.java | 2 +- .../expression/ExpressionVisitor.java | 4 +- .../uri/queryoption/expression/LambdaRef.java | 2 +- .../uri/queryoption/expression/Literal.java | 2 +- .../uri/queryoption/expression/Member.java | 4 +- .../queryoption/expression/MethodCall.java | 2 +- .../expression/SupportedBinaryOperators.java | 2 +- .../expression/SupportedConstants.java | 2 +- .../expression/SupportedMethodCalls.java | 2 +- .../expression/SupportedUnaryOperators.java | 2 +- .../queryoption/expression/TypeLiteral.java | 2 +- .../queryoption/expression/UnaryOperator.java | 2 +- .../expression/VisitableExression.java | 2 +- .../uri/queryoption/search/SearchBinary.java | 2 +- .../queryoption/search/SearchExpression.java | 2 +- .../uri/queryoption/search/SearchTerm.java | 2 +- .../uri/queryoption/search/SearchUnary.java | 2 +- .../SupportedSearchBinaryOperators.java | 2 +- .../search/SupportedSearchUnaryOperators.java | 2 +- odata4-lib/odata4-server-core/pom.xml | 2 +- .../core/uri/antlr/UriLexer.g4 | 0 .../core/uri/antlr/UriParser.g4 | 0 .../{producer => server}/core/uri/Parser.java | 10 +- .../core/uri/UriInfoImpl.java | 76 +++--- .../core/uri/UriParameterImpl.java | 8 +- .../core/uri/UriParseTreeVisitor.java | 256 +++++++++--------- .../core/uri/UriParserException.java | 2 +- .../core/uri/UriParserSemanticException.java | 2 +- .../core/uri/UriParserSyntaxException.java | 2 +- .../core/uri/UriResourceActionImpl.java | 6 +- .../uri/UriResourceComplexPropertyImpl.java | 6 +- .../core/uri/UriResourceCountImpl.java | 6 +- .../core/uri/UriResourceEntitySetImpl.java | 6 +- .../core/uri/UriResourceFunctionImpl.java | 8 +- .../core/uri/UriResourceImpl.java | 6 +- .../core/uri/UriResourceItImpl.java | 6 +- .../core/uri/UriResourceLambdaAllImpl.java | 10 +- .../core/uri/UriResourceLambdaAnyImpl.java | 10 +- .../core/uri/UriResourceLambdaVarImpl.java | 6 +- .../UriResourceNavigationPropertyImpl.java | 6 +- .../uri/UriResourcePrimitivePropertyImpl.java | 6 +- .../core/uri/UriResourceRefImpl.java | 6 +- .../core/uri/UriResourceRootImpl.java | 6 +- .../core/uri/UriResourceSingletonImpl.java | 6 +- .../UriResourceStartingTypeFilterImpl.java | 6 +- .../core/uri/UriResourceTypedImpl.java | 6 +- .../core/uri/UriResourceValueImpl.java | 6 +- .../core/uri/UriResourceWithKeysImpl.java | 8 +- .../uri/queryoption/AliasQueryOptionImpl.java | 6 +- .../queryoption/CustomQueryOptionImpl.java | 4 +- .../core/uri/queryoption/ExpandItemImpl.java | 26 +- .../uri/queryoption/ExpandOptionImpl.java | 8 +- .../uri/queryoption/FilterOptionImpl.java | 8 +- .../uri/queryoption/FormatOptionImpl.java | 6 +- .../core/uri/queryoption/IdOptionImpl.java | 6 +- .../queryoption/InlineCountOptionImpl.java | 6 +- .../uri/queryoption/LevelsOptionImpl.java | 6 +- .../core/uri/queryoption/OrderByItemImpl.java | 6 +- .../uri/queryoption/OrderByOptionImpl.java | 8 +- .../core/uri/queryoption/QueryOptionImpl.java | 4 +- .../uri/queryoption/SearchOptionImpl.java | 8 +- .../core/uri/queryoption/SelectItemImpl.java | 6 +- .../uri/queryoption/SelectOptionImpl.java | 8 +- .../core/uri/queryoption/SkipOptionImpl.java | 6 +- .../uri/queryoption/SkipTokenOptionImpl.java | 6 +- .../queryoption/SystemQueryOptionImpl.java | 6 +- .../core/uri/queryoption/TopOptionImpl.java | 6 +- .../uri/queryoption/expression/AliasImpl.java | 8 +- .../queryoption/expression/BinaryImpl.java | 12 +- .../queryoption/expression/ConstantImpl.java | 10 +- .../expression/EnumerationImpl.java | 8 +- .../expression/ExpressionImpl.java | 4 +- .../queryoption/expression/LambdaRefImpl.java | 10 +- .../queryoption/expression/LiteralImpl.java | 10 +- .../queryoption/expression/MemberImpl.java | 20 +- .../expression/MethodCallImpl.java | 14 +- .../expression/TypeLiteralImpl.java | 10 +- .../uri/queryoption/expression/UnaryImpl.java | 14 +- .../core/testutil/EdmTechProvider.java | 2 +- .../core/testutil/EdmTechTestProvider.java | 2 +- .../core/testutil/ExpandValidator.java | 20 +- .../core/testutil/FilterTreeToText.java | 28 +- .../core/testutil/FilterValidator.java | 48 ++-- .../core/testutil/ParseTreeToText.java | 2 +- .../core/testutil/ParserTest.java | 6 +- .../core/testutil/ParserValidator.java | 6 +- .../core/testutil/TestErrorLogger.java | 2 +- .../core/testutil/TokenValidator.java | 4 +- .../core/testutil/UriLexerWithTrace.java | 4 +- .../core/testutil/UriResourceValidator.java | 54 ++-- .../core/testutil/UriValidator.java | 28 +- .../core/testutil/Validator.java | 2 +- .../core/uri/UriInfoImplTest.java | 55 ++-- .../core/uri/UriParameterImplTest.java | 31 ++- .../core/uri/antlr/TestFullResourcePath.java | 26 +- .../core/uri/antlr/TestLexer.java | 5 +- .../core/uri/antlr/TestParser.java | 4 +- .../core/uri/antlr/TestUriParserImpl.java | 20 +- .../core/uri/queryoption/QueryOptionTest.java | 36 ++- .../expression/ExpressionTest.java | 39 ++- 185 files changed, 802 insertions(+), 748 deletions(-) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/ODataConsumer.java (95%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/AnnotationProperty.java (94%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/ComplexValue.java (95%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/ConsumerException.java (95%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/Entity.java (96%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/EntitySet.java (95%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/NavigationProperty.java (94%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/Property.java (94%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/Reader.java (95%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/StructuralProperty.java (94%) rename odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/{consumer => client}/api/deserializer/Value.java (94%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/ODataConsumerImpl.java (92%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/AnnotationPropertyImpl.java (91%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/ComplexValueImpl.java (85%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/EntityImpl.java (88%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/EntitySetBuilder.java (94%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/EntitySetImpl.java (93%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/JsonReader.java (85%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/NavigationPropertyImpl.java (95%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/PrimitiveValue.java (92%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/PropertyCollection.java (91%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/PropertyCollectionBuilder.java (91%) rename odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/StructuralPropertyImpl.java (92%) rename odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/{consumer => client}/core/ODataConsumerTest.java (92%) rename odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/JsonReaderPerformance.java (84%) rename odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/{consumer => client}/core/deserializer/JsonReaderTest.java (96%) rename odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/{consumer => client}/core/testutil/StringHelper.java (98%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfo.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoAll.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoBatch.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoCrossjoin.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoEntityId.java (76%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoKind.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoMetadata.java (89%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoResource.java (61%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriInfoService.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriParameter.java (89%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResource.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceAction.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceComplexProperty.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceCount.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceEntitySet.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceFunction.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceIt.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceKind.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceLambdaAll.java (89%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceLambdaAny.java (89%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceLambdaRef.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceNavigation.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourcePartTyped.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourcePrimitiveProperty.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceProperty.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceRef.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceRoot.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceSingleton.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceStartingTypeFilter.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/UriResourceValue.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/optiontree/OptionNode.java (78%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/optiontree/OptionProperty.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/AliasQueryOption.java (87%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/CustomQueryOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/ExceptionVisitExpand.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/ExpandItem.java (91%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/ExpandOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/FilterOption.java (87%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/FormatOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/IdOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/InlineCountOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/LevelsExpandOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/OrderByItem.java (89%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/OrderByOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/QueryOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SearchOption.java (87%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SelectItem.java (90%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SelectOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SkipOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SkipTokenOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SupportedQueryOptions.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/SystemQueryOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/TopOption.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/AliasExpression.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/BinaryExpression.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/Constant.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/Enumeration.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/ExceptionVisitExpression.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/Expression.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/ExpressionVisitor.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/LambdaRef.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/Literal.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/Member.java (89%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/MethodCall.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/SupportedBinaryOperators.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/SupportedConstants.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/SupportedMethodCalls.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/SupportedUnaryOperators.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/TypeLiteral.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/UnaryOperator.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/expression/VisitableExression.java (96%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/search/SearchBinary.java (94%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/search/SearchExpression.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/search/SearchTerm.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/search/SearchUnary.java (93%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/search/SupportedSearchBinaryOperators.java (95%) rename odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/{producer => server}/api/uri/queryoption/search/SupportedSearchUnaryOperators.java (95%) rename odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/{producer => server}/core/uri/antlr/UriLexer.g4 (100%) rename odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/{producer => server}/core/uri/antlr/UriParser.g4 (100%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/Parser.java (92%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriInfoImpl.java (71%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriParameterImpl.java (87%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriParseTreeVisitor.java (86%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriParserException.java (96%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriParserSemanticException.java (96%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriParserSyntaxException.java (96%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceActionImpl.java (92%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceComplexPropertyImpl.java (91%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceCountImpl.java (86%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceEntitySetImpl.java (91%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceFunctionImpl.java (92%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceImpl.java (87%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceItImpl.java (90%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceLambdaAllImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceLambdaAnyImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceLambdaVarImpl.java (91%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceNavigationPropertyImpl.java (91%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourcePrimitivePropertyImpl.java (90%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceRefImpl.java (86%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceRootImpl.java (90%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceSingletonImpl.java (91%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceStartingTypeFilterImpl.java (90%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceTypedImpl.java (91%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceValueImpl.java (86%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriResourceWithKeysImpl.java (92%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/AliasQueryOptionImpl.java (84%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/CustomQueryOptionImpl.java (87%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/ExpandItemImpl.java (81%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/ExpandOptionImpl.java (84%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/FilterOptionImpl.java (81%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/FormatOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/IdOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/InlineCountOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/LevelsOptionImpl.java (86%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/OrderByItemImpl.java (87%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/OrderByOptionImpl.java (84%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/QueryOptionImpl.java (90%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/SearchOptionImpl.java (80%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/SelectItemImpl.java (90%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/SelectOptionImpl.java (84%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/SkipOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/SkipTokenOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/SystemQueryOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/TopOptionImpl.java (85%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/AliasImpl.java (81%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/BinaryImpl.java (79%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/ConstantImpl.java (81%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/EnumerationImpl.java (84%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/ExpressionImpl.java (86%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/LambdaRefImpl.java (77%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/LiteralImpl.java (77%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/MemberImpl.java (78%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/MethodCallImpl.java (78%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/TypeLiteralImpl.java (78%) rename odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/UnaryImpl.java (74%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/EdmTechProvider.java (99%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/EdmTechTestProvider.java (98%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/ExpandValidator.java (89%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/FilterTreeToText.java (81%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/FilterValidator.java (88%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/ParseTreeToText.java (98%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/ParserTest.java (90%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/ParserValidator.java (96%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/TestErrorLogger.java (99%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/TokenValidator.java (97%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/UriLexerWithTrace.java (95%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/UriResourceValidator.java (90%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/UriValidator.java (87%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/testutil/Validator.java (94%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriInfoImplTest.java (75%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/UriParameterImplTest.java (91%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/antlr/TestFullResourcePath.java (99%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/antlr/TestLexer.java (99%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/antlr/TestParser.java (99%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/antlr/TestUriParserImpl.java (98%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/QueryOptionTest.java (82%) rename odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/{producer => server}/core/uri/queryoption/expression/ExpressionTest.java (85%) diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/ODataConsumer.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java similarity index 95% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/ODataConsumer.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java index abf6d30ad..07e6aa1cf 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/ODataConsumer.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api; +package org.apache.olingo.odata4.client.api; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; @@ -24,7 +24,7 @@ import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; //TODO: Exceptionhandling public abstract class ODataConsumer { - private static final String IMPLEMENTATION = "org.apache.olingo.odata4.consumer.core.ODataConsumerImpl"; + private static final String IMPLEMENTATION = "org.apache.olingo.odata4.client.core.ODataConsumerImpl"; public static ODataConsumer create() { ODataConsumer instance; diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/AnnotationProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java similarity index 94% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/AnnotationProperty.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java index 439066f96..b9e2492c4 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/AnnotationProperty.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; public interface AnnotationProperty extends Property { String getValue(); diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ComplexValue.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java similarity index 95% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ComplexValue.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java index ab4455f61..1f054a608 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ComplexValue.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; import java.util.List; import java.util.Map; diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ConsumerException.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ConsumerException.java similarity index 95% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ConsumerException.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ConsumerException.java index def46363b..98c53ed1c 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ConsumerException.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ConsumerException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; public class ConsumerException extends Exception { diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Entity.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java similarity index 96% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Entity.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java index 2d4c9b33c..932ac069d 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Entity.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; import java.util.List; import java.util.Map; diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/EntitySet.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java similarity index 95% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/EntitySet.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java index 1efda671e..352e39594 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/EntitySet.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; import java.util.List; diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/NavigationProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java similarity index 94% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/NavigationProperty.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java index 67067ea36..0f7fec735 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/NavigationProperty.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; public interface NavigationProperty extends Property { diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Property.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java similarity index 94% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Property.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java index 7092f72d6..8a7eec177 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Property.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; public interface Property { String getName(); diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Reader.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java similarity index 95% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Reader.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java index cf7b01204..41d2e4d70 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Reader.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; import java.io.InputStream; diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/StructuralProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java similarity index 94% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/StructuralProperty.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java index 3cdc254c9..9ad86d0dd 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/StructuralProperty.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; import java.util.List; diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Value.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java similarity index 94% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Value.java rename to odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java index 7966c50e5..f4d3f0378 100644 --- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Value.java +++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.api.deserializer; +package org.apache.olingo.odata4.client.api.deserializer; public interface Value { boolean isComplex(); diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/ODataConsumerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java similarity index 92% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/ODataConsumerImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java index ec61bba48..460bb22d8 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/ODataConsumerImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core; +package org.apache.olingo.odata4.client.core; +import org.apache.olingo.odata4.client.api.ODataConsumer; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; import org.apache.olingo.odata4.commons.core.ODataCommonsCoreImpl; -import org.apache.olingo.odata4.consumer.api.ODataConsumer; public class ODataConsumerImpl extends ODataConsumer { diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/AnnotationPropertyImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java similarity index 91% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/AnnotationPropertyImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java index f404f02ba..25428ec6d 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/AnnotationPropertyImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; -import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty; public class AnnotationPropertyImpl implements AnnotationProperty { diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/ComplexValueImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java similarity index 85% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/ComplexValueImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java index e50cecfe6..12eb1f8d3 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/ComplexValueImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.util.Collections; import java.util.Map; -import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.client.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.Value; public class ComplexValueImpl extends PropertyCollection implements ComplexValue { diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntityImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java similarity index 88% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntityImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java index dd4808346..f5f06ba74 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntityImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.util.Map; -import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Entity; -import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Property; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.client.api.deserializer.Entity; +import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.client.api.deserializer.Property; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; public class EntityImpl extends PropertyCollection implements Entity { diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetBuilder.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java similarity index 94% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetBuilder.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java index 35a98d879..3f45176cf 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetBuilder.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.io.IOException; -import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; +import org.apache.olingo.odata4.client.api.deserializer.EntitySet; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java similarity index 93% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java index 2b55e4c8a..0a0ab6a84 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.olingo.odata4.consumer.api.deserializer.Entity; -import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; +import org.apache.olingo.odata4.client.api.deserializer.Entity; +import org.apache.olingo.odata4.client.api.deserializer.EntitySet; import com.fasterxml.jackson.core.JsonParseException; diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReader.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java similarity index 85% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReader.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java index 2129a92d8..1777cffbc 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReader.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.io.IOException; import java.io.InputStream; import java.util.Map; -import org.apache.olingo.odata4.consumer.api.deserializer.ConsumerException; -import org.apache.olingo.odata4.consumer.api.deserializer.Entity; -import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; -import org.apache.olingo.odata4.consumer.api.deserializer.Property; -import org.apache.olingo.odata4.consumer.api.deserializer.Reader; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.ConsumerException; +import org.apache.olingo.odata4.client.api.deserializer.Entity; +import org.apache.olingo.odata4.client.api.deserializer.EntitySet; +import org.apache.olingo.odata4.client.api.deserializer.Property; +import org.apache.olingo.odata4.client.api.deserializer.Reader; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException; diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/NavigationPropertyImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java similarity index 95% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/NavigationPropertyImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java index 2a43ca882..e69fd3734 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/NavigationPropertyImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; -import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty; public class NavigationPropertyImpl implements NavigationProperty { diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PrimitiveValue.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java similarity index 92% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PrimitiveValue.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java index 01e9b6183..f510c1b50 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PrimitiveValue.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; -import org.apache.olingo.odata4.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.client.api.deserializer.Value; public class PrimitiveValue implements Value { diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollection.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java similarity index 91% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollection.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java index de5679abc..ce21036f2 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollection.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.util.ArrayList; import java.util.Collections; @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Property; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.client.api.deserializer.Property; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; abstract class PropertyCollection { protected Map annotationProperties = new HashMap(); diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollectionBuilder.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java similarity index 91% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollectionBuilder.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java index fa92ec4a6..37b1202db 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollectionBuilder.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.odata4.consumer.api.deserializer.Entity; -import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Property; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.client.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.client.api.deserializer.Entity; +import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.client.api.deserializer.Property; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.Value; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/StructuralPropertyImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java similarity index 92% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/StructuralPropertyImpl.java rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java index 5e88417d5..b83083f09 100644 --- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/StructuralPropertyImpl.java +++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.Value; public class StructuralPropertyImpl implements StructuralProperty { diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/ODataConsumerTest.java b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java similarity index 92% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/ODataConsumerTest.java rename to odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java index bde0de5b5..91467fb8e 100644 --- a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/ODataConsumerTest.java +++ b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core; +package org.apache.olingo.odata4.client.core; +import org.apache.olingo.odata4.client.api.ODataConsumer; import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.odata4.consumer.api.ODataConsumer; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderPerformance.java b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java similarity index 84% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderPerformance.java rename to odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java index e88c76a34..fb7f4a240 100644 --- a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderPerformance.java +++ b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,11 +25,12 @@ import static org.junit.Assert.assertTrue; import java.io.InputStream; -import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.odata4.consumer.api.deserializer.Property; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Value; -import org.apache.olingo.odata4.consumer.core.testutil.StringHelper; +import org.apache.olingo.odata4.client.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.client.api.deserializer.Property; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.Value; +import org.apache.olingo.odata4.client.core.deserializer.JsonReader; +import org.apache.olingo.odata4.client.core.testutil.StringHelper; import org.junit.Test; public class JsonReaderPerformance { diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderTest.java b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java similarity index 96% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderTest.java rename to odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java index 978282e7d..6fbef0357 100644 --- a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderTest.java +++ b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.deserializer; +package org.apache.olingo.odata4.client.core.deserializer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,13 +31,14 @@ import java.util.List; import junit.framework.Assert; -import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.odata4.consumer.api.deserializer.Entity; -import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; -import org.apache.olingo.odata4.consumer.api.deserializer.Property; -import org.apache.olingo.odata4.consumer.api.deserializer.Reader; -import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.odata4.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.client.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.client.api.deserializer.Entity; +import org.apache.olingo.odata4.client.api.deserializer.EntitySet; +import org.apache.olingo.odata4.client.api.deserializer.Property; +import org.apache.olingo.odata4.client.api.deserializer.Reader; +import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.client.api.deserializer.Value; +import org.apache.olingo.odata4.client.core.deserializer.JsonReader; import org.junit.Test; public class JsonReaderTest { diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/testutil/StringHelper.java b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/testutil/StringHelper.java similarity index 98% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/testutil/StringHelper.java rename to odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/testutil/StringHelper.java index 4344cad47..8097e9f02 100644 --- a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/consumer/core/testutil/StringHelper.java +++ b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/testutil/StringHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.consumer.core.testutil; +package org.apache.olingo.odata4.client.core.testutil; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java index 96e5172e3..ddd86b882 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriInfo extends UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin, diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoAll.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoAll.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java index b2e236a57..9c5bd5c3b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoAll.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriInfoAll { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoBatch.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoBatch.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java index 13b6673b6..703ef369a 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoBatch.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriInfoBatch { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoCrossjoin.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoCrossjoin.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java index fa7d86b27..f055847d2 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoCrossjoin.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoEntityId.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java similarity index 76% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoEntityId.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java index 7a8a31782..93345ae91 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoEntityId.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java @@ -17,16 +17,16 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.IdOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption; /** * Indicates a URL access to an single Entity diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoKind.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoKind.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java index ee8268824..d3f2bafed 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoKind.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public enum UriInfoKind { all, batch, crossjoin, entityId, metadata, resource, service; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoMetadata.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java similarity index 89% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoMetadata.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java index 99157b69c..4d359714e 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoMetadata.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java @@ -17,9 +17,9 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption; public interface UriInfoMetadata { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoResource.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java similarity index 61% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoResource.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java index 8abd90cda..8d3a69adb 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoResource.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import java.util.List; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.IdOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipTokenOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipTokenOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption; public interface UriInfoResource { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoService.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoService.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java index 728690442..7cbc333cd 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoService.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriInfoService { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriParameter.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java similarity index 89% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriParameter.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java index 12a212b7d..6815e857a 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriParameter.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public interface UriParameter { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResource.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResource.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java index 8870c5652..167a1f87e 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResource.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriResource { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceAction.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceAction.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java index f469e032b..bd73fcbaf 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceAction.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmAction; import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceComplexProperty.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceComplexProperty.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java index ffca62477..43840f35e 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceComplexProperty.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceCount.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceCount.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java index f3142dc41..4a661aef5 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceCount.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriResourceCount extends UriResource { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceEntitySet.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceEntitySet.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java index 1b2417030..1cae7f5d3 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceEntitySet.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceFunction.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceFunction.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java index 8e4c6de90..62bda01df 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceFunction.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceIt.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceIt.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java index feaeda2ff..5fe9055e3 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceIt.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceKind.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceKind.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java index 762113344..95ba4021a 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceKind.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public enum UriResourceKind { action, complexProperty, count, entitySet, function, it, lambdaAll, lambdaAny, diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaAll.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java similarity index 89% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaAll.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java index 68a9b0b4b..b28bbb787 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaAll.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public interface UriResourceLambdaAll extends UriResourcePartTyped { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaAny.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java similarity index 89% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaAny.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java index 4912ff23e..b7e2bda70 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaAny.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public interface UriResourceLambdaAny extends UriResourcePartTyped { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaRef.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaRef.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaRef.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaRef.java index 1a79f871f..6bc523d8d 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceLambdaRef.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaRef.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriResourceLambdaRef extends UriResourcePartTyped { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceNavigation.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceNavigation.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java index 5a8a89d63..509e0ed90 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceNavigation.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourcePartTyped.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourcePartTyped.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java index 524c309d8..0f169b181 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourcePartTyped.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourcePrimitiveProperty.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourcePrimitiveProperty.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java index 9383a7876..896959bd9 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourcePrimitiveProperty.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriResourcePrimitiveProperty extends UriResourceProperty { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceProperty.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceProperty.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java index 5ff0fcad9..f743f4908 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceProperty.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmProperty; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceRef.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceRef.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java index 525e7de9b..e8ccb65c1 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceRef.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriResourceRef extends UriResource { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceRoot.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceRoot.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java index 5c4d73ec4..ffe2211cb 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceRoot.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; /** * Class indicating the $root reference. $root may be used within filter to diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceSingleton.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceSingleton.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java index 2f888db8f..82794a7ff 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceSingleton.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceStartingTypeFilter.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceStartingTypeFilter.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceStartingTypeFilter.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceStartingTypeFilter.java index 9f3bef0fd..a488c3c9b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceStartingTypeFilter.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceStartingTypeFilter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceValue.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceValue.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java index 71449b5c8..befcac5be 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriResourceValue.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri; +package org.apache.olingo.odata4.server.api.uri; public interface UriResourceValue extends UriResource { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/optiontree/OptionNode.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionNode.java similarity index 78% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/optiontree/OptionNode.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionNode.java index 31f541db8..be4cbe8bf 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/optiontree/OptionNode.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionNode.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.optiontree; +package org.apache.olingo.odata4.server.api.uri.optiontree; import java.util.List; -import org.apache.olingo.odata4.producer.api.uri.UriResourceProperty; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption; +import org.apache.olingo.odata4.server.api.uri.UriResourceProperty; +import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption; /** * Contains the merged $expand and $select options diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/optiontree/OptionProperty.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionProperty.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/optiontree/OptionProperty.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionProperty.java index bc9c8e23c..a37053c8b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/optiontree/OptionProperty.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.optiontree; +package org.apache.olingo.odata4.server.api.uri.optiontree; import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/AliasQueryOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java similarity index 87% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/AliasQueryOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java index 33901b023..ea1d5ffda 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/AliasQueryOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public interface AliasQueryOption extends QueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/CustomQueryOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/CustomQueryOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java index cbc395b1b..ccd3c228b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/CustomQueryOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface CustomQueryOption extends QueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExceptionVisitExpand.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExceptionVisitExpand.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java index 4e9f332e3..4240f9a9b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExceptionVisitExpand.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public class ExceptionVisitExpand extends Exception { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExpandItem.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java similarity index 91% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExpandItem.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java index 10693b48e..f1f95909c 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExpandItem.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; public interface ExpandItem { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExpandOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExpandOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java index ccfb3944d..216fdd178 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/ExpandOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/FilterOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java similarity index 87% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/FilterOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java index 98b260bce..ed76c5aec 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/FilterOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public interface FilterOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/FormatOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/FormatOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java index 367ab137e..8e327c01f 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/FormatOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface FormatOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/IdOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/IdOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java index 1c23355cc..8369caa60 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/IdOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface IdOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/InlineCountOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/InlineCountOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/InlineCountOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/InlineCountOption.java index 7e9c75bb1..00530dc83 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/InlineCountOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/InlineCountOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface InlineCountOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/LevelsExpandOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/LevelsExpandOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java index d28d5b17d..f2f38c483 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/LevelsExpandOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface LevelsExpandOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/OrderByItem.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java similarity index 89% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/OrderByItem.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java index d5aae4574..9be1b679d 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/OrderByItem.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java @@ -17,9 +17,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public interface OrderByItem { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/OrderByOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/OrderByOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java index 609306fe9..ea16a3ee7 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/OrderByOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/QueryOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/QueryOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java index e1e70d47a..cb2afb5d6 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/QueryOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface QueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SearchOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java similarity index 87% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SearchOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java index a3b2e5bba..8a3f970f8 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SearchOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.search.SearchExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.search.SearchExpression; public interface SearchOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SelectItem.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java similarity index 90% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SelectItem.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java index 53dd69121..75f7566a8 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SelectItem.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; public interface SelectItem { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SelectOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SelectOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java index 7b301fa83..48c0943c5 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SelectOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SkipOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SkipOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java index e9a64e339..e3e5599d0 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SkipOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface SkipOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SkipTokenOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SkipTokenOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java index 94b898ad3..46eeea85d 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SkipTokenOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface SkipTokenOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SupportedQueryOptions.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SupportedQueryOptions.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java index 9b9c13479..047fb8141 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SupportedQueryOptions.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public enum SupportedQueryOptions { FILTER("$filter"), diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SystemQueryOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SystemQueryOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java index 8abafbd23..09edcf0d3 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/SystemQueryOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface SystemQueryOption extends QueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/TopOption.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/TopOption.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java index acaf4635e..ec1ed5981 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/TopOption.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption; +package org.apache.olingo.odata4.server.api.uri.queryoption; public interface TopOption extends SystemQueryOption { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/AliasExpression.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/AliasExpression.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java index e7f41af8e..133a2c1f0 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/AliasExpression.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public interface AliasExpression extends Expression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/BinaryExpression.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/BinaryExpression.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java index bd4d1595b..69bf7a66c 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/BinaryExpression.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public interface BinaryExpression extends Expression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Constant.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Constant.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Constant.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Constant.java index 0961be6a3..b1364505b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Constant.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Constant.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.edm.EdmType; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Enumeration.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Enumeration.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java index d870c5669..126cb9768 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Enumeration.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/ExceptionVisitExpression.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExceptionVisitExpression.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/ExceptionVisitExpression.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExceptionVisitExpression.java index f722ec073..0afed8c39 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/ExceptionVisitExpression.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExceptionVisitExpression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public class ExceptionVisitExpression extends Exception { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Expression.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Expression.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java index 5a1b8b1c0..27501150f 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Expression.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public interface Expression extends VisitableExression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/ExpressionVisitor.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/ExpressionVisitor.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java index ea3bc3e7a..e85d2c2a5 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/ExpressionVisitor.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; public interface ExpressionVisitor { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/LambdaRef.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/LambdaRef.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java index 67a18b692..9e6a071a2 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/LambdaRef.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public interface LambdaRef extends Expression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Literal.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Literal.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java index 1d9a76cf1..95cdffabf 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Literal.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public interface Literal extends Expression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Member.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java similarity index 89% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Member.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java index a15d42207..e0d6d19cc 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/Member.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; public interface Member extends Expression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/MethodCall.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/MethodCall.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java index 31dfe9be9..75ef6f518 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/MethodCall.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import java.util.List; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedBinaryOperators.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedBinaryOperators.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedBinaryOperators.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedBinaryOperators.java index ce52f7670..3e7ca77d2 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedBinaryOperators.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedBinaryOperators.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public enum SupportedBinaryOperators { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedConstants.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedConstants.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedConstants.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedConstants.java index 4813729e8..4e7b83526 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedConstants.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public enum SupportedConstants { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedMethodCalls.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedMethodCalls.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedMethodCalls.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedMethodCalls.java index b3e7804de..cf6d62847 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedMethodCalls.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedMethodCalls.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public enum SupportedMethodCalls { CONTAINS("contains"), STARTSWITH("startswith"), ENDSWITH("endswith"), LENGTH("length"), diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedUnaryOperators.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedUnaryOperators.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedUnaryOperators.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedUnaryOperators.java index cd4a932a9..f0cbf55f0 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/SupportedUnaryOperators.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedUnaryOperators.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public enum SupportedUnaryOperators { MINUS("-"), NOT("not"); diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/TypeLiteral.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/TypeLiteral.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java index 4aa6bcfbb..2dca9874b 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/TypeLiteral.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.edm.EdmType; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/UnaryOperator.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/UnaryOperator.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java index 62d935c1a..513e2d8b0 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/UnaryOperator.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; public interface UnaryOperator extends Expression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/VisitableExression.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java similarity index 96% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/VisitableExression.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java index ab31dd74f..c3dc10874 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/expression/VisitableExression.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.expression; +package org.apache.olingo.odata4.server.api.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchBinary.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java similarity index 94% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchBinary.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java index c6b123b1a..1431f9f84 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchBinary.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.search; +package org.apache.olingo.odata4.server.api.uri.queryoption.search; public interface SearchBinary extends SearchExpression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchExpression.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchExpression.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java index 7c68b5b6e..0290d8136 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchExpression.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.search; +package org.apache.olingo.odata4.server.api.uri.queryoption.search; public interface SearchExpression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchTerm.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchTerm.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java index 7979917fb..1a8e82358 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchTerm.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.search; +package org.apache.olingo.odata4.server.api.uri.queryoption.search; public interface SearchTerm extends SearchExpression { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchUnary.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java similarity index 93% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchUnary.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java index 422641a11..b2fd9ea3a 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SearchUnary.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.search; +package org.apache.olingo.odata4.server.api.uri.queryoption.search; public interface SearchUnary { diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SupportedSearchBinaryOperators.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SupportedSearchBinaryOperators.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SupportedSearchBinaryOperators.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SupportedSearchBinaryOperators.java index 76702b5cc..cc5c57351 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SupportedSearchBinaryOperators.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SupportedSearchBinaryOperators.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.search; +package org.apache.olingo.odata4.server.api.uri.queryoption.search; public enum SupportedSearchBinaryOperators { // and/or diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SupportedSearchUnaryOperators.java b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SupportedSearchUnaryOperators.java similarity index 95% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SupportedSearchUnaryOperators.java rename to odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SupportedSearchUnaryOperators.java index d62941c28..a61e72d9c 100644 --- a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/queryoption/search/SupportedSearchUnaryOperators.java +++ b/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SupportedSearchUnaryOperators.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.api.uri.queryoption.search; +package org.apache.olingo.odata4.server.api.uri.queryoption.search; public enum SupportedSearchUnaryOperators { NOT("not"); diff --git a/odata4-lib/odata4-server-core/pom.xml b/odata4-lib/odata4-server-core/pom.xml index e6ada362a..58ca7ce93 100644 --- a/odata4-lib/odata4-server-core/pom.xml +++ b/odata4-lib/odata4-server-core/pom.xml @@ -79,7 +79,7 @@ true - src/main/antlr4/org/apache/olingo/odata4/producer/core/uri/antlr + src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr diff --git a/odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/producer/core/uri/antlr/UriLexer.g4 b/odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 similarity index 100% rename from odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/producer/core/uri/antlr/UriLexer.g4 rename to odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 diff --git a/odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/producer/core/uri/antlr/UriParser.g4 b/odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 similarity index 100% rename from odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/producer/core/uri/antlr/UriParser.g4 rename to odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/Parser.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/Parser.java similarity index 92% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/Parser.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/Parser.java index 367f02794..a97c899e4 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/Parser.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/Parser.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BailErrorStrategy; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.atn.PredictionMode; import org.antlr.v4.runtime.misc.ParseCancellationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfo; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriLexer; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext; +import org.apache.olingo.odata4.server.api.uri.UriInfo; +import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext; public class Parser { public UriInfo parseUri(final String input, final UriParseTreeVisitor uriParseTreeVisitor) diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java similarity index 71% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java index e4797c4b5..b37a8bd63 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java @@ -16,50 +16,50 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; -import org.apache.olingo.odata4.producer.api.uri.UriInfo; -import org.apache.olingo.odata4.producer.api.uri.UriInfoAll; -import org.apache.olingo.odata4.producer.api.uri.UriInfoBatch; -import org.apache.olingo.odata4.producer.api.uri.UriInfoCrossjoin; -import org.apache.olingo.odata4.producer.api.uri.UriInfoEntityId; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriInfoMetadata; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.UriInfoService; -import org.apache.olingo.odata4.producer.api.uri.UriResource; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.IdOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipTokenOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption; -import org.apache.olingo.odata4.producer.core.uri.queryoption.CustomQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FilterOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FormatOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.IdOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.InlineCountOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.OrderByOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.QueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SearchOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SkipOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SkipTokenOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SystemQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.TopOptionImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfo; +import org.apache.olingo.odata4.server.api.uri.UriInfoAll; +import org.apache.olingo.odata4.server.api.uri.UriInfoBatch; +import org.apache.olingo.odata4.server.api.uri.UriInfoCrossjoin; +import org.apache.olingo.odata4.server.api.uri.UriInfoEntityId; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriInfoMetadata; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriInfoService; +import org.apache.olingo.odata4.server.api.uri.UriResource; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipTokenOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption; +import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FormatOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.IdOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.InlineCountOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SearchOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipTokenOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SystemQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.TopOptionImpl; public class UriInfoImpl implements UriInfo { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParameterImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java similarity index 87% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParameterImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java index 67034f4bd..e87c89d9f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParameterImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; -import org.apache.olingo.odata4.producer.api.uri.UriParameter; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.UriParameter; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class UriParameterImpl implements UriParameter { private String name; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParseTreeVisitor.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParseTreeVisitor.java similarity index 86% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParseTreeVisitor.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParseTreeVisitor.java index a245bdc8a..92f34278f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParseTreeVisitor.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParseTreeVisitor.java @@ -18,7 +18,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -47,133 +47,133 @@ import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriResource; -import org.apache.olingo.odata4.producer.api.uri.UriResourcePartTyped; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedBinaryOperators; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedConstants; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriLexer; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserBaseVisitor; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AliasAndValueContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AllExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltAddContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltAllContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltAndContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltAnyContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltBatchContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltComparismContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltEntityCastContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltEntityContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltEqualityContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltHasContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltMetadataContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltMultContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltOrContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AltResourcePathContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.AnyExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.BooleanNonCaseContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.CastExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.CeilingMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ConcatMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ConstSegmentContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ContainsMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.CrossjoinContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.CustomQueryOptionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.DateMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.DayMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.EndsWithMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.EntityOptionCastContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.EntityOptionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.EntityOptionsCastContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.EntityOptionsContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.EnumLitContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandCountOptionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandItemContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandOptionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandPathContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandPathExtensionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ExpandRefOptionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.FilterContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.FloorMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.FormatContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.FractionalsecondsMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.GeoDistanceMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.GeoIntersectsMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.GeoLengthMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.HourMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.IdContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.IndexOfMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.InlinecountContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.IsofExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.LengthMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.LevelsContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.MaxDateTimeMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.MemberExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.MinDateTimeMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.MinuteMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.MonthMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.NameValueOptListContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.NameValuePairContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.NamespaceContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.NowMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.NullruleContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.OdataIdentifierContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.OrderByContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.OrderByItemContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.PathSegmentContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.PathSegmentsContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.PrimitiveLiteralContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.QueryOptionContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.QueryOptionsContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ResourcePathContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.RootExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.RoundMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SecondMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SelectContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SelectItemContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SelectSegmentContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SkipContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SkiptokenContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.StartsWithMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.SubstringMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.TimeMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ToLowerMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.ToUpperMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.TopContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.TotalOffsetMinutesMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.TotalsecondsMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.TrimMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.UnaryContext; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.YearMethodCallExprContext; -import org.apache.olingo.odata4.producer.core.uri.queryoption.AliasQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.CustomQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandItemImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FilterOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FormatOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.IdOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.InlineCountOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.LevelsOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.OrderByItemImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.OrderByOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.QueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectItemImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SkipOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SkipTokenOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SystemQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.TopOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.BinaryImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ConstantImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.EnumerationImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.LiteralImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.MemberImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.MethodCallImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.TypeLiteralImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriResource; +import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserBaseVisitor; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AliasAndValueContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AllExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltAddContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltAllContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltAndContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltAnyContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltBatchContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltComparismContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltEntityCastContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltEntityContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltEqualityContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltHasContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltMetadataContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltMultContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltOrContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AltResourcePathContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.AnyExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.BooleanNonCaseContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.CastExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.CeilingMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ConcatMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ConstSegmentContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ContainsMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.CrossjoinContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.CustomQueryOptionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.DateMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.DayMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.EndsWithMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.EntityOptionCastContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.EntityOptionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.EntityOptionsCastContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.EntityOptionsContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.EnumLitContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandCountOptionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandItemContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandOptionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandPathContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandPathExtensionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ExpandRefOptionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.FilterContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.FloorMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.FormatContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.FractionalsecondsMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.GeoDistanceMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.GeoIntersectsMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.GeoLengthMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.HourMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.IdContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.IndexOfMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.InlinecountContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.IsofExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.LengthMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.LevelsContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.MaxDateTimeMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.MemberExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.MinDateTimeMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.MinuteMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.MonthMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.NameValueOptListContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.NameValuePairContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.NamespaceContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.NowMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.NullruleContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OdataIdentifierContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OrderByContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OrderByItemContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.PathSegmentContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.PathSegmentsContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.PrimitiveLiteralContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.QueryOptionContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.QueryOptionsContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ResourcePathContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.RootExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.RoundMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SecondMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SelectContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SelectItemContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SelectSegmentContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SkipContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SkiptokenContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.StartsWithMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.SubstringMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.TimeMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ToLowerMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.ToUpperMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.TopContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.TotalOffsetMinutesMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.TotalsecondsMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.TrimMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.UnaryContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.YearMethodCallExprContext; +import org.apache.olingo.odata4.server.core.uri.queryoption.AliasQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandItemImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FormatOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.IdOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.InlineCountOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.LevelsOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByItemImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectItemImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipTokenOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SystemQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.TopOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.BinaryImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ConstantImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.EnumerationImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MemberImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MethodCallImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.TypeLiteralImpl; /** * UriVisitor diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserException.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserException.java similarity index 96% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserException.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserException.java index e766d6814..826951cbb 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserException.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; //TODO Check name of this exception when implementing proper error handling public class UriParserException extends Exception { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserSemanticException.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserSemanticException.java similarity index 96% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserSemanticException.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserSemanticException.java index 687bb4236..ad3e820c5 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserSemanticException.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserSemanticException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; //TODO Check name of this exception when implementing proper error handling public class UriParserSemanticException extends UriParserException { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserSyntaxException.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserSyntaxException.java similarity index 96% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserSyntaxException.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserSyntaxException.java index 5d5f59b91..312555793 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserSyntaxException.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParserSyntaxException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; public class UriParserSyntaxException extends UriParserException { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceActionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java similarity index 92% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceActionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java index e3ffdcae7..e4b111306 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceActionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmAction; import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceAction; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceAction; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; public class UriResourceActionImpl extends UriResourceTypedImpl implements UriResourceAction { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceComplexPropertyImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java similarity index 91% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceComplexPropertyImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java index 9ef90beef..18f803f85 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceComplexPropertyImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceComplexProperty; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceComplexProperty; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; public class UriResourceComplexPropertyImpl extends UriResourceTypedImpl implements UriResourceComplexProperty { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceCountImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java similarity index 86% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceCountImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java index 9cd0d9109..179d17422 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceCountImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; -import org.apache.olingo.odata4.producer.api.uri.UriResourceCount; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceCount; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; public class UriResourceCountImpl extends UriResourceImpl implements UriResourceCount { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceEntitySetImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java similarity index 91% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceEntitySetImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java index a37f8587b..8c1617a95 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceEntitySetImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java @@ -17,13 +17,13 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceEntitySet; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceEntitySet; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; public class UriResourceEntitySetImpl extends UriResourceWithKeysImpl implements UriResourceEntitySet { protected EdmEntitySet edmEntitySet = null; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceFunctionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java similarity index 92% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceFunctionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java index 358f18f34..f1c35bce5 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceFunctionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import java.util.ArrayList; import java.util.List; @@ -24,9 +24,9 @@ import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmFunction; import org.apache.olingo.odata4.commons.api.edm.EdmFunctionImport; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriParameter; -import org.apache.olingo.odata4.producer.api.uri.UriResourceFunction; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriParameter; +import org.apache.olingo.odata4.server.api.uri.UriResourceFunction; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; /** * Covers Function imports and BoundFunction in URI diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java similarity index 87% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java index b26d77856..c0b04c6c3 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; -import org.apache.olingo.odata4.producer.api.uri.UriResource; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResource; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; /** * Covers Functionimports and BoundFunction in URI diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceItImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java similarity index 90% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceItImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java index 37b7261ab..baaf684c7 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceItImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceIt; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceIt; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; /** * Covers Functionimports and BoundFunction in URI diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaAllImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaAllImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java index 480dd6ebc..39ca238e9 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaAllImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceLambdaAll; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceLambdaAll; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class UriResourceLambdaAllImpl extends UriResourceTypedImpl implements UriResourceLambdaAll { protected EdmProperty property; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaAnyImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaAnyImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java index 25a4f200c..3a20c8164 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaAnyImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceLambdaAny; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceLambdaAny; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class UriResourceLambdaAnyImpl extends UriResourceTypedImpl implements UriResourceLambdaAny { protected EdmProperty property; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaVarImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java similarity index 91% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaVarImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java index d595289d8..e3154dcda 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceLambdaVarImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceLambdaRef; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceLambdaRef; public class UriResourceLambdaVarImpl extends UriResourceTypedImpl implements UriResourceLambdaRef { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceNavigationPropertyImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java similarity index 91% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceNavigationPropertyImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java index 3719fa2fb..637f09a99 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceNavigationPropertyImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceNavigation; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceNavigation; public class UriResourceNavigationPropertyImpl extends UriResourceWithKeysImpl implements UriResourceNavigation { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourcePrimitivePropertyImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java similarity index 90% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourcePrimitivePropertyImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java index f9c8689f5..3fd413904 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourcePrimitivePropertyImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourcePrimitiveProperty; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourcePrimitiveProperty; public class UriResourcePrimitivePropertyImpl extends UriResourceTypedImpl implements UriResourcePrimitiveProperty { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceRefImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java similarity index 86% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceRefImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java index 9a9467477..17cf8f37f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceRefImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceRef; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceRef; public class UriResourceRefImpl extends UriResourceImpl implements UriResourceRef { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceRootImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java similarity index 90% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceRootImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java index 7a3977aec..1d5f55d6c 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceRootImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceRoot; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceRoot; public class UriResourceRootImpl extends UriResourceWithKeysImpl implements UriResourceRoot { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceSingletonImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java similarity index 91% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceSingletonImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java index a25aa5e2f..abb8964d2 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceSingletonImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceSingleton; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceSingleton; public class UriResourceSingletonImpl extends UriResourceTypedImpl implements UriResourceSingleton { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceStartingTypeFilterImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java similarity index 90% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceStartingTypeFilterImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java index 37a5365a6..4d635c992 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceStartingTypeFilterImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmType; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceStartingTypeFilter; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceStartingTypeFilter; public class UriResourceStartingTypeFilterImpl extends UriResourceWithKeysImpl implements UriResourceStartingTypeFilter { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceTypedImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java similarity index 91% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceTypedImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java index f8ee2b450..f718f755f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceTypedImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourcePartTyped; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped; public abstract class UriResourceTypedImpl extends UriResourceImpl implements UriResourcePartTyped { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceValueImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java similarity index 86% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceValueImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java index dc84d2ffb..9544b988a 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceValueImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceValue; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceValue; public class UriResourceValueImpl extends UriResourceImpl implements UriResourceValue { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceWithKeysImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java similarity index 92% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceWithKeysImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java index b21fbd170..a54f16a69 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriResourceWithKeysImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import java.util.ArrayList; import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; -import org.apache.olingo.odata4.producer.api.uri.UriParameter; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourcePartTyped; +import org.apache.olingo.odata4.server.api.uri.UriParameter; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped; public abstract class UriResourceWithKeysImpl extends UriResourceImpl implements UriResourcePartTyped { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/AliasQueryOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java similarity index 84% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/AliasQueryOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java index d9fdf266d..61581683f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/AliasQueryOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.AliasQueryOption; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.queryoption.AliasQueryOption; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class AliasQueryOptionImpl extends QueryOptionImpl implements AliasQueryOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/CustomQueryOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java similarity index 87% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/CustomQueryOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java index b3822a9b0..07ad60a3f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/CustomQueryOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; public class CustomQueryOptionImpl extends QueryOptionImpl implements CustomQueryOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/ExpandItemImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java similarity index 81% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/ExpandItemImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java index 0f397a4ac..5d7ab42b9 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/ExpandItemImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java @@ -17,22 +17,22 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; import java.util.List; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.LevelsExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.LevelsExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption; public class ExpandItemImpl implements ExpandItem { private LevelsExpandOption levelsExpandOption; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/ExpandOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java similarity index 84% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/ExpandOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java index 9affa899d..b3ac035bb 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/ExpandOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class ExpandOptionImpl extends SystemQueryOptionImpl implements ExpandOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/FilterOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java similarity index 81% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/FilterOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java index f24f17f4a..106ea5260 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/FilterOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class FilterOptionImpl extends SystemQueryOptionImpl implements FilterOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/FormatOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/FormatOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java index 309463cf9..67a1982f4 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/FormatOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class FormatOptionImpl extends SystemQueryOptionImpl implements FormatOption { private String value; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/IdOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/IdOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java index 298054dd0..0789bfd99 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/IdOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.IdOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class IdOptionImpl extends SystemQueryOptionImpl implements IdOption { private String value; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/InlineCountOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/InlineCountOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/InlineCountOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/InlineCountOptionImpl.java index 96f8ee4fa..a274c0a52 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/InlineCountOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/InlineCountOptionImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class InlineCountOptionImpl extends SystemQueryOptionImpl implements InlineCountOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/LevelsOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java similarity index 86% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/LevelsOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java index 714943350..538dc52a3 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/LevelsOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.LevelsExpandOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.LevelsExpandOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class LevelsOptionImpl extends SystemQueryOptionImpl implements LevelsExpandOption { private boolean isMax; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/OrderByItemImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java similarity index 87% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/OrderByItemImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java index 1b180fef7..da7ae630a 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/OrderByItemImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByItem; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByItem; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class OrderByItemImpl implements OrderByItem { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/OrderByOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java similarity index 84% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/OrderByOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java index 67109254f..1f7cf07fd 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/OrderByOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class OrderByOptionImpl extends SystemQueryOptionImpl implements OrderByOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/QueryOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java similarity index 90% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/QueryOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java index b9b4b0d2b..46aa8f4b1 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/QueryOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.QueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.QueryOption; public class QueryOptionImpl implements QueryOption { private String name; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SearchOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java similarity index 80% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SearchOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java index 088329e7c..5ed729ee0 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SearchOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.api.uri.queryoption.search.SearchExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.search.SearchExpression; /* TODO implement */ public class SearchOptionImpl extends SystemQueryOptionImpl implements SearchOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SelectItemImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java similarity index 90% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SelectItemImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java index f48487a33..24f656207 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SelectItemImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectItem; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; public class SelectItemImpl implements SelectItem { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SelectOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java similarity index 84% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SelectOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java index 4298b75da..07ec2e278 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SelectOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class SelectOptionImpl extends SystemQueryOptionImpl implements SelectOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SkipOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SkipOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java index 9faacfa9a..f9edca175 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SkipOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class SkipOptionImpl extends SystemQueryOptionImpl implements SkipOption { private String value; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SkipTokenOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SkipTokenOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java index 0011e37f6..759cfae49 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SkipTokenOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipTokenOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.SkipTokenOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; public class SkipTokenOptionImpl extends SystemQueryOptionImpl implements SkipTokenOption { private String skipTokenValue; diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SystemQueryOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SystemQueryOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java index 580cc89e5..9c58776f6 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/SystemQueryOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SystemQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.SystemQueryOption; public class SystemQueryOptionImpl extends QueryOptionImpl implements SystemQueryOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/TopOptionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java similarity index 85% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/TopOptionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java index 4cb3b5098..f7f0cfc7a 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/TopOptionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption; /* TODO implement */ public class TopOptionImpl extends SystemQueryOptionImpl implements TopOption { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/AliasImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java similarity index 81% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/AliasImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java index e6812ac2d..1ce145ff7 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/AliasImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.AliasExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.AliasExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; public class AliasImpl extends ExpressionImpl implements AliasExpression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/BinaryImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java similarity index 79% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/BinaryImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java index 480abcb89..fb1c5a285 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/BinaryImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.BinaryExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedBinaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.BinaryExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; public class BinaryImpl extends ExpressionImpl implements BinaryExpression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ConstantImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ConstantImpl.java similarity index 81% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ConstantImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ConstantImpl.java index cbfcc90e4..8d4567cd4 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ConstantImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ConstantImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Constant; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedConstants; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Constant; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; public class ConstantImpl extends ExpressionImpl implements Constant { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/EnumerationImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java similarity index 84% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/EnumerationImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java index 65baa6d58..f47d164f1 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/EnumerationImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import java.util.ArrayList; import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Enumeration; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Enumeration; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; public class EnumerationImpl extends ExpressionImpl implements Enumeration { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ExpressionImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java similarity index 86% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ExpressionImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java index 08546300a..399709ded 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ExpressionImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; public abstract class ExpressionImpl implements Expression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/LambdaRefImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java similarity index 77% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/LambdaRefImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java index 99110992a..ec2cd0ac3 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/LambdaRefImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.LambdaRef; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.VisitableExression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.LambdaRef; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; public class LambdaRefImpl extends ExpressionImpl implements LambdaRef, VisitableExression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/LiteralImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java similarity index 77% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/LiteralImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java index 0057bf0dd..7de63f225 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/LiteralImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Literal; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.VisitableExression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Literal; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; public class LiteralImpl extends ExpressionImpl implements Literal, VisitableExression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/MemberImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java similarity index 78% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/MemberImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java index ce43a3020..e8e7b4aa2 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/MemberImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Member; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.VisitableExression; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceTypedImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceWithKeysImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Member; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceTypedImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceWithKeysImpl; public class MemberImpl extends ExpressionImpl implements Member, VisitableExression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/MethodCallImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java similarity index 78% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/MethodCallImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java index a9d4022a2..4bd15551f 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/MethodCallImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import java.util.ArrayList; import java.util.List; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.MethodCall; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.VisitableExression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.MethodCall; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; public class MethodCallImpl extends ExpressionImpl implements MethodCall, VisitableExression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/TypeLiteralImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java similarity index 78% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/TypeLiteralImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java index e0a43cee4..14fae5d5c 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/TypeLiteralImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.TypeLiteral; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.VisitableExression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.TypeLiteral; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; public class TypeLiteralImpl extends ExpressionImpl implements TypeLiteral, VisitableExression { diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/UnaryImpl.java b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java similarity index 74% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/UnaryImpl.java rename to odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java index e2cce1777..e2b2f5fc2 100644 --- a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/UnaryImpl.java +++ b/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedUnaryOperators; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.UnaryOperator; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.VisitableExression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedUnaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.UnaryOperator; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; public class UnaryImpl extends ExpressionImpl implements UnaryOperator, VisitableExression { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechProvider.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java similarity index 99% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechProvider.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java index a33717195..41e118109 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechProvider.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import java.util.ArrayList; import java.util.Arrays; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechTestProvider.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java similarity index 98% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechTestProvider.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java index 4df8654d2..803226e53 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechTestProvider.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import java.util.Arrays; import java.util.List; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ExpandValidator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ExpandValidator.java similarity index 89% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ExpandValidator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ExpandValidator.java index a6cb09555..dfee6c99b 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ExpandValidator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ExpandValidator.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -25,15 +25,15 @@ import static org.junit.Assert.fail; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FilterOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.QueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; public class ExpandValidator implements Validator { private Edm edm; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/FilterTreeToText.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterTreeToText.java similarity index 81% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/FilterTreeToText.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterTreeToText.java index 62409af10..a7c21580e 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/FilterTreeToText.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterTreeToText.java @@ -16,26 +16,26 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import java.util.List; import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.UriResource; -import org.apache.olingo.odata4.producer.api.uri.UriResourceLambdaAll; -import org.apache.olingo.odata4.producer.api.uri.UriResourceLambdaAny; -import org.apache.olingo.odata4.producer.api.uri.UriResourcePartTyped; -import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedBinaryOperators; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedConstants; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedUnaryOperators; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriResource; +import org.apache.olingo.odata4.server.api.uri.UriResourceLambdaAll; +import org.apache.olingo.odata4.server.api.uri.UriResourceLambdaAny; +import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped; +import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedUnaryOperators; public class FilterTreeToText implements ExpressionVisitor { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/FilterValidator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterValidator.java similarity index 88% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/FilterValidator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterValidator.java index 951814bca..c7e3dfa02 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/FilterValidator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -27,29 +27,29 @@ import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfo; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Member; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedBinaryOperators; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedConstants; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.core.uri.Parser; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.UriParseTreeVisitor; -import org.apache.olingo.odata4.producer.core.uri.UriParserException; -import org.apache.olingo.odata4.producer.core.uri.UriParserSemanticException; -import org.apache.olingo.odata4.producer.core.uri.UriParserSyntaxException; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FilterOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.OrderByOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.BinaryImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ConstantImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.EnumerationImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.LiteralImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.MemberImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.MethodCallImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.TypeLiteralImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfo; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Member; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.core.uri.Parser; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.UriParseTreeVisitor; +import org.apache.olingo.odata4.server.core.uri.UriParserException; +import org.apache.olingo.odata4.server.core.uri.UriParserSemanticException; +import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.BinaryImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ConstantImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.EnumerationImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MemberImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MethodCallImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.TypeLiteralImpl; public class FilterValidator implements Validator { private Edm edm; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParseTreeToText.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParseTreeToText.java similarity index 98% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParseTreeToText.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParseTreeToText.java index c7fa306a8..4f143ca9b 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParseTreeToText.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParseTreeToText.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import java.util.Arrays; import java.util.List; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserTest.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserTest.java similarity index 90% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserTest.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserTest.java index 622bce719..d2bf68796 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserTest.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import org.antlr.v4.runtime.DefaultErrorStrategy; -import org.apache.olingo.odata4.producer.core.uri.Parser; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser; +import org.apache.olingo.odata4.server.core.uri.Parser; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser; public class ParserTest extends Parser { TestErrorLogger errorCollector1; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserValidator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserValidator.java similarity index 96% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserValidator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserValidator.java index e29255fc9..49c6d4f31 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserValidator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import static org.junit.Assert.assertEquals; @@ -29,8 +29,8 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.DefaultErrorStrategy; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.atn.PredictionMode; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser; +import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext; // TODO extend to test also exception which can occure while paring public class ParserValidator { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TestErrorLogger.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/TestErrorLogger.java similarity index 99% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TestErrorLogger.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/TestErrorLogger.java index 8e40072b5..877b06d17 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TestErrorLogger.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/TestErrorLogger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import java.util.BitSet; import java.util.Collections; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenValidator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/TokenValidator.java similarity index 97% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenValidator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/TokenValidator.java index 4f452b833..59614213a 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenValidator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/TokenValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import java.util.List; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.Token; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriLexer; +import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer; //TODO extend to test also exception which can occure while paring public class TokenValidator { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriLexerWithTrace.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriLexerWithTrace.java similarity index 95% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriLexerWithTrace.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriLexerWithTrace.java index 9576ea0f5..91622ca9a 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriLexerWithTrace.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriLexerWithTrace.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.Token; -import org.apache.olingo.odata4.producer.core.uri.antlr.UriLexer; +import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer; public class UriLexerWithTrace extends UriLexer { int logLevel = 0; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriResourceValidator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriResourceValidator.java similarity index 90% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriResourceValidator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriResourceValidator.java index f06b48670..b33edfe52 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriResourceValidator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriResourceValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,32 +29,32 @@ import org.apache.olingo.odata4.commons.api.edm.EdmElement; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; -import org.apache.olingo.odata4.producer.api.uri.UriInfo; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriParameter; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourcePartTyped; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectItem; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.UriParseTreeVisitor; -import org.apache.olingo.odata4.producer.core.uri.UriParserException; -import org.apache.olingo.odata4.producer.core.uri.UriResourceActionImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceComplexPropertyImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceEntitySetImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceFunctionImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceLambdaAllImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceLambdaAnyImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceNavigationPropertyImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourcePrimitivePropertyImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceSingletonImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceWithKeysImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.CustomQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfo; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriParameter; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.UriParseTreeVisitor; +import org.apache.olingo.odata4.server.core.uri.UriParserException; +import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceComplexPropertyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceEntitySetImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceFunctionImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAllImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAnyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceNavigationPropertyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourcePrimitivePropertyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceSingletonImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceWithKeysImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; public class UriResourceValidator implements Validator { private Edm edm; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriValidator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriValidator.java similarity index 87% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriValidator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriValidator.java index 5e7177065..d24ba7302 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriValidator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -26,19 +26,19 @@ import java.util.List; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectItem; -import org.apache.olingo.odata4.producer.core.uri.Parser; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.UriParseTreeVisitor; -import org.apache.olingo.odata4.producer.core.uri.UriParserException; -import org.apache.olingo.odata4.producer.core.uri.UriParserSemanticException; -import org.apache.olingo.odata4.producer.core.uri.UriParserSyntaxException; -import org.apache.olingo.odata4.producer.core.uri.queryoption.CustomQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FilterOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; +import org.apache.olingo.odata4.server.core.uri.Parser; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.UriParseTreeVisitor; +import org.apache.olingo.odata4.server.core.uri.UriParserException; +import org.apache.olingo.odata4.server.core.uri.UriParserSemanticException; +import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException; +import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; public class UriValidator implements Validator { private Edm edm; diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/Validator.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/Validator.java similarity index 94% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/Validator.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/Validator.java index 11706a67c..6febab270 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/Validator.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/Validator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.testutil; +package org.apache.olingo.odata4.server.core.testutil; public interface Validator { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImplTest.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java similarity index 75% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImplTest.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java index e602c9351..d6cfa933d 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImplTest.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,31 +27,34 @@ import java.util.List; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.odata4.producer.api.uri.UriInfoAll; -import org.apache.olingo.odata4.producer.api.uri.UriInfoBatch; -import org.apache.olingo.odata4.producer.api.uri.UriInfoCrossjoin; -import org.apache.olingo.odata4.producer.api.uri.UriInfoEntityId; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriInfoMetadata; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.UriInfoService; -import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechProvider; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechTestProvider; -import org.apache.olingo.odata4.producer.core.uri.queryoption.CustomQueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.ExpandOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FilterOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.FormatOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.IdOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.InlineCountOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.LevelsOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.OrderByOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.QueryOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SearchOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SelectOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SkipOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.SkipTokenOptionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.TopOptionImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoAll; +import org.apache.olingo.odata4.server.api.uri.UriInfoBatch; +import org.apache.olingo.odata4.server.api.uri.UriInfoCrossjoin; +import org.apache.olingo.odata4.server.api.uri.UriInfoEntityId; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriInfoMetadata; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.UriInfoService; +import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; +import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; +import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceEntitySetImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FormatOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.IdOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.InlineCountOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.LevelsOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SearchOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipTokenOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.TopOptionImpl; import org.junit.Test; public class UriInfoImplTest { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/UriParameterImplTest.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriParameterImplTest.java similarity index 91% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/UriParameterImplTest.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriParameterImplTest.java index 7b1d0fc19..18c4e8c1c 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/UriParameterImplTest.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriParameterImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri; +package org.apache.olingo.odata4.server.core.uri; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -40,11 +40,30 @@ import org.apache.olingo.odata4.commons.core.edm.provider.EdmComplexTypeImpl; import org.apache.olingo.odata4.commons.core.edm.provider.EdmEntitySetImpl; import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; import org.apache.olingo.odata4.commons.core.edm.provider.EdmSingletonImpl; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechProvider; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechTestProvider; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; +import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; +import org.apache.olingo.odata4.server.core.uri.UriParameterImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceComplexPropertyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceCountImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceEntitySetImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceFunctionImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceItImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAllImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAnyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaVarImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceNavigationPropertyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourcePrimitivePropertyImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceRefImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceRootImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceSingletonImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceStartingTypeFilterImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceTypedImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceValueImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceWithKeysImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; import org.junit.Test; public class UriParameterImplTest { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestFullResourcePath.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java similarity index 99% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestFullResourcePath.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java index 06efbf991..56b57d724 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestFullResourcePath.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.antlr; +package org.apache.olingo.odata4.server.core.uri.antlr; import java.util.Arrays; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedBinaryOperators; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedConstants; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechProvider; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechTestProvider; -import org.apache.olingo.odata4.producer.core.testutil.FilterValidator; -import org.apache.olingo.odata4.producer.core.testutil.UriResourceValidator; -import org.apache.olingo.odata4.producer.core.testutil.UriValidator; -import org.apache.olingo.odata4.producer.core.uri.UriParserException; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; +import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; +import org.apache.olingo.odata4.server.core.testutil.FilterValidator; +import org.apache.olingo.odata4.server.core.testutil.UriResourceValidator; +import org.apache.olingo.odata4.server.core.testutil.UriValidator; +import org.apache.olingo.odata4.server.core.uri.UriParserException; import org.junit.Test; public class TestFullResourcePath { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestLexer.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java similarity index 99% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestLexer.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java index 720f5d689..af01eb08b 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestLexer.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.antlr; +package org.apache.olingo.odata4.server.core.uri.antlr; import org.antlr.v4.runtime.Lexer; -import org.apache.olingo.odata4.producer.core.testutil.TokenValidator; +import org.apache.olingo.odata4.server.core.testutil.TokenValidator; +import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer; import org.junit.Test; public class TestLexer { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestParser.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestParser.java similarity index 99% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestParser.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestParser.java index 8bf5352ff..36095d591 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestParser.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestParser.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.antlr; +package org.apache.olingo.odata4.server.core.uri.antlr; -import org.apache.olingo.odata4.producer.core.testutil.ParserValidator; +import org.apache.olingo.odata4.server.core.testutil.ParserValidator; import org.junit.Test; /** diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestUriParserImpl.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java similarity index 98% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestUriParserImpl.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java index 1781e9633..565e7e37c 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/antlr/TestUriParserImpl.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.antlr; +package org.apache.olingo.odata4.server.core.uri.antlr; // TODO after adding the external API to the URI processing class this unit test require a mayor rework @@ -25,15 +25,15 @@ import java.util.Arrays; import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriResourceKind; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechProvider; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechTestProvider; -import org.apache.olingo.odata4.producer.core.testutil.FilterValidator; -import org.apache.olingo.odata4.producer.core.testutil.UriResourceValidator; -import org.apache.olingo.odata4.producer.core.testutil.UriValidator; -import org.apache.olingo.odata4.producer.core.uri.UriParserException; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriResourceKind; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; +import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; +import org.apache.olingo.odata4.server.core.testutil.FilterValidator; +import org.apache.olingo.odata4.server.core.testutil.UriResourceValidator; +import org.apache.olingo.odata4.server.core.testutil.UriValidator; +import org.apache.olingo.odata4.server.core.uri.UriParserException; import org.junit.Test; public class TestUriParserImpl { diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/queryoption/QueryOptionTest.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java similarity index 82% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/queryoption/QueryOptionTest.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java index 3ab5110cb..11a343864 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/queryoption/QueryOptionTest.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption; +package org.apache.olingo.odata4.server.core.uri.queryoption; import static org.junit.Assert.assertEquals; @@ -27,14 +27,32 @@ import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName; import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.queryoption.SupportedQueryOptions; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechProvider; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechTestProvider; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.AliasImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.ExpressionImpl; -import org.apache.olingo.odata4.producer.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; +import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; +import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.AliasQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandItemImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.FormatOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.IdOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.InlineCountOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.LevelsOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByItemImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SearchOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectItemImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SkipTokenOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.SystemQueryOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.TopOptionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.AliasImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; import org.junit.Test; //TOOD add getKind check to all diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ExpressionTest.java b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java similarity index 85% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ExpressionTest.java rename to odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java index c3e8e2d5d..31db44cf6 100644 --- a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/producer/core/uri/queryoption/expression/ExpressionTest.java +++ b/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.odata4.producer.core.uri.queryoption.expression; +package org.apache.olingo.odata4.server.core.uri.queryoption.expression; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,19 +31,30 @@ import org.apache.olingo.odata4.commons.api.edm.EdmFunction; import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException; import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; -import org.apache.olingo.odata4.producer.api.uri.UriInfoResource; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.ExceptionVisitExpression; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedBinaryOperators; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedConstants; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedMethodCalls; -import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.SupportedUnaryOperators; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechProvider; -import org.apache.olingo.odata4.producer.core.testutil.EdmTechTestProvider; -import org.apache.olingo.odata4.producer.core.testutil.FilterTreeToText; -import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceActionImpl; -import org.apache.olingo.odata4.producer.core.uri.UriResourceFunctionImpl; +import org.apache.olingo.odata4.server.api.uri.UriInfoKind; +import org.apache.olingo.odata4.server.api.uri.UriInfoResource; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; +import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedUnaryOperators; +import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; +import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; +import org.apache.olingo.odata4.server.core.testutil.FilterTreeToText; +import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; +import org.apache.olingo.odata4.server.core.uri.UriResourceFunctionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.AliasImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.BinaryImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ConstantImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.EnumerationImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LambdaRefImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MemberImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MethodCallImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.TypeLiteralImpl; +import org.apache.olingo.odata4.server.core.uri.queryoption.expression.UnaryImpl; import org.junit.Test; public class ExpressionTest {