mirror of
https://github.com/apache/olingo-odata4.git
synced 2025-02-07 18:49:39 +00:00
010642c506
Conflicts: lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceComplexPropertyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceCountImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceEntitySetImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceItImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaVarImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceNavigationPropertyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourcePrimitivePropertyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceRefImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceRootImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceSingletonImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceStartingTypeFilterImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchParserAndTokenizerTest.java