You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/11/28 06:30:55 UTC
[47/47] olingo-odata4 git commit: [OLINGO-811] Merge branch 'master'
into OLINGO-811_CountForExpand
[OLINGO-811] Merge branch 'master' into OLINGO-811_CountForExpand
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/2fcbf6f8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/2fcbf6f8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/2fcbf6f8
Branch: refs/heads/OLINGO-811_CountForExpand
Commit: 2fcbf6f82adf3a66552181472c304f16573db6de
Parents: 969f176 8674a1f
Author: mibo <mi...@apache.org>
Authored: Sat Nov 28 06:25:24 2015 +0100
Committer: mibo <mi...@apache.org>
Committed: Sat Nov 28 06:25:24 2015 +0100
----------------------------------------------------------------------
.../fit/tecsvc/client/FunctionImportITCase.java | 51 ++
.../tecsvc/client/SystemQueryOptionITCase.java | 71 +-
.../olingo/commons/api/data/Parameter.java | 23 +-
.../olingo/commons/api/data/Valuable.java | 40 +-
.../commons/core/edm/EdmEnumTypeImpl.java | 47 +-
.../server/core/edm/provider/EdmEnumTest.java | 16 +-
.../deserializer/FixedFormatDeserializer.java | 9 +
.../apache/olingo/server/api/uri/UriInfo.java | 26 +-
.../olingo/server/api/uri/UriInfoEntityId.java | 2 +-
.../olingo/server/api/uri/UriInfoMetadata.java | 2 +-
.../olingo/server/api/uri/UriInfoResource.java | 3 +-
.../uri/queryoption/SystemQueryOptionKind.java | 28 +-
.../queryoption/search/SearchExpression.java | 14 +-
.../api/uri/queryoption/search/SearchUnary.java | 5 +-
.../olingo/server/core/uri/antlr/UriParser.g4 | 15 +-
.../core/debug/DebugResponseHelperImpl.java | 36 +-
.../olingo/server/core/debug/DebugTabBody.java | 22 +-
.../olingo/server/core/debug/DebugTabUri.java | 241 +++++--
.../core/debug/ExpressionJsonVisitor.java | 346 ++++------
.../server/core/debug/JsonStreamWriter.java | 175 -----
.../server/core/debug/ServerCoreDebugger.java | 3 +-
.../FixedFormatDeserializerImpl.java | 37 ++
.../json/ODataJsonDeserializer.java | 104 ++-
.../olingo/server/core/uri/UriInfoImpl.java | 215 +++---
.../server/core/uri/UriParameterImpl.java | 5 +-
.../server/core/uri/UriResourceActionImpl.java | 4 +-
.../core/uri/UriResourceFunctionImpl.java | 7 +-
.../olingo/server/core/uri/parser/Parser.java | 59 +-
.../core/uri/parser/UriParseTreeVisitor.java | 56 +-
.../uri/parser/search/SearchBinaryImpl.java | 56 ++
.../uri/parser/search/SearchExpressionImpl.java | 58 ++
.../core/uri/parser/search/SearchParser.java | 213 ++++++
.../parser/search/SearchParserException.java | 64 ++
.../uri/parser/search/SearchQueryToken.java | 26 +
.../core/uri/parser/search/SearchTermImpl.java | 39 ++
.../core/uri/parser/search/SearchTokenizer.java | 638 ++++++++++++++++++
.../parser/search/SearchTokenizerException.java | 54 ++
.../core/uri/parser/search/SearchUnaryImpl.java | 46 ++
.../uri/queryoption/AliasQueryOptionImpl.java | 2 +-
.../core/uri/queryoption/ExpandOptionImpl.java | 7 +-
.../core/uri/queryoption/FormatOptionImpl.java | 5 +-
.../core/uri/queryoption/IdOptionImpl.java | 5 +-
.../core/uri/queryoption/OrderByOptionImpl.java | 7 +-
.../core/uri/queryoption/SearchOptionImpl.java | 7 +-
.../core/uri/queryoption/SelectOptionImpl.java | 8 +-
.../uri/queryoption/SkipTokenOptionImpl.java | 5 +-
.../uri/queryoption/SystemQueryOptionImpl.java | 2 +-
.../server/core/uri/validator/UriValidator.java | 8 +-
.../server-core-exceptions-i18n.properties | 20 +-
.../search/SearchParserAndTokenizerTest.java | 146 ++++
.../uri/parser/search/SearchParserTest.java | 256 +++++++
.../uri/parser/search/SearchTokenizerTest.java | 432 ++++++++++++
.../olingo/server/tecsvc/data/ActionData.java | 20 +-
.../olingo/server/tecsvc/data/DataProvider.java | 48 +-
.../olingo/server/tecsvc/data/FunctionData.java | 61 +-
.../processor/TechnicalEntityProcessor.java | 7 +-
.../TechnicalPrimitiveComplexProcessor.java | 13 +-
.../tecsvc/processor/TechnicalProcessor.java | 3 +-
.../expression/ExpressionVisitorImpl.java | 62 +-
.../expression/operand/TypedOperand.java | 13 +-
.../expression/operand/UntypedOperand.java | 19 +-
.../expression/operation/BinaryOperator.java | 8 +-
.../queryoptions/options/SearchHandler.java | 135 ++++
.../tecsvc/provider/ComplexTypeProvider.java | 11 +-
.../tecsvc/provider/ContainerProvider.java | 428 +++++++-----
.../server/tecsvc/provider/EdmTechProvider.java | 7 +-
.../tecsvc/provider/EntityTypeProvider.java | 28 +-
.../tecsvc/provider/FunctionProvider.java | 665 +++++++++----------
.../tecsvc/provider/PropertyProvider.java | 49 +-
.../server/tecsvc/provider/SchemaProvider.java | 67 +-
.../server/tecsvc/provider/TermProvider.java | 24 +-
...aJsonDeserializerFunctionParametersTest.java | 121 ++++
.../serializer/json/ServiceDocumentTest.java | 2 +-
.../serializer/xml/MetadataDocumentTest.java | 2 +-
.../olingo/server/core/uri/UriInfoImplTest.java | 206 +++---
.../core/uri/antlr/TestFullResourcePath.java | 143 +++-
.../core/uri/testutil/EdmTechTestProvider.java | 128 ----
.../core/uri/validator/UriValidatorTest.java | 313 ++++-----
.../myservice/mynamespace/data/Storage.java | 367 +++++++---
.../data/TransactionalEntityManager.java | 185 ++++++
.../mynamespace/service/DemoBatchProcessor.java | 163 +++++
.../service/DemoEntityCollectionProcessor.java | 168 +++--
.../service/DemoEntityProcessor.java | 120 ++--
.../myservice/mynamespace/web/DemoServlet.java | 9 +-
samples/tutorials/p11_batch/pom.xml | 85 +++
.../myservice/mynamespace/data/Storage.java | 316 +++++++++
.../mynamespace/service/DemoBatchProcessor.java | 209 ++++++
.../mynamespace/service/DemoEdmProvider.java | 156 +++++
.../service/DemoEntityCollectionProcessor.java | 93 +++
.../service/DemoEntityProcessor.java | 189 ++++++
.../service/DemoPrimitiveProcessor.java | 146 ++++
.../java/myservice/mynamespace/util/Util.java | 121 ++++
.../myservice/mynamespace/web/DemoServlet.java | 75 +++
.../p11_batch/src/main/webapp/WEB-INF/web.xml | 40 ++
.../p11_batch/src/main/webapp/index.jsp | 26 +
samples/tutorials/p12_deep_insert/pom.xml | 85 +++
.../myservice/mynamespace/data/Storage.java | 534 +++++++++++++++
.../data/TransactionalEntityManager.java | 192 ++++++
.../mynamespace/service/DemoEdmProvider.java | 215 ++++++
.../service/DemoEntityCollectionProcessor.java | 149 +++++
.../service/DemoEntityProcessor.java | 242 +++++++
.../service/DemoPrimitiveProcessor.java | 146 ++++
.../java/myservice/mynamespace/util/Util.java | 161 +++++
.../myservice/mynamespace/web/DemoServlet.java | 74 +++
.../src/main/webapp/WEB-INF/web.xml | 40 ++
.../p12_deep_insert/src/main/webapp/index.jsp | 26 +
.../p12_deep_insert_preparation/pom.xml | 85 +++
.../myservice/mynamespace/data/Storage.java | 472 +++++++++++++
.../data/TransactionalEntityManager.java | 192 ++++++
.../mynamespace/service/DemoEdmProvider.java | 215 ++++++
.../service/DemoEntityCollectionProcessor.java | 149 +++++
.../service/DemoEntityProcessor.java | 242 +++++++
.../service/DemoPrimitiveProcessor.java | 146 ++++
.../java/myservice/mynamespace/util/Util.java | 161 +++++
.../myservice/mynamespace/web/DemoServlet.java | 74 +++
.../src/main/webapp/WEB-INF/web.xml | 40 ++
.../src/main/webapp/index.jsp | 26 +
samples/tutorials/pom.xml | 3 +
118 files changed, 10156 insertions(+), 2330 deletions(-)
----------------------------------------------------------------------