olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chri...@apache.org
Subject [2/2] olingo-odata4 git commit: Merge branch 'master' into batchrefactor
Date Tue, 16 Dec 2014 09:57:49 GMT
Merge branch 'master' into batchrefactor

Conflicts:
	lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
	lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java
	lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/55c4d69d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/55c4d69d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/55c4d69d

Branch: refs/heads/master
Commit: 55c4d69d8da7bc2b66c37f17a8e39309a39052a7
Parents: aab7eaf 01677f7
Author: Christian Amend <chrisam@apache.org>
Authored: Tue Dec 16 10:49:17 2014 +0100
Committer: Christian Amend <chrisam@apache.org>
Committed: Tue Dec 16 10:49:17 2014 +0100

----------------------------------------------------------------------
 .../olingo/fit/tecsvc/client/MediaITCase.java   |  34 +++++
 .../org/apache/olingo/server/api/OData.java     |   9 +-
 .../olingo/server/api/batch/BatchFacade.java    |   4 +-
 .../exception/BatchSerializerException.java     |  46 ++++++
 .../exception/BatchSerializerExecption.java     |  46 ------
 .../deserializer/batch/BatchRequestPart.java    |   2 +-
 .../deserializer/batch/ODataResponsePart.java   |   4 +-
 .../server/api/processor/BatchProcessor.java    |  32 +++-
 .../processor/ComplexCollectionProcessor.java   |  37 ++++-
 .../server/api/processor/ComplexProcessor.java  |  32 +++-
 .../CountComplexCollectionProcessor.java        |  43 ++++++
 .../CountEntityCollectionProcessor.java         |   6 +-
 .../CountPrimitiveCollectionProcessor.java      |  46 ++++++
 .../server/api/processor/DefaultProcessor.java  |   6 +-
 .../server/api/processor/DeltaProcessor.java    |  39 +++++
 .../processor/EntityCollectionProcessor.java    |   6 +-
 .../server/api/processor/EntityProcessor.java   |  44 +++++-
 .../server/api/processor/ErrorProcessor.java    |  41 +++++
 .../api/processor/ExceptionProcessor.java       |  40 -----
 .../api/processor/MediaEntityProcessor.java     |  75 +++++++++
 .../server/api/processor/MediaProcessor.java    |  80 ----------
 .../server/api/processor/MetadataProcessor.java |   6 +-
 .../processor/PrimitiveCollectionProcessor.java |  38 ++++-
 .../api/processor/PrimitiveProcessor.java       |  33 ++--
 .../api/processor/PrimitiveValueProcessor.java  |  46 ++++++
 .../processor/ReferenceCollectionProcessor.java |  47 ++++++
 .../api/processor/ReferenceProcessor.java       |  87 +++++++++++
 .../api/processor/ServiceDocumentProcessor.java |   6 +-
 .../api/serializer/FixedFormatSerializer.java   |   4 +-
 .../server/api/serializer/ODataSerializer.java  |  22 ---
 .../apache/olingo/server/api/uri/UriHelper.java |  59 +++++++
 .../server/api/uri/UriResourceAction.java       |   2 +-
 .../server/api/uri/UriResourceFunction.java     |   2 +-
 .../expression/ExpressionVisitor.java           |   4 +-
 .../apache/olingo/server/core/ODataHandler.java |  59 +++----
 .../apache/olingo/server/core/ODataImpl.java    |   9 +-
 .../server/core/batchhandler/BatchHandler.java  |   2 +-
 .../core/batchhandler/BatchPartHandler.java     |   4 +-
 .../serializer/BatchResponseSerializer.java     |  16 +-
 .../serializer/FixedFormatSerializerImpl.java   |   4 +-
 .../serializer/json/ODataJsonSerializer.java    |  13 --
 .../serializer/xml/ODataXmlSerializerImpl.java  |  19 +--
 .../olingo/server/core/uri/UriHelperImpl.java   |  84 ++++++++++
 .../batchhandler/MockedBatchHandlerTest.java    |  18 +--
 .../olingo/server/tecsvc/data/DataProvider.java |  15 ++
 .../processor/TechnicalBatchProcessor.java      |  53 +++----
 .../processor/TechnicalEntityProcessor.java     | 105 +++++++++----
 .../TechnicalPrimitiveComplexProcessor.java     | 153 +++++++++++++------
 .../server/tecsvc/data/DataProviderTest.java    |  24 ++-
 .../olingo/server/core/ODataHandlerTest.java    |  58 ++++---
 .../json/ODataJsonSerializerTest.java           |  17 ++-
 .../olingo/server/core/uri/UriHelperTest.java   |  82 ++++++++++
 .../server/sample/processor/CarsProcessor.java  | 146 ++++++++++++++++--
 53 files changed, 1432 insertions(+), 477 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
index 0a6f369,7e05629..47dcd8f
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java
@@@ -67,7 -68,7 +68,7 @@@ public abstract class OData 
     * Creates a new serializer object for rendering content in a fixed format, e.g., for
binary output.
     * Serializers are used in Processor implementations.
     */
--  public abstract FixedFormatSerializer createFixedFormatSerializer() throws SerializerException;
++  public abstract FixedFormatSerializer createFixedFormatSerializer();
  
    /**
     * Creates a new deserializer object for reading content in a fixed format, e.g., for
binary input.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/exception/BatchSerializerException.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/batch/exception/BatchSerializerException.java
index 0000000,0000000..03b1f14
new file mode 100644
--- /dev/null
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/exception/BatchSerializerException.java
@@@ -1,0 -1,0 +1,46 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements. See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership. The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License. You may obtain a copy of the License at
++ * 
++ * http://www.apache.org/licenses/LICENSE-2.0
++ * 
++ * Unless required by applicable law or agreed to in writing,
++ * software distributed under the License is distributed on an
++ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++ * KIND, either express or implied. See the License for the
++ * specific language governing permissions and limitations
++ * under the License.
++ */
++package org.apache.olingo.server.api.batch.exception;
++
++import org.apache.olingo.server.api.serializer.SerializerException;
++
++public class BatchSerializerException extends SerializerException {
++
++  private static final long serialVersionUID = 2634433974342796905L;
++
++  public static enum MessageKeys implements MessageKey {
++    MISSING_CONTENT_ID;
++
++    @Override
++    public String getKey() {
++      return name();
++    }
++  }
++
++  public BatchSerializerException(final String developmentMessage, final MessageKey messageKey,
++      final String... parameters) {
++    super(developmentMessage, messageKey, parameters);
++  }
++
++  @Override
++  protected String getBundleName() {
++    return DEFAULT_SERVER_BUNDLE_NAME;
++  }
++
++}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/exception/BatchSerializerExecption.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/batch/exception/BatchSerializerExecption.java
index fb34313,9af85da..0000000
deleted file mode 100644,100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/exception/BatchSerializerExecption.java
+++ /dev/null
@@@ -1,46 -1,44 +1,0 @@@
--/*
-- * Licensed to the Apache Software Foundation (ASF) under one
-- * or more contributor license agreements. See the NOTICE file
-- * distributed with this work for additional information
-- * regarding copyright ownership. The ASF licenses this file
-- * to you under the Apache License, Version 2.0 (the
-- * "License"); you may not use this file except in compliance
-- * with the License. You may obtain a copy of the License at
-- * 
-- * http://www.apache.org/licenses/LICENSE-2.0
-- * 
-- * Unless required by applicable law or agreed to in writing,
-- * software distributed under the License is distributed on an
-- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-- * KIND, either express or implied. See the License for the
-- * specific language governing permissions and limitations
-- * under the License.
-- */
--package org.apache.olingo.server.api.batch.exception;
--
- import org.apache.olingo.server.api.serializer.SerializerException;
- 
- public class BatchSerializerExecption extends SerializerException {
- 
-   private static final long serialVersionUID = 2634433974342796905L;
- 
-   public static enum MessageKeys implements MessageKey {
-     MISSING_CONTENT_ID;
- 
-     @Override
-     public String getKey() {
-       return name();
-     }
-   }
- 
-   public BatchSerializerExecption(final String developmentMessage, final MessageKey messageKey,
-       final String... parameters) {
-     super(developmentMessage, messageKey, parameters);
-   }
- 
-   @Override
-   protected String getBundleName() {
-     return DEFAULT_SERVER_BUNDLE_NAME;
-   }
- 
- }
 -public class BatchSerializerExecption extends BatchException {
 -
 -  private static final long serialVersionUID = 2634433974342796905L;
 -
 -  public static enum MessageKeys implements MessageKey {
 -    MISSING_CONTENT_ID;
 -
 -    @Override
 -    public String getKey() {
 -      return name();
 -    }
 -  }
 -
 -  public BatchSerializerExecption(final String developmentMessage, final MessageKey messageKey,
 -      final String... parameters) {
 -    super(developmentMessage, messageKey, parameters);
 -  }
 -
 -  @Override
 -  protected String getBundleName() {
 -    return DEFAULT_SERVER_BUNDLE_NAME;
 -  }
 -
 -}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
index d37fb6b,b15d47b..d0f828d
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
@@@ -23,14 -23,34 +23,34 @@@ import java.util.List
  import org.apache.olingo.server.api.ODataRequest;
  import org.apache.olingo.server.api.ODataResponse;
  import org.apache.olingo.server.api.batch.BatchFacade;
- import org.apache.olingo.server.api.deserializer.DeserializerException;
+ import org.apache.olingo.server.api.batch.exception.BatchDeserializerException;
 -import org.apache.olingo.server.api.batch.exception.BatchException;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
  import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
--import org.apache.olingo.server.api.serializer.SerializerException;
- 
  
+ /**
+  * Processor interface for handling a single instance of an Entity Type.
+  */
  public interface BatchProcessor extends Processor {
-   void executeBatch(BatchFacade facade, ODataRequest request, ODataResponse response)
-       throws SerializerException, DeserializerException;
  
-   ODataResponsePart executeChangeSet(BatchFacade facade, List<ODataRequest> requests);
+   /**
+    * Process a complete batch request and puts serialized content and status into the response.
+    * @param facade   BatchFacade which should be used for further batch part handling
+    * @param request  OData request object containing raw HTTP information
+    * @param response OData response object for collecting response data
+    * @throws BatchException               if the service implementation encounters a failure
+    * @throws BatchDeserializerException   if de-serialization failed
+    */
+   void processBatch(BatchFacade facade, ODataRequest request, ODataResponse response)
 -      throws SerializerException, BatchException;
++      throws BatchSerializerException, BatchDeserializerException;
++
+ 
+   /**
+    * Process a batch change set (containing several batch requests)
+    * and puts serialized content and status into the response.
+    * @param facade    BatchFacade which should be used for further batch part handling
+    * @param requests  List of ODataRequests which are included in the to be processed change
set
+    * @throws BatchDeserializerException   if de-serialization failed
+    */
+   ODataResponsePart processChangeSet(BatchFacade facade, List<ODataRequest> requests)
+           throws BatchDeserializerException;
  }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
----------------------------------------------------------------------
diff --cc lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
index 28ed0ef,28ed0ef..19ae37d
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
@@@ -22,7 -22,7 +22,7 @@@ import java.io.InputStream
  import java.util.List;
  
  import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
--import org.apache.olingo.server.api.batch.exception.BatchSerializerExecption;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
  import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
  
  /** OData serializer for fixed output formats. */
@@@ -51,5 -51,5 +51,5 @@@ public interface FixedFormatSerializer 
  
    // TODO: Document
    // TODO: Return type
--  InputStream batchResponse(List<ODataResponsePart> batchResponses, String boundary)
throws BatchSerializerExecption;
++  InputStream batchResponse(List<ODataResponsePart> batchResponses, String boundary)
throws BatchSerializerException;
  }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
index a13281e,81e1ce1..1a8bfca
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
@@@ -59,7 -61,7 +61,7 @@@ public class ODataImpl extends OData 
    }
  
    @Override
--  public FixedFormatSerializer createFixedFormatSerializer() throws SerializerException
{
++  public FixedFormatSerializer createFixedFormatSerializer() {
      return new FixedFormatSerializerImpl();
    }
  

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
index 4e8138f,4e8138f..d8db126
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
@@@ -31,8 -31,8 +31,8 @@@ import org.apache.olingo.commons.api.ht
  import org.apache.olingo.commons.api.http.HttpHeader;
  import org.apache.olingo.commons.api.http.HttpStatusCode;
  import org.apache.olingo.server.api.ODataResponse;
--import org.apache.olingo.server.api.batch.exception.BatchSerializerExecption;
--import org.apache.olingo.server.api.batch.exception.BatchSerializerExecption.MessageKeys;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException.MessageKeys;
  import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
  import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon;
  
@@@ -44,14 -44,14 +44,14 @@@ public class BatchResponseSerializer 
    private static final String CRLF = "\r\n";
  
    public InputStream serialize(final List<ODataResponsePart> responses, final String
boundary)
--      throws BatchSerializerExecption {
++      throws BatchSerializerException {
      StringBuilder builder = createBody(responses, boundary);
  
      return new ByteArrayInputStream(builder.toString().getBytes());
    }
  
    private StringBuilder createBody(final List<ODataResponsePart> batchResponses, final
String boundary)
--      throws BatchSerializerExecption {
++      throws BatchSerializerException {
      final StringBuilder builder = new StringBuilder();
  
      for (final ODataResponsePart part : batchResponses) {
@@@ -68,7 -68,7 +68,7 @@@
      return builder;
    }
  
--  private void appendChangeSet(ODataResponsePart part, StringBuilder builder) throws BatchSerializerExecption
{
++  private void appendChangeSet(ODataResponsePart part, StringBuilder builder) throws BatchSerializerException
{
      final String changeSetBoundary = generateBoundary("changeset");
  
      appendChangeSetHeader(builder, changeSetBoundary);
@@@ -84,7 -84,7 +84,7 @@@
    }
  
    private void appendBodyPart(ODataResponse response, StringBuilder builder, boolean isChangeSet)
--      throws BatchSerializerExecption {
++      throws BatchSerializerException {
      byte[] body = getBody(response);
  
      appendBodyPartHeader(response, builder, isChangeSet);
@@@ -157,7 -157,7 +157,7 @@@
    }
  
    private void appendBodyPartHeader(ODataResponse response, StringBuilder builder, boolean
isChangeSet)
--      throws BatchSerializerExecption {
++      throws BatchSerializerException {
      appendHeader(HttpHeader.CONTENT_TYPE, HttpContentType.APPLICATION_HTTP, builder);
      appendHeader(BatchParserCommon.HTTP_CONTENT_TRANSFER_ENCODING, BatchParserCommon.BINARY_ENCODING,
builder);
  
@@@ -166,7 -166,7 +166,7 @@@
          appendHeader(BatchParserCommon.HTTP_CONTENT_ID, response.getHeaders().get(BatchParserCommon.HTTP_CONTENT_ID),
              builder);
        } else {
--        throw new BatchSerializerExecption("Missing content id", MessageKeys.MISSING_CONTENT_ID);
++        throw new BatchSerializerException("Missing content id", MessageKeys.MISSING_CONTENT_ID);
        }
      }
    }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerImpl.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerImpl.java
index 81710e0,81710e0..004b23a
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerImpl.java
@@@ -25,7 -25,7 +25,7 @@@ import java.util.List
  
  import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
  import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
--import org.apache.olingo.server.api.batch.exception.BatchSerializerExecption;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
  import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
  import org.apache.olingo.server.api.serializer.FixedFormatSerializer;
  import org.apache.olingo.server.api.serializer.PrimitiveValueSerializerOptions;
@@@ -63,7 -63,7 +63,7 @@@ public class FixedFormatSerializerImpl 
    // TODO: Signature
    @Override
    public InputStream batchResponse(final List<ODataResponsePart> batchResponses, final
String boundary)
--      throws BatchSerializerExecption {
++      throws BatchSerializerException {
      final BatchResponseSerializer serializer = new BatchResponseSerializer();
  
      return serializer.serialize(batchResponses, boundary);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java
index a49e9d0,c3a47da..cad50b2
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java
@@@ -18,7 -18,7 +18,11 @@@
   */
  package org.apache.olingo.server.core.batchhandler;
  
--import static org.junit.Assert.*;
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
++import static org.mockito.Mockito.mock;
++import static org.mockito.Mockito.when;
  
  import java.io.ByteArrayInputStream;
  import java.io.InputStream;
@@@ -40,13 -40,14 +44,12 @@@ import org.apache.olingo.server.api.ODa
  import org.apache.olingo.server.api.ServiceMetadata;
  import org.apache.olingo.server.api.batch.BatchFacade;
  import org.apache.olingo.server.api.batch.exception.BatchDeserializerException;
 -import org.apache.olingo.server.api.batch.exception.BatchException;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
  import org.apache.olingo.server.api.deserializer.batch.BatchOptions;
  import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart;
  import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
  import org.apache.olingo.server.api.processor.BatchProcessor;
--import org.apache.olingo.server.api.serializer.SerializerException;
  import org.apache.olingo.server.core.ODataHandler;
--import org.apache.olingo.server.core.batchhandler.BatchHandler;
  import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon;
  import org.apache.olingo.server.core.deserializer.batch.BufferedReaderIncludingLineEndings;
  import org.junit.Before;
@@@ -54,9 -55,9 +57,6 @@@ import org.junit.Test
  import org.mockito.invocation.InvocationOnMock;
  import org.mockito.stubbing.Answer;
  
--import static org.mockito.Mockito.mock;
--import static org.mockito.Mockito.when;
--
  public class MockedBatchHandlerTest {
  
    private static final String BATCH_CONTENT_TYPE = "multipart/mixed;boundary=batch_12345";
@@@ -594,8 -595,8 +594,8 @@@
      }
  
      @Override
-     public void executeBatch(BatchFacade fascade, ODataRequest request, ODataResponse response)
-         throws SerializerException, BatchDeserializerException {
+     public void processBatch(BatchFacade fascade, ODataRequest request, ODataResponse response)
 -        throws BatchException, SerializerException {
++        throws BatchDeserializerException, BatchSerializerException {
        final String boundary = getBoundary(request.getHeader(HttpHeader.CONTENT_TYPE));
        final BatchOptions options = BatchOptions.with().isStrict(true).rawBaseUri(BASE_URI).build();
        final List<BatchRequestPart> parts =

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/55c4d69d/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java
----------------------------------------------------------------------
diff --cc lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java
index 4e6ec4c,1e521be..cb83a47
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java
@@@ -24,7 -24,7 +24,6 @@@ import java.util.List
  import java.util.Locale;
  import java.util.UUID;
  
--import org.apache.olingo.commons.api.ODataRuntimeException;
  import org.apache.olingo.commons.api.format.ContentType;
  import org.apache.olingo.commons.api.http.HttpHeader;
  import org.apache.olingo.commons.api.http.HttpStatusCode;
@@@ -32,11 -32,12 +31,11 @@@ import org.apache.olingo.server.api.ODa
  import org.apache.olingo.server.api.ODataResponse;
  import org.apache.olingo.server.api.batch.BatchFacade;
  import org.apache.olingo.server.api.batch.exception.BatchDeserializerException;
 -import org.apache.olingo.server.api.batch.exception.BatchException;
++import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
  import org.apache.olingo.server.api.deserializer.batch.BatchOptions;
  import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart;
  import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
  import org.apache.olingo.server.api.processor.BatchProcessor;
--import org.apache.olingo.server.api.serializer.SerializerException;
  import org.apache.olingo.server.tecsvc.data.DataProvider;
  
  public class TechnicalBatchProcessor extends TechnicalProcessor implements BatchProcessor
{
@@@ -48,9 -49,9 +47,8 @@@
    }
  
    @Override
-   public void executeBatch(BatchFacade fascade, ODataRequest request, ODataResponse response)
-       throws SerializerException, BatchDeserializerException {
- 
+   public void processBatch(BatchFacade fascade, ODataRequest request, ODataResponse response)
 -      throws SerializerException, BatchException {
 -
++      throws BatchSerializerException, BatchDeserializerException {
      // TODO refactor isContinueOnError
      boolean continueOnError = isContinueOnError(request);
  


Mime
View raw message