Repository: olingo-odata4 Updated Branches: refs/heads/master 7d6c587c7 -> 8ad67fede
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8ad67fed/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java index bf567a5..8a2ede1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java @@ -59,12 +59,12 @@ public class ODataStreamUpdateRequestImpl * {@inheritDoc } */ @Override - protected StreamUpdateStreamManager getStreamManager() { - if (streamManager == null) { - streamManager = new StreamUpdateStreamManagerImpl(this.stream); + protected StreamUpdateStreamManager getPayloadManager() { + if (payloadManager == null) { + payloadManager = new StreamUpdateStreamManagerImpl(this.stream); } - return (StreamUpdateStreamManager) streamManager; + return (StreamUpdateStreamManager) payloadManager; } public class StreamUpdateStreamManagerImpl extends AbstractODataStreamManager<ODataStreamUpdateResponse> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8ad67fed/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java index 8a3d903..03021b0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java @@ -23,11 +23,10 @@ import java.util.Collection; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.header.ODataPreferences; +import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.batch.ODataChangeset; -import org.apache.olingo.client.api.communication.request.batch.ODataRetrieve; -import org.apache.olingo.client.api.communication.request.batch.v4.BatchStreamManager; +import org.apache.olingo.client.api.communication.request.batch.v4.BatchManager; import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest; -import org.apache.olingo.client.api.communication.request.batch.v4.ODataOutsideUpdate; import org.apache.olingo.client.api.communication.request.v4.AsyncBatchRequestWrapper; import org.apache.olingo.client.api.communication.response.ODataBatchResponse; import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper; @@ -37,11 +36,11 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class AsyncBatchRequestWrapperImpl extends AsyncRequestWrapperImpl<ODataBatchResponse> implements AsyncBatchRequestWrapper { - private BatchStreamManager batchStreamManager; + private BatchManager batchManager; protected AsyncBatchRequestWrapperImpl(final ODataClient odataClient, final ODataBatchRequest odataRequest) { super(odataClient, odataRequest); - batchStreamManager = odataRequest.execute(); + batchManager = odataRequest.payloadManager(); } /** @@ -49,28 +48,28 @@ public class AsyncBatchRequestWrapperImpl extends AsyncRequestWrapperImpl<ODataB */ @Override public ODataChangeset addChangeset() { - return batchStreamManager.addChangeset(); + return batchManager.addChangeset(); } /** * {@inheritDoc} */ @Override - public ODataRetrieve addRetrieve() { - return batchStreamManager.addRetrieve(); + public void addRetrieve(final ODataBatchableRequest request) { + batchManager.addRetrieve(request); } /** * {@inheritDoc} */ @Override - public ODataOutsideUpdate addOutsideUpdate() { - return batchStreamManager.addOutsideUpdate(); + public void addOutsideUpdate(final ODataBatchableRequest request) { + batchManager.addOutsideUpdate(request); } @Override public AsyncResponseWrapper<ODataBatchResponse> execute() { - return new AsyncResponseWrapperImpl(batchStreamManager.getResponse()); + return new AsyncResponseWrapperImpl(batchManager.getResponse()); } public class AsyncResponseWrapperImpl
