Repository: olingo-odata4 Updated Branches: refs/heads/master 8ad67fede -> 24ce9af64
Merged StreamRequestFactory methods into CURDrequestFactory and removed StreamRequestFactory Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/24ce9af6 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/24ce9af6 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/24ce9af6 Branch: refs/heads/master Commit: 24ce9af649392471fae64af28ecab8ebd38090c8 Parents: 8ad67fe Author: fmartelli <[email protected]> Authored: Tue May 20 15:02:39 2014 +0200 Committer: fmartelli <[email protected]> Committed: Tue May 20 15:02:39 2014 +0200 ---------------------------------------------------------------------- .../olingo/ext/proxy/commons/ContainerImpl.java | 18 ++--- .../apache/olingo/fit/v3/AsyncTestITCase.java | 2 +- .../olingo/fit/v3/MediaEntityTestITCase.java | 6 +- .../olingo/fit/v4/MediaEntityTestITCase.java | 4 +- .../olingo/client/api/CommonODataClient.java | 3 - .../request/cud/CommonCUDRequestFactory.java | 41 +++++++++++ .../streamed/StreamedRequestFactory.java | 67 ----------------- .../olingo/client/core/AbstractODataClient.java | 2 +- .../request/cud/AbstractCUDRequestFactory.java | 44 +++++++++++ .../ODataMediaEntityCreateRequestImpl.java | 2 +- .../ODataMediaEntityUpdateRequestImpl.java | 2 +- .../streamed/ODataStreamUpdateRequestImpl.java | 2 +- .../streamed/StreamedRequestFactoryImpl.java | 77 -------------------- .../olingo/client/core/v3/ODataClientImpl.java | 9 --- .../olingo/client/core/v4/ODataClientImpl.java | 9 --- 15 files changed, 104 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ContainerImpl.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ContainerImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ContainerImpl.java index abc7052..86a30b0 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ContainerImpl.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ContainerImpl.java @@ -201,7 +201,7 @@ class ContainerImpl implements Container { LOG.debug("Update media entity '{}'", uri); final ODataMediaEntityUpdateRequest<?> req = - client.getStreamedRequestFactory().getMediaEntityUpdateRequest(uri, input); + client.getCUDRequestFactory().getMediaEntityUpdateRequest(uri, input); req.setContentType(StringUtils.isBlank(handler.getEntity().getMediaContentType()) ? ODataMediaFormat.WILDCARD.toString() @@ -222,7 +222,7 @@ class ContainerImpl implements Container { LOG.debug("Update media entity '{}'", uri); - final ODataStreamUpdateRequest req = client.getStreamedRequestFactory().getStreamUpdateRequest(uri, input); + final ODataStreamUpdateRequest req = client.getCUDRequestFactory().getStreamUpdateRequest(uri, input); if (StringUtils.isNotBlank(handler.getETag())) { req.setIfMatch(handler.getETag()); @@ -242,10 +242,10 @@ class ContainerImpl implements Container { client.getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0 ? ((org.apache.olingo.client.api.v3.EdmEnabledODataClient) client).getCUDRequestFactory(). getEntityUpdateRequest(handler.getEntityURI(), - org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes) + org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes) : ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) client).getCUDRequestFactory(). getEntityUpdateRequest(handler.getEntityURI(), - org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); + org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); req.setPrefer(new ODataPreferences(client.getServiceVersion()).returnContent()); @@ -268,10 +268,10 @@ class ContainerImpl implements Container { client.getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0 ? ((org.apache.olingo.client.api.v3.EdmEnabledODataClient) client).getCUDRequestFactory(). getEntityUpdateRequest(uri, - org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes) + org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes) : ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) client).getCUDRequestFactory(). getEntityUpdateRequest(uri, - org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); + org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); req.setPrefer(new ODataPreferences(client.getServiceVersion()).returnContent()); @@ -402,7 +402,7 @@ class ContainerImpl implements Container { final URI targetURI = currentStatus == AttachedEntityStatus.NEW ? URI.create("$" + startingPos + "/$value") : URIUtils.getURI( - factory.getServiceRoot(), handler.getEntity().getEditLink().toASCIIString() + "/$value"); + factory.getServiceRoot(), handler.getEntity().getEditLink().toASCIIString() + "/$value"); batchUpdateMediaEntity(handler, targetURI, handler.getStreamChanges(), changeset); @@ -415,8 +415,8 @@ class ContainerImpl implements Container { for (Map.Entry<String, InputStream> streamedChanges : handler.getStreamedPropertyChanges().entrySet()) { final URI targetURI = currentStatus == AttachedEntityStatus.NEW ? URI.create("$" + startingPos) : URIUtils.getURI( - factory.getServiceRoot(), - CoreUtils.getMediaEditLink(streamedChanges.getKey(), entity).toASCIIString()); + factory.getServiceRoot(), + CoreUtils.getMediaEditLink(streamedChanges.getKey(), entity).toASCIIString()); batchUpdateMediaResource(handler, targetURI, streamedChanges.getValue(), changeset); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java index a0d4d91..ac43372 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java @@ -99,7 +99,7 @@ public class AsyncTestITCase extends AbstractTestITCase { final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED); final ODataMediaEntityCreateRequest<ODataEntity> createReq = - client.getStreamedRequestFactory().getMediaEntityCreateRequest(builder.build(), input); + client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input); final MediaEntityCreateStreamManager<ODataEntity> streamManager = createReq.payloadManager(); final Future<ODataMediaEntityCreateResponse<ODataEntity>> futureCreateRes = streamManager.getAsyncResponse(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java index f4a8ae0..cc88cf1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java @@ -90,7 +90,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase { final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED); final ODataMediaEntityUpdateRequest<ODataEntity> updateReq = - client.getStreamedRequestFactory().getMediaEntityUpdateRequest(builder.build(), input); + client.getCUDRequestFactory().getMediaEntityUpdateRequest(builder.build(), input); updateReq.setFormat(format); final MediaEntityUpdateStreamManager<ODataEntity> streamManager = updateReq.payloadManager(); @@ -118,7 +118,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase { final URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car"); final ODataMediaEntityCreateRequest<ODataEntity> createReq = - client.getStreamedRequestFactory().getMediaEntityCreateRequest(builder.build(), input); + client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input); createReq.setFormat(format); final MediaEntityCreateStreamManager<ODataEntity> streamManager = createReq.payloadManager(); @@ -170,7 +170,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase { final InputStream input = new ByteArrayInputStream(TO_BE_UPDATED.getBytes()); final ODataStreamUpdateRequest updateReq = - client.getStreamedRequestFactory().getStreamUpdateRequest(builder.build(), input); + client.getCUDRequestFactory().getStreamUpdateRequest(builder.build(), input); final StreamUpdateStreamManager streamManager = updateReq.payloadManager(); final ODataStreamUpdateResponse updateRes = streamManager.getResponse(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java index 9a37a82..d9f3935 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java @@ -100,7 +100,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase { final URI uri = client.getURIBuilder(testDemoServiceRootURL).appendEntitySetSegment("Advertisements").build(); final ODataMediaEntityCreateRequest<ODataEntity> createReq = - client.getStreamedRequestFactory().getMediaEntityCreateRequest(uri, input); + client.getCUDRequestFactory().getMediaEntityCreateRequest(uri, input); final MediaEntityCreateStreamManager<ODataEntity> streamManager = createReq.payloadManager(); final ODataMediaEntityCreateResponse<ODataEntity> createRes = streamManager.getResponse(); @@ -151,7 +151,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase { final String random = RandomStringUtils.random(124); // 1. update providing media content - final ODataMediaEntityUpdateRequest<ODataEntity> updateReq = client.getStreamedRequestFactory(). + final ODataMediaEntityUpdateRequest<ODataEntity> updateReq = client.getCUDRequestFactory(). getMediaEntityUpdateRequest(uri, IOUtils.toInputStream(random)); updateReq.setFormat(format); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java index 1d9cdd3..c69f541 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java @@ -25,7 +25,6 @@ import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFa import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType; import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; -import org.apache.olingo.client.api.communication.request.streamed.StreamedRequestFactory; import org.apache.olingo.client.api.op.ClientODataDeserializer; import org.apache.olingo.commons.api.domain.CommonODataObjectFactory; import org.apache.olingo.client.api.op.CommonODataBinder; @@ -71,8 +70,6 @@ public interface CommonODataClient<UT extends CommonUpdateType> { CommonCUDRequestFactory<UT> getCUDRequestFactory(); - StreamedRequestFactory getStreamedRequestFactory(); - InvokeRequestFactory getInvokeRequestFactory(); CommonBatchRequestFactory getBatchRequestFactory(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java index ac09277..eac9a8a 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java @@ -18,8 +18,12 @@ */ package org.apache.olingo.client.api.communication.request.cud; +import java.io.InputStream; import java.io.Serializable; import java.net.URI; +import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest; +import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; +import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.CommonODataProperty; @@ -119,4 +123,41 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> extends Se * @return new ODataDeleteRequest instance. */ ODataDeleteRequest getDeleteRequest(URI targetURI); + + /** + * Gets a media entity create request object instance. + * <br/> + * Use this kind of request to create a new media entity. + * + * @param <E> concrete ODataEntity implementation + * @param targetURI entity set URI. + * @param media entity blob to be created. + * @return new ODataMediaEntityCreateRequest instance. + */ + <E extends CommonODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest( + URI targetURI, InputStream media); + + /** + * Gets a stream update request object instance. + * <br/> + * Use this kind of request to update a named stream property. + * + * @param targetURI target URI. + * @param stream stream to be updated. + * @return new ODataStreamUpdateRequest instance. + */ + ODataStreamUpdateRequest getStreamUpdateRequest(URI targetURI, InputStream stream); + + /** + * Gets a media entity update request object instance. + * <br/> + * Use this kind of request to update a media entity. + * + * @param <E> concrete ODataEntity implementation + * @param editURI media entity edit link URI. + * @param media entity blob to be updated. + * @return new ODataMediaEntityUpdateRequest instance. + */ + <E extends CommonODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest( + URI editURI, InputStream media); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/StreamedRequestFactory.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/StreamedRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/StreamedRequestFactory.java deleted file mode 100644 index b70642f..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/StreamedRequestFactory.java +++ /dev/null @@ -1,67 +0,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.client.api.communication.request.streamed; - -import java.io.InputStream; -import java.io.Serializable; -import java.net.URI; -import org.apache.olingo.commons.api.domain.CommonODataEntity; - -/** - * OData request factory class. - */ -public interface StreamedRequestFactory extends Serializable { - - /** - * Gets a media entity create request object instance. - * <br/> - * Use this kind of request to create a new media entity. - * - * @param <E> concrete ODataEntity implementation - * @param targetURI entity set URI. - * @param media entity blob to be created. - * @return new ODataMediaEntityCreateRequest instance. - */ - <E extends CommonODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest( - URI targetURI, InputStream media); - - /** - * Gets a stream update request object instance. - * <br/> - * Use this kind of request to update a named stream property. - * - * @param targetURI target URI. - * @param stream stream to be updated. - * @return new ODataStreamUpdateRequest instance. - */ - ODataStreamUpdateRequest getStreamUpdateRequest(URI targetURI, InputStream stream); - - /** - * Gets a media entity update request object instance. - * <br/> - * Use this kind of request to update a media entity. - * - * @param <E> concrete ODataEntity implementation - * @param editURI media entity edit link URI. - * @param media entity blob to be updated. - * @return new ODataMediaEntityUpdateRequest instance. - */ - <E extends CommonODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest( - URI editURI, InputStream media); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java index 00a7d66..fd9eae5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java @@ -29,7 +29,7 @@ public abstract class AbstractODataClient<UT extends CommonUpdateType> implement private static final long serialVersionUID = 7269096702397630265L; private final ODataWriter writer = new ODataWriterImpl(this); - + @Override public ODataPreferences newPreferences() { return new ODataPreferences(getServiceVersion()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java index a45afc7..43de94e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.communication.request.cud; +import java.io.InputStream; import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory; @@ -27,7 +28,13 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateR import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest; +import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest; +import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; +import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEntityCreateRequestImpl; +import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEntityUpdateRequestImpl; +import org.apache.olingo.client.core.communication.request.streamed.ODataStreamUpdateRequestImpl; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; @@ -174,4 +181,41 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp return req; } + + @Override + public <E extends CommonODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest( + final URI targetURI, final InputStream media) { + + return new ODataMediaEntityCreateRequestImpl<E>(client, targetURI, media); + } + + @Override + public ODataStreamUpdateRequest getStreamUpdateRequest(final URI targetURI, final InputStream stream) { + final ODataStreamUpdateRequest req; + + if (client.getConfiguration().isUseXHTTPMethod()) { + req = new ODataStreamUpdateRequestImpl(client, HttpMethod.POST, targetURI, stream); + req.setXHTTPMethod(HttpMethod.PUT.name()); + } else { + req = new ODataStreamUpdateRequestImpl(client, HttpMethod.PUT, targetURI, stream); + } + + return req; + } + + @Override + public <E extends CommonODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest( + final URI editURI, final InputStream media) { + + final ODataMediaEntityUpdateRequest<E> req; + + if (client.getConfiguration().isUseXHTTPMethod()) { + req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.POST, editURI, media); + req.setXHTTPMethod(HttpMethod.PUT.name()); + } else { + req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.PUT, editURI, media); + } + + return req; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java index ad6b918..60bca42 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java @@ -52,7 +52,7 @@ public class ODataMediaEntityCreateRequestImpl<E extends CommonODataEntity> * @param targetURI target entity set. * @param media media entity blob to be created. */ - ODataMediaEntityCreateRequestImpl(final CommonODataClient<?> odataClient, final URI targetURI, + public ODataMediaEntityCreateRequestImpl(final CommonODataClient<?> odataClient, final URI targetURI, final InputStream media) { super(odataClient, HttpMethod.POST, targetURI); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java index 9513277..a63efa8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java @@ -53,7 +53,7 @@ public class ODataMediaEntityUpdateRequestImpl<E extends CommonODataEntity> * @param editURI edit URI of the entity to be updated. * @param media media entity blob to be created. */ - ODataMediaEntityUpdateRequestImpl(final CommonODataClient<?> odataClient, + public ODataMediaEntityUpdateRequestImpl(final CommonODataClient<?> odataClient, final HttpMethod method, final URI editURI, final InputStream media) { super(odataClient, method, editURI); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/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 8a2ede1..216c521 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 @@ -48,7 +48,7 @@ public class ODataStreamUpdateRequestImpl * @param targetURI target URI. * @param stream stream to be updated. */ - ODataStreamUpdateRequestImpl(final CommonODataClient<?> odataClient, + public ODataStreamUpdateRequestImpl(final CommonODataClient<?> odataClient, final HttpMethod method, final URI targetURI, final InputStream stream) { super(odataClient, method, targetURI); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/StreamedRequestFactoryImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/StreamedRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/StreamedRequestFactoryImpl.java deleted file mode 100644 index a7f1b56..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/StreamedRequestFactoryImpl.java +++ /dev/null @@ -1,77 +0,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.client.core.communication.request.streamed; - -import java.io.InputStream; -import java.net.URI; -import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest; -import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; -import org.apache.olingo.client.api.communication.request.streamed.StreamedRequestFactory; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.commons.api.domain.CommonODataEntity; - -public class StreamedRequestFactoryImpl implements StreamedRequestFactory { - - private static final long serialVersionUID = -2438839640443961168L; - - protected final CommonODataClient<?> client; - - public StreamedRequestFactoryImpl(final CommonODataClient<?> client) { - this.client = client; - } - - @Override - public <E extends CommonODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest( - final URI targetURI, final InputStream media) { - - return new ODataMediaEntityCreateRequestImpl<E>(client, targetURI, media); - } - - @Override - public ODataStreamUpdateRequest getStreamUpdateRequest(final URI targetURI, final InputStream stream) { - final ODataStreamUpdateRequest req; - - if (client.getConfiguration().isUseXHTTPMethod()) { - req = new ODataStreamUpdateRequestImpl(client, HttpMethod.POST, targetURI, stream); - req.setXHTTPMethod(HttpMethod.PUT.name()); - } else { - req = new ODataStreamUpdateRequestImpl(client, HttpMethod.PUT, targetURI, stream); - } - - return req; - } - - @Override - public <E extends CommonODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest( - final URI editURI, final InputStream media) { - - final ODataMediaEntityUpdateRequest<E> req; - - if (client.getConfiguration().isUseXHTTPMethod()) { - req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.POST, editURI, media); - req.setXHTTPMethod(HttpMethod.PUT.name()); - } else { - req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.PUT, editURI, media); - } - - return req; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java index 8b3b2e4..323f30b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java @@ -27,7 +27,6 @@ import org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFacto import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType; import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.v3.RetrieveRequestFactory; -import org.apache.olingo.client.api.communication.request.streamed.StreamedRequestFactory; import org.apache.olingo.commons.api.op.ODataSerializer; import org.apache.olingo.client.api.op.v3.ODataDeserializer; import org.apache.olingo.client.api.op.v3.ODataBinder; @@ -40,7 +39,6 @@ import org.apache.olingo.client.core.communication.request.batch.v3.BatchRequest import org.apache.olingo.client.core.communication.request.cud.v3.CUDRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.invoke.v3.InvokeRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.retrieve.v3.RetrieveRequestFactoryImpl; -import org.apache.olingo.client.core.communication.request.streamed.StreamedRequestFactoryImpl; import org.apache.olingo.client.core.op.impl.v3.ODataBinderImpl; import org.apache.olingo.client.core.op.impl.v3.ODataDeserializerImpl; import org.apache.olingo.client.core.op.impl.v3.ODataReaderImpl; @@ -73,8 +71,6 @@ public class ODataClientImpl extends AbstractODataClient<UpdateType> implements private final CUDRequestFactory cudReqFact = new CUDRequestFactoryImpl(this); - private final StreamedRequestFactory streamedReqFact = new StreamedRequestFactoryImpl(this); - private final InvokeRequestFactory invokeReqFact = new InvokeRequestFactoryImpl(this); private final BatchRequestFactory batchReqFact = new BatchRequestFactoryImpl(this); @@ -145,11 +141,6 @@ public class ODataClientImpl extends AbstractODataClient<UpdateType> implements } @Override - public StreamedRequestFactory getStreamedRequestFactory() { - return streamedReqFact; - } - - @Override public InvokeRequestFactory getInvokeRequestFactory() { return invokeReqFact; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24ce9af6/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java index fd298a0..b36d061 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java @@ -27,7 +27,6 @@ import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFacto import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.v4.RetrieveRequestFactory; -import org.apache.olingo.client.api.communication.request.streamed.StreamedRequestFactory; import org.apache.olingo.client.api.communication.request.v4.AsyncRequestFactory; import org.apache.olingo.commons.api.op.ODataSerializer; import org.apache.olingo.client.api.op.v4.ODataBinder; @@ -42,7 +41,6 @@ import org.apache.olingo.client.core.communication.request.batch.v4.BatchRequest import org.apache.olingo.client.core.communication.request.cud.v4.CUDRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.invoke.v4.InvokeRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.retrieve.v4.RetrieveRequestFactoryImpl; -import org.apache.olingo.client.core.communication.request.streamed.StreamedRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.v4.AsyncRequestFactoryImpl; import org.apache.olingo.client.core.op.impl.v4.ODataBinderImpl; import org.apache.olingo.client.core.op.impl.v4.ODataDeserializerImpl; @@ -80,8 +78,6 @@ public class ODataClientImpl extends AbstractODataClient<UpdateType> implements private final CUDRequestFactory cudReqFact = new CUDRequestFactoryImpl(this); - private final StreamedRequestFactory streamedReqFact = new StreamedRequestFactoryImpl(this); - private final InvokeRequestFactory invokeReqFact = new InvokeRequestFactoryImpl(this); private final BatchRequestFactory batchReqFact = new BatchRequestFactoryImpl(this); @@ -161,11 +157,6 @@ public class ODataClientImpl extends AbstractODataClient<UpdateType> implements } @Override - public StreamedRequestFactory getStreamedRequestFactory() { - return streamedReqFact; - } - - @Override public InvokeRequestFactory getInvokeRequestFactory() { return invokeReqFact; }
