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/07/10 11:00:41 UTC
[9/9] olingo-odata4 git commit: [OLINGO-708] Merge branch 'master'
into OLINGO-708_AsyncSupportTec
[OLINGO-708] Merge branch 'master' into OLINGO-708_AsyncSupportTec
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/6b6902f2
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/6b6902f2
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/6b6902f2
Branch: refs/heads/OLINGO-708_AsyncSupportTec
Commit: 6b6902f2847fb8a91a086266014f441bbc73b22a
Parents: bf3905a b484f7f
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Jul 10 10:53:47 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Jul 10 10:53:47 2015 +0200
----------------------------------------------------------------------
.../apache/olingo/fit/v4/BatchTestITCase.java | 2 -
.../org/apache/olingo/server/api/OData.java | 9 +
.../olingo/server/api/ODataHttpHandler.java | 7 +
.../server/api/debug/DebugResponseHelper.java | 38 ++
.../olingo/server/api/debug/DebugSupport.java | 49 ++
.../server/api/debug/DefaultDebugSupport.java | 52 ++
.../server/core/ODataHttpHandlerImpl.java | 33 +-
.../apache/olingo/server/core/ODataImpl.java | 9 +
.../core/debug/DebugResponseHelperImpl.java | 33 ++
.../deserializer/batch/BatchLineReader.java | 223 +++++++++
.../core/deserializer/batch/BatchParser.java | 3 +-
.../BufferedReaderIncludingLineEndings.java | 233 ---------
.../serializer/BatchResponseSerializer.java | 148 ++++--
.../serializer/json/ODataJsonSerializer.java | 1 -
.../batchhandler/MockedBatchHandlerTest.java | 19 +-
.../deserializer/batch/BatchLineReaderTest.java | 257 ++++++++++
.../BufferedReaderIncludingLineEndingsTest.java | 481 -------------------
.../serializer/BatchResponseSerializerTest.java | 235 ++++++++-
.../olingo/server/tecsvc/TechnicalServlet.java | 5 +
pom.xml | 1 +
.../myservice/mynamespace/data/Storage.java | 92 ++--
.../mynamespace/service/DemoEdmProvider.java | 43 +-
.../service/DemoEntityCollectionProcessor.java | 47 +-
.../service/DemoEntityProcessor.java | 64 ++-
.../service/DemoPrimitiveProcessor.java | 42 +-
.../java/myservice/mynamespace/util/Util.java | 126 ++---
.../myservice/mynamespace/web/DemoServlet.java | 17 +-
27 files changed, 1258 insertions(+), 1011 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6b6902f2/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
----------------------------------------------------------------------
diff --cc lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
index 09e8682,8b74a88..0b5922c
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
@@@ -33,9 -33,9 +33,10 @@@ import javax.servlet.http.HttpSession
import org.apache.olingo.server.api.OData;
import org.apache.olingo.server.api.ODataHttpHandler;
import org.apache.olingo.server.api.ServiceMetadata;
+ import org.apache.olingo.server.api.debug.DefaultDebugSupport;
import org.apache.olingo.server.api.edmx.EdmxReference;
import org.apache.olingo.server.api.edmx.EdmxReferenceInclude;
+import org.apache.olingo.server.tecsvc.async.TechnicalAsyncService;
import org.apache.olingo.server.tecsvc.data.DataProvider;
import org.apache.olingo.server.tecsvc.processor.TechnicalActionProcessor;
import org.apache.olingo.server.tecsvc.processor.TechnicalBatchProcessor;