You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/03/02 16:23:50 UTC
[2/3] olingo-odata4 git commit: [OLINGO-575] Delete abstract client
class
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/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
deleted file mode 100644
index 6cd6c92..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
+++ /dev/null
@@ -1,163 +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.cud;
-
-import java.io.InputStream;
-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.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
-
-/**
- * OData request factory class.
- *
- * @param <UT> concrete UpdateType.
- */
-public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
-
- /**
- * Gets a create request object instance.
- * <br/>
- * Use this kind of request to create a new entity.
- *
- * @param <E> concrete ODataEntity implementation
- * @param targetURI entity set URI.
- * @param entity entity to be created.
- * @return new ODataEntityCreateRequest instance.
- */
- <E extends ODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(URI targetURI, E entity);
-
- /**
- * Gets an update request object instance.
- *
- * @param <E> concrete ODataEntity implementation
- * @param targetURI edit link of the object to be updated.
- * @param type type of update to be performed.
- * @param changes changes to be applied.
- * @return new ODataEntityUpdateRequest instance.
- */
- <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(URI targetURI, UT type, E changes);
-
- /**
- * Gets an update request object instance; uses entity's edit link as endpoint.
- *
- * @param <E> concrete ODataEntity implementation
- * @param type type of update to be performed.
- * @param entity changes to be applied.
- * @return new ODataEntityUpdateRequest instance.
- */
- <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(UT type, E entity);
-
- /**
- * Gets a create request object instance.
- * <br/>
- * Use this kind of request to create a new value (e.g. http://Northwind.svc/Customer(1)/Picture/$value).
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param type type of update to be performed.
- * @param value value to be created.
- * @return new ODataValueUpdateRequest instance.
- */
- ODataValueUpdateRequest getValueUpdateRequest(URI targetURI, UT type, ODataPrimitiveValue value);
-
- /**
- * Gets an update request object instance.
- * <br/>
- * Use this kind of request to update a primitive property value.
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param property value to be update.
- * @return new ODataPropertyUpdateRequest instance.
- */
- ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(URI targetURI, ODataProperty property);
-
- /**
- * Gets an update request object instance.
- * <br/>
- * Use this kind of request to update a complex property value.
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param type type of update to be performed.
- * @param property value to be update.
- * @return new ODataPropertyUpdateRequest instance.
- */
- ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(URI targetURI, UT type, ODataProperty property);
-
- /**
- * Gets an update request object instance.
- * <br/>
- * Use this kind of request to update a collection property value.
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param property value to be update.
- * @return new ODataPropertyUpdateRequest instance.
- */
- ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(URI targetURI, ODataProperty property);
-
- /**
- * Gets a delete request object instance.
- * <br/>
- * Use this kind of request to delete an entity and media entity as well.
- *
- * @param targetURI edit link of the object to be removed.
- * @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 ODataEntity> 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 ODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
- URI editURI, InputStream media);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonUpdateType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonUpdateType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonUpdateType.java
deleted file mode 100644
index 94168ce..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonUpdateType.java
+++ /dev/null
@@ -1,31 +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.cud;
-
-import org.apache.olingo.commons.api.http.HttpMethod;
-
-public interface CommonUpdateType {
-
- /**
- * Gets HTTP request method.
- *
- * @return HTTP request method.
- */
- HttpMethod getMethod();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/UpdateType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/UpdateType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/UpdateType.java
index 07a1b62..23481dc 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/UpdateType.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/UpdateType.java
@@ -23,7 +23,7 @@ import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Update type.
*/
-public enum UpdateType implements CommonUpdateType {
+public enum UpdateType {
/**
* Replace all and remove missing attributes.
@@ -39,13 +39,12 @@ public enum UpdateType implements CommonUpdateType {
private UpdateType(final HttpMethod method) {
this.method = method;
}
-
+
/**
* Gets HTTP request method.
*
* @return HTTP request method.
*/
- @Override
public HttpMethod getMethod() {
return method;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
index da0eb2f..2944471 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
@@ -29,7 +29,7 @@ import java.util.NoSuchElementException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
@@ -56,7 +56,7 @@ public class ODataEntitySetIterator<ES extends ODataEntitySet, E extends ODataEn
*/
private static final Logger LOG = LoggerFactory.getLogger(ODataEntitySetIterator.class);
- protected final CommonODataClient<?> odataClient;
+ protected final ODataClient odataClient;
protected ResWrap<Entity> cached;
@@ -79,7 +79,7 @@ public class ODataEntitySetIterator<ES extends ODataEntitySet, E extends ODataEn
* @param stream source stream.
* @param format OData format.
*/
- public ODataEntitySetIterator(final CommonODataClient<?> odataClient, final InputStream stream,
+ public ODataEntitySetIterator(final ODataClient odataClient, final InputStream stream,
final ODataFormat format) {
this.odataClient = odataClient;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/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
deleted file mode 100644
index 5f04a4b..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java
+++ /dev/null
@@ -1,49 +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;
-
-import org.apache.olingo.client.api.CommonODataClient;
-import org.apache.olingo.client.api.Configuration;
-import org.apache.olingo.client.api.communication.header.ODataPreferences;
-import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType;
-import org.apache.olingo.client.api.serialization.ODataWriter;
-import org.apache.olingo.client.core.serialization.ODataWriterImpl;
-
-public abstract class AbstractODataClient<UT extends CommonUpdateType> implements CommonODataClient<UT> {
-
- protected final Configuration configuration = new ConfigurationImpl();
-
- private final ODataWriter writer = new ODataWriterImpl(this);
-
- @Override
- public Configuration getConfiguration() {
- return configuration;
- }
-
- @Override
- public ODataPreferences newPreferences() {
- return new ODataPreferences(getServiceVersion());
- }
-
- @Override
- public ODataWriter getWriter() {
- return writer;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
index e4cf2e7..8fce369 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
@@ -26,7 +26,7 @@ import org.apache.olingo.commons.api.format.ODataFormat;
public final class ODataClientFactory {
public static ODataClient getV4() {
- return new org.apache.olingo.client.core.ODataClientImpl();
+ return new ODataClientImpl();
}
public static EdmEnabledODataClient getEdmEnabledV4(final String serviceRoot) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
index 6d05785..a01ccfb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
@@ -18,18 +18,20 @@
*/
package org.apache.olingo.client.core;
+import org.apache.olingo.client.api.Configuration;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataHeaders;
+import org.apache.olingo.client.api.communication.header.ODataPreferences;
import org.apache.olingo.client.api.communication.request.AsyncRequestFactory;
import org.apache.olingo.client.api.communication.request.batch.BatchRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.CUDRequestFactory;
-import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory;
import org.apache.olingo.client.api.communication.request.retrieve.RetrieveRequestFactory;
import org.apache.olingo.client.api.serialization.ClientODataDeserializer;
import org.apache.olingo.client.api.serialization.ODataBinder;
import org.apache.olingo.client.api.serialization.ODataReader;
+import org.apache.olingo.client.api.serialization.ODataWriter;
import org.apache.olingo.client.api.uri.FilterFactory;
import org.apache.olingo.client.api.uri.SearchFactory;
import org.apache.olingo.client.api.uri.URIBuilder;
@@ -42,6 +44,7 @@ import org.apache.olingo.client.core.communication.request.retrieve.RetrieveRequ
import org.apache.olingo.client.core.serialization.ClientODataDeserializerImpl;
import org.apache.olingo.client.core.serialization.ODataBinderImpl;
import org.apache.olingo.client.core.serialization.ODataReaderImpl;
+import org.apache.olingo.client.core.serialization.ODataWriterImpl;
import org.apache.olingo.client.core.uri.FilterFactoryImpl;
import org.apache.olingo.client.core.uri.URIBuilderImpl;
import org.apache.olingo.commons.api.domain.ODataObjectFactory;
@@ -52,7 +55,7 @@ import org.apache.olingo.commons.core.domain.ODataObjectFactoryImpl;
import org.apache.olingo.commons.core.serialization.AtomSerializer;
import org.apache.olingo.commons.core.serialization.JsonSerializer;
-public class ODataClientImpl extends AbstractODataClient<UpdateType> implements ODataClient {
+public class ODataClientImpl implements ODataClient {
private final FilterFactory filterFactory = new FilterFactoryImpl(getServiceVersion());
@@ -74,6 +77,25 @@ public class ODataClientImpl extends AbstractODataClient<UpdateType> implements
private final BatchRequestFactory batchReqFact = new BatchRequestFactoryImpl(this);
+ protected final Configuration configuration = new ConfigurationImpl();
+
+ private final ODataWriter writer = new ODataWriterImpl(this);
+
+ @Override
+ public Configuration getConfiguration() {
+ return configuration;
+ }
+
+ @Override
+ public ODataPreferences newPreferences() {
+ return new ODataPreferences(getServiceVersion());
+ }
+
+ @Override
+ public ODataWriter getWriter() {
+ return writer;
+ }
+
@Override
public ODataServiceVersion getServiceVersion() {
return ODataServiceVersion.V40;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
index e81be79..f1cc64a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
@@ -21,7 +21,7 @@ package org.apache.olingo.client.core.communication.header;
import java.io.InputStream;
import org.apache.http.StatusLine;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.ODataServerErrorException;
import org.apache.olingo.commons.api.ODataRuntimeException;
@@ -43,7 +43,7 @@ public final class ODataErrorResponseChecker {
}
public static ODataRuntimeException checkResponse(
- final CommonODataClient<?> odataClient, final StatusLine statusLine, final InputStream entity,
+ final ODataClient odataClient, final StatusLine statusLine, final InputStream entity,
final String accept) {
ODataRuntimeException result = null;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
index 4566020..bbd5215 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
@@ -26,11 +26,11 @@ import java.util.concurrent.Future;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataBatchConstants;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
-import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
+import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
@@ -50,7 +50,7 @@ public abstract class AbstractODataBasicRequest<T extends ODataResponse>
* @param method request method.
* @param uri OData request URI.
*/
- public AbstractODataBasicRequest(final CommonODataClient<?> odataClient, final HttpMethod method, final URI uri) {
+ public AbstractODataBasicRequest(final ODataClient odataClient, final HttpMethod method, final URI uri) {
super(odataClient, method, uri);
}
@@ -85,7 +85,7 @@ public abstract class AbstractODataBasicRequest<T extends ODataResponse>
*
* @param req destination batch request.
*/
- public void batch(final CommonODataBatchRequest req) {
+ public void batch(final ODataBatchRequest req) {
batch(req, null);
}
@@ -97,7 +97,7 @@ public abstract class AbstractODataBasicRequest<T extends ODataResponse>
* @param req destination batch request.
* @param contentId contentId of the changeset item.
*/
- public void batch(final CommonODataBatchRequest req, final String contentId) {
+ public void batch(final ODataBatchRequest req, final String contentId) {
try {
req.rawAppend(toByteArray());
if (StringUtils.isNotBlank(contentId)) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java
index a5b267c..0b250b0 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java
@@ -33,7 +33,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.DecompressingHttpClient;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataHeaders;
import org.apache.olingo.client.api.communication.request.ODataRequest;
@@ -55,7 +55,7 @@ import org.apache.olingo.commons.api.http.HttpMethod;
*/
public abstract class AbstractODataRequest extends AbstractRequest implements ODataRequest {
- protected final CommonODataClient<?> odataClient;
+ protected final ODataClient odataClient;
/**
* OData request method.
@@ -89,7 +89,7 @@ public abstract class AbstractODataRequest extends AbstractRequest implements OD
* @param method HTTP request method. If configured X-HTTP-METHOD header will be used.
* @param uri OData request URI.
*/
- protected AbstractODataRequest(final CommonODataClient<?> odataClient, final HttpMethod method, final URI uri) {
+ protected AbstractODataRequest(final ODataClient odataClient, final HttpMethod method, final URI uri) {
super();
this.odataClient = odataClient;
@@ -344,7 +344,7 @@ public abstract class AbstractODataRequest extends AbstractRequest implements OD
if (ODataResponse.class.isAssignableFrom(clazz)) {
try {
final Constructor<?> constructor = clazz.getDeclaredConstructor(
- this.getClass(), CommonODataClient.class, HttpClient.class, HttpResponse.class);
+ this.getClass(), ODataClient.class, HttpClient.class, HttpResponse.class);
constructor.setAccessible(true);
return (V) constructor.newInstance(this, odataClient, httpClient, null);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java
index 5fb417e..9c004e2 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java
@@ -19,8 +19,8 @@ import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.EdmEnabledODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.core.communication.header.ODataErrorResponseChecker;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.slf4j.Logger;
@@ -33,21 +33,21 @@ public abstract class AbstractRequest {
*/
protected static final Logger LOG = LoggerFactory.getLogger(AbstractRequest.class);
- protected void checkRequest(final CommonODataClient<?> odataClient, final HttpUriRequest request) {
+ protected void checkRequest(final ODataClient odataClient, final HttpUriRequest request) {
// If using and Edm enabled client, checks that the cached service root matches the request URI
- if (odataClient instanceof CommonEdmEnabledODataClient
+ if (odataClient instanceof EdmEnabledODataClient
&& !request.getURI().toASCIIString().startsWith(
- ((CommonEdmEnabledODataClient<?>) odataClient).getServiceRoot())) {
+ ((EdmEnabledODataClient) odataClient).getServiceRoot())) {
throw new IllegalArgumentException(
String.format("The current request URI %s does not match the configured service root %s",
request.getURI().toASCIIString(),
- ((CommonEdmEnabledODataClient<?>) odataClient).getServiceRoot()));
+ ((EdmEnabledODataClient) odataClient).getServiceRoot()));
}
}
protected void checkResponse(
- final CommonODataClient<?> odataClient, final HttpResponse response, final String accept) {
+ final ODataClient odataClient, final HttpResponse response, final String accept) {
if (response.getStatusLine().getStatusCode() >= 400) {
try {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
index 0aa6ea7..5609363 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
-import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
+import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequestItem;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.api.communication.request.batch.ODataSingleRequest;
@@ -46,9 +46,9 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
/**
* batch request reference.
*/
- protected final CommonODataBatchRequest req;
+ protected final ODataBatchRequest req;
- protected AbstractBatchManager(final CommonODataBatchRequest req,
+ protected AbstractBatchManager(final ODataBatchRequest req,
final Wrapper<Future<HttpResponse>> futureWrap, final boolean continueOnError) {
super(futureWrap);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
deleted file mode 100644
index e0cbac7..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
+++ /dev/null
@@ -1,28 +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.batch;
-
-import org.apache.olingo.client.api.CommonODataClient;
-import org.apache.olingo.client.api.communication.request.batch.CommonBatchRequestFactory;
-
-/**
- * OData batch request factory class.
- */
-public abstract class AbstractBatchRequestFactory implements CommonBatchRequestFactory {
-
- protected final CommonODataClient<?> client;
-
- protected AbstractBatchRequestFactory(final CommonODataClient<?> client) {
- this.client = client;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
index ce2d839..d99cf9c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
@@ -24,10 +24,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataBatchConstants;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
-import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
+import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.core.communication.request.streamed.AbstractODataStreamedRequest;
@@ -56,7 +56,7 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
* @param odataClient client instance getting this request
* @param uri batch request URI (http://serviceRoot/$batch)
*/
- protected AbstractODataBatchRequest(final CommonODataClient<?> odataClient, final URI uri) {
+ protected AbstractODataBatchRequest(final ODataClient odataClient, final URI uri) {
super(odataClient, HttpMethod.POST, uri);
// create a random UUID value for boundary
@@ -80,7 +80,7 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
* This operation is unsupported by a batch request.
*/
@Override
- public void batch(final CommonODataBatchRequest req) {
+ public void batch(final ODataBatchRequest req) {
throw new UnsupportedOperationException("A batch request is not batchable");
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java
index 4d3a8aa..c30665c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.core.communication.request.batch;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
-import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
+import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequestItem;
import org.apache.olingo.client.core.communication.request.AbstractODataStreamer;
@@ -43,14 +43,14 @@ public abstract class AbstractODataBatchRequestItem extends AbstractODataStreame
/**
* OData batch request.
*/
- protected CommonODataBatchRequest req;
+ protected ODataBatchRequest req;
/**
* Constructor.
*
* @param req OData batch request.
*/
- public AbstractODataBatchRequestItem(final CommonODataBatchRequest req) {
+ public AbstractODataBatchRequestItem(final ODataBatchRequest req) {
super(req.getOutputStream());
this.open = true;
this.req = req;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/BatchRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/BatchRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/BatchRequestFactoryImpl.java
index e29a01d..b25034a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/BatchRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/BatchRequestFactoryImpl.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,16 +22,17 @@ import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.batch.BatchRequestFactory;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
-public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory
- implements BatchRequestFactory {
+public class BatchRequestFactoryImpl implements BatchRequestFactory {
+
+ protected final ODataClient client;
public BatchRequestFactoryImpl(final ODataClient client) {
- super(client);
+ this.client = client;
}
@Override
public ODataBatchRequest getBatchRequest(final String serviceRoot) {
return new ODataBatchRequestImpl(
- (ODataClient) client, client.newURIBuilder(serviceRoot).appendBatchSegment().build());
+ (ODataClient) client, client.newURIBuilder(serviceRoot).appendBatchSegment().build());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchRequestImpl.java
index 220e495..dc967ca 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchRequestImpl.java
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
-import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataPreferences;
@@ -98,7 +97,7 @@ public class ODataBatchRequestImpl
protected class ODataBatchResponseImpl extends AbstractODataResponse implements ODataBatchResponse {
protected ODataBatchResponseImpl(
- final CommonODataClient<?> odataClient, final HttpClient httpClient, final HttpResponse res) {
+ final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) {
super(odataClient, httpClient, res);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java
index 6053520..ce6155a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java
@@ -22,7 +22,7 @@ import java.util.UUID;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
-import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
+import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.core.communication.request.AbstractODataRequest;
import org.apache.olingo.commons.api.format.ContentType;
@@ -55,7 +55,7 @@ public class ODataChangesetImpl extends AbstractODataBatchRequestItem
* @param req batch request.
* @param expectedResItem expected OData response items.
*/
- ODataChangesetImpl(final CommonODataBatchRequest req, final ODataChangesetResponseItem expectedResItem) {
+ ODataChangesetImpl(final ODataBatchRequest req, final ODataChangesetResponseItem expectedResItem) {
super(req);
this.expectedResItem = expectedResItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleRequestImpl.java
index a82e115..af1c715 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleRequestImpl.java
@@ -19,7 +19,7 @@
package org.apache.olingo.client.core.communication.request.batch;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
-import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
+import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataSingleRequest;
import org.apache.olingo.client.core.communication.request.AbstractODataRequest;
import org.apache.olingo.commons.api.http.HttpMethod;
@@ -37,7 +37,7 @@ public class ODataSingleRequestImpl extends AbstractODataBatchRequestItem implem
* @param req batch request.
* @param expectedResItem expected batch response item.
*/
- ODataSingleRequestImpl(final CommonODataBatchRequest req, final ODataSingleResponseItem expectedResItem) {
+ ODataSingleRequestImpl(final ODataBatchRequest req, final ODataSingleResponseItem expectedResItem) {
super(req);
this.expectedResItem = expectedResItem;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/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
deleted file mode 100644
index d73162f..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
+++ /dev/null
@@ -1,221 +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.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;
-import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType;
-import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
-import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
-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.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.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
-import org.apache.olingo.commons.api.http.HttpMethod;
-
-public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> implements CommonCUDRequestFactory<UT> {
-
- protected final CommonODataClient<?> client;
-
- protected AbstractCUDRequestFactory(final CommonODataClient<?> client) {
- this.client = client;
- }
-
- @Override
- public <E extends ODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(
- final URI targetURI, final E entity) {
-
- return new ODataEntityCreateRequestImpl<E>(client, targetURI, entity);
- }
-
- @Override
- public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
- final URI targetURI, final UT type, final E changes) {
-
- final ODataEntityUpdateRequest<E> req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataEntityUpdateRequestImpl<E>(client, HttpMethod.POST, targetURI, changes);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataEntityUpdateRequestImpl<E>(client, type.getMethod(), targetURI, changes);
- }
-
- return req;
- }
-
- @Override
- public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
- final UT type, final E entity) {
-
- if (entity.getEditLink() == null) {
- throw new IllegalArgumentException("No edit link found");
- }
-
- final ODataEntityUpdateRequest<E> req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataEntityUpdateRequestImpl<E>(client, HttpMethod.POST, entity.getEditLink(), entity);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataEntityUpdateRequestImpl<E>(client, type.getMethod(), entity.getEditLink(), entity);
- }
-
- return req;
- }
-
- @Override
- public ODataValueUpdateRequest getValueUpdateRequest(
- final URI targetURI, final UT type, final ODataPrimitiveValue value) {
-
- final ODataValueUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataValueUpdateRequestImpl(client, HttpMethod.POST, URIUtils.addValueSegment(targetURI), value);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataValueUpdateRequestImpl(client, type.getMethod(), URIUtils.addValueSegment(targetURI), value);
- }
-
- return req;
- }
-
- @Override
- public ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(
- final URI targetURI, final ODataProperty property) {
-
- if (!property.hasPrimitiveValue()) {
- throw new IllegalArgumentException("A primitive value is required");
- }
-
- final ODataPropertyUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.POST, targetURI, property);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.PUT, targetURI, property);
- }
-
- return req;
- }
-
- @Override
- public ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(
- final URI targetURI, final UT type, final ODataProperty property) {
-
- if (!property.hasComplexValue()) {
- throw new IllegalArgumentException("A complex value is required");
- }
-
- final ODataPropertyUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.POST, targetURI, property);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataPropertyUpdateRequestImpl(client, type.getMethod(), targetURI, property);
- }
-
- return req;
- }
-
- @Override
- public ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(
- final URI targetURI, final ODataProperty property) {
-
- if (!property.hasCollectionValue()) {
- throw new IllegalArgumentException("A collection value is required");
- }
-
- final ODataPropertyUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.POST, targetURI, property);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.PUT, targetURI, property);
- }
-
- return req;
- }
-
- @Override
- public ODataDeleteRequest getDeleteRequest(final URI targetURI) {
- final ODataDeleteRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataDeleteRequestImpl(client, HttpMethod.POST, targetURI);
- req.setXHTTPMethod(HttpMethod.DELETE.name());
- } else {
- req = new ODataDeleteRequestImpl(client, HttpMethod.DELETE, targetURI);
- }
-
- return req;
- }
-
- @Override
- public <E extends ODataEntity> 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 ODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
- final URI editURI, final InputStream media) {
-
- final ODataMediaEntityUpdateRequest<E> req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.POST, URIUtils.addValueSegment(editURI), media);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.PUT, URIUtils.addValueSegment(editURI), media);
- }
-
- return req;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
index b0b48ba..89a0449 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
@@ -18,35 +18,222 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
+import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.CUDRequestFactory;
+import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
+import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
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.ODataReferenceAddingRequest;
+import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
+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.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.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.ResWrap;
+import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
+import org.apache.olingo.commons.api.domain.ODataProperty;
import org.apache.olingo.commons.api.domain.ODataSingleton;
import org.apache.olingo.commons.api.http.HttpMethod;
-public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {
+public class CUDRequestFactoryImpl implements CUDRequestFactory {
+
+ protected final ODataClient client;
public CUDRequestFactoryImpl(final ODataClient client) {
- super(client);
+ this.client = client;
+ }
+
+ @Override
+ public <E extends ODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(
+ final URI targetURI, final E entity) {
+
+ return new ODataEntityCreateRequestImpl<E>(client, targetURI, entity);
+ }
+
+ @Override
+ public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
+ final URI targetURI, final UpdateType type, final E changes) {
+
+ final ODataEntityUpdateRequest<E> req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataEntityUpdateRequestImpl<E>(client, HttpMethod.POST, targetURI, changes);
+ req.setXHTTPMethod(type.getMethod().name());
+ } else {
+ req = new ODataEntityUpdateRequestImpl<E>(client, type.getMethod(), targetURI, changes);
+ }
+
+ return req;
+ }
+
+ @Override
+ public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
+ final UpdateType type, final E entity) {
+
+ if (entity.getEditLink() == null) {
+ throw new IllegalArgumentException("No edit link found");
+ }
+
+ final ODataEntityUpdateRequest<E> req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataEntityUpdateRequestImpl<E>(client, HttpMethod.POST, entity.getEditLink(), entity);
+ req.setXHTTPMethod(type.getMethod().name());
+ } else {
+ req = new ODataEntityUpdateRequestImpl<E>(client, type.getMethod(), entity.getEditLink(), entity);
+ }
+
+ return req;
+ }
+
+ @Override
+ public ODataValueUpdateRequest getValueUpdateRequest(
+ final URI targetURI, final UpdateType type, final ODataPrimitiveValue value) {
+
+ final ODataValueUpdateRequest req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataValueUpdateRequestImpl(client, HttpMethod.POST, URIUtils.addValueSegment(targetURI), value);
+ req.setXHTTPMethod(type.getMethod().name());
+ } else {
+ req = new ODataValueUpdateRequestImpl(client, type.getMethod(), URIUtils.addValueSegment(targetURI), value);
+ }
+
+ return req;
+ }
+
+ @Override
+ public ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(
+ final URI targetURI, final ODataProperty property) {
+
+ if (!property.hasPrimitiveValue()) {
+ throw new IllegalArgumentException("A primitive value is required");
+ }
+
+ final ODataPropertyUpdateRequest req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.POST, targetURI, property);
+ req.setXHTTPMethod(HttpMethod.PUT.name());
+ } else {
+ req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.PUT, targetURI, property);
+ }
+
+ return req;
+ }
+
+ @Override
+ public ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(
+ final URI targetURI, final UpdateType type, final ODataProperty property) {
+
+ if (!property.hasComplexValue()) {
+ throw new IllegalArgumentException("A complex value is required");
+ }
+
+ final ODataPropertyUpdateRequest req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.POST, targetURI, property);
+ req.setXHTTPMethod(type.getMethod().name());
+ } else {
+ req = new ODataPropertyUpdateRequestImpl(client, type.getMethod(), targetURI, property);
+ }
+
+ return req;
+ }
+
+ @Override
+ public ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(
+ final URI targetURI, final ODataProperty property) {
+
+ if (!property.hasCollectionValue()) {
+ throw new IllegalArgumentException("A collection value is required");
+ }
+
+ final ODataPropertyUpdateRequest req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.POST, targetURI, property);
+ req.setXHTTPMethod(HttpMethod.PUT.name());
+ } else {
+ req = new ODataPropertyUpdateRequestImpl(client, HttpMethod.PUT, targetURI, property);
+ }
+
+ return req;
+ }
+
+ @Override
+ public ODataDeleteRequest getDeleteRequest(final URI targetURI) {
+ final ODataDeleteRequest req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataDeleteRequestImpl(client, HttpMethod.POST, targetURI);
+ req.setXHTTPMethod(HttpMethod.DELETE.name());
+ } else {
+ req = new ODataDeleteRequestImpl(client, HttpMethod.DELETE, targetURI);
+ }
+
+ return req;
+ }
+
+ @Override
+ public <E extends ODataEntity> 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 ODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
+ final URI editURI, final InputStream media) {
+
+ final ODataMediaEntityUpdateRequest<E> req;
+
+ if (client.getConfiguration().isUseXHTTPMethod()) {
+ req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.POST, URIUtils.addValueSegment(editURI), media);
+ req.setXHTTPMethod(HttpMethod.PUT.name());
+ } else {
+ req = new ODataMediaEntityUpdateRequestImpl<E>(client, HttpMethod.PUT, URIUtils.addValueSegment(editURI), media);
+ }
+
+ return req;
}
@Override
public ODataEntityUpdateRequest<ODataSingleton> getSingletonUpdateRequest(
- final UpdateType type, final ODataSingleton entity) {
+ final UpdateType type, final ODataSingleton entity) {
- return super.getEntityUpdateRequest(type, entity);
+ return getEntityUpdateRequest(type, entity);
}
@Override
public ODataEntityUpdateRequest<ODataSingleton> getSingletonUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataSingleton changes) {
+ final URI targetURI, final UpdateType type, final ODataSingleton changes) {
- return super.getEntityUpdateRequest(targetURI, type, changes);
+ return getEntityUpdateRequest(targetURI, type, changes);
}
@Override
@@ -56,14 +243,14 @@ public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType>
ResWrap<URI> wrappedPayload = new ResWrap<URI>(contextURI, null, reference);
return new ODataReferenceAddingRequestImpl(client, HttpMethod.POST, targetURI, wrappedPayload);
- }
-
- public ODataReferenceAddingRequest getReferenceSingleChangeRequest(final URI serviceRoot, final URI targetURI,
+ }
+
+ public ODataReferenceAddingRequest getReferenceSingleChangeRequest(final URI serviceRoot, final URI targetURI,
final URI reference) {
- // See OData Protocol 11.4.6.3
+ // See OData Protocol 11.4.6.3
final URI contextURI = client.newURIBuilder(serviceRoot.toASCIIString()).appendMetadataSegment().build();
ResWrap<URI> wrappedPayload = new ResWrap<URI>(contextURI, null, reference);
return new ODataReferenceAddingRequestImpl(client, HttpMethod.PUT, targetURI, wrappedPayload);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java
index 658caa4..35f5118 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java
@@ -23,7 +23,7 @@ import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
@@ -37,7 +37,7 @@ import org.apache.olingo.commons.api.http.HttpMethod;
public class ODataDeleteRequestImpl extends AbstractODataBasicRequest<ODataDeleteResponse>
implements ODataDeleteRequest {
- ODataDeleteRequestImpl(final CommonODataClient<?> odataClient, final HttpMethod method, final URI uri) {
+ ODataDeleteRequestImpl(final ODataClient odataClient, final HttpMethod method, final URI uri) {
super(odataClient, method, uri);
}
@@ -64,7 +64,7 @@ public class ODataDeleteRequestImpl extends AbstractODataBasicRequest<ODataDelet
*/
private class ODataDeleteResponseImpl extends AbstractODataResponse implements ODataDeleteResponse {
- private ODataDeleteResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ private ODataDeleteResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java
index 4e261a3..cb8c295 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
@@ -60,7 +60,7 @@ public class ODataEntityCreateRequestImpl<E extends ODataEntity>
* @param targetURI entity set URI.
* @param entity entity to be created.
*/
- ODataEntityCreateRequestImpl(final CommonODataClient<?> odataClient, final URI targetURI, final E entity) {
+ ODataEntityCreateRequestImpl(final ODataClient odataClient, final URI targetURI, final E entity) {
super(odataClient, HttpMethod.POST, targetURI);
this.entity = entity;
}
@@ -98,7 +98,7 @@ public class ODataEntityCreateRequestImpl<E extends ODataEntity>
private E entity = null;
- private ODataEntityCreateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ private ODataEntityCreateResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java
index 8c52faf..d401496 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java
@@ -26,7 +26,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
@@ -62,7 +62,7 @@ public class ODataEntityUpdateRequestImpl<E extends ODataEntity>
* @param uri URI of the entity to be updated.
* @param changes changes to be applied.
*/
- public ODataEntityUpdateRequestImpl(final CommonODataClient<?> odataClient,
+ public ODataEntityUpdateRequestImpl(final ODataClient odataClient,
final HttpMethod method, final URI uri, final E changes) {
super(odataClient, method, uri);
@@ -111,7 +111,7 @@ public class ODataEntityUpdateRequestImpl<E extends ODataEntity>
*/
private E entity = null;
- private ODataEntityUpdateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ private ODataEntityUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java
index d1ee5af..2fb8484 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
@@ -58,7 +58,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
* @param targetURI entity set or entity or entity property URI.
* @param property value to be created.
*/
- ODataPropertyUpdateRequestImpl(final CommonODataClient<?> odataClient,
+ ODataPropertyUpdateRequestImpl(final ODataClient odataClient,
final HttpMethod method, final URI targetURI, final ODataProperty property) {
super(odataClient, method, targetURI);
@@ -99,7 +99,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
private ODataProperty property = null;
- private ODataPropertyUpdateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ private ODataPropertyUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java
index f5d59a1..477a91a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddingRequest;
import org.apache.olingo.client.api.communication.response.ODataReferenceAddingResponse;
import org.apache.olingo.client.api.serialization.ODataWriter;
@@ -48,7 +48,7 @@ public class ODataReferenceAddingRequestImpl extends AbstractODataBasicRequest<O
final ResWrap<URI> reference;
ODataReferenceAddingRequestImpl(
- final CommonODataClient<?> odataClient, final HttpMethod method, final URI uri, final ResWrap<URI> reference) {
+ final ODataClient odataClient, final HttpMethod method, final URI uri, final ResWrap<URI> reference) {
super(odataClient, method, uri);
this.reference = reference;
}
@@ -94,7 +94,7 @@ public class ODataReferenceAddingRequestImpl extends AbstractODataBasicRequest<O
private class ODataReferenceAddingResponseImpl extends AbstractODataResponse implements ODataReferenceAddingResponse {
private ODataReferenceAddingResponseImpl(
- final CommonODataClient<?> odataClient, final HttpClient httpClient, final HttpResponse res) {
+ final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) {
super(odataClient, httpClient, res);
this.close();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java
index cd71a81..2ad54cb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse;
import org.apache.olingo.client.api.http.HttpClientException;
@@ -56,7 +56,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
* @param targetURI entity set or entity or entity property URI.
* @param value value to be created.
*/
- ODataValueUpdateRequestImpl(final CommonODataClient<?> odataClient,
+ ODataValueUpdateRequestImpl(final ODataClient odataClient,
final HttpMethod method, final URI targetURI, final ODataPrimitiveValue value) {
super(odataClient, method, targetURI);
@@ -96,7 +96,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
private ODataPrimitiveValue value = null;
- private ODataValueUpdateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ private ODataValueUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
index 39b34a3..7892239 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
@@ -22,7 +22,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.Map;
-import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
+import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.communication.request.invoke.EdmEnabledInvokeRequestFactory;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
@@ -39,9 +39,9 @@ import org.apache.olingo.commons.api.http.HttpMethod;
public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInvokeRequestFactory
implements EdmEnabledInvokeRequestFactory {
- private final CommonEdmEnabledODataClient<?> edmClient;
+ private final EdmEnabledODataClient edmClient;
- public AbstractEdmEnabledInvokeRequestFactory(final CommonEdmEnabledODataClient<?> edmClient) {
+ public AbstractEdmEnabledInvokeRequestFactory(final EdmEnabledODataClient edmClient) {
this.edmClient = edmClient;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
index d813ba9..cebf12d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
@@ -29,7 +29,6 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
@@ -41,8 +40,8 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.ODataEntity;
import org.apache.olingo.commons.api.domain.ODataEntitySet;
-import org.apache.olingo.commons.api.domain.ODataProperty;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
+import org.apache.olingo.commons.api.domain.ODataProperty;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
@@ -72,7 +71,7 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
* @param uri URI that identifies the operation.
*/
public AbstractODataInvokeRequest(
- final CommonODataClient<?> odataClient,
+ final ODataClient odataClient,
final Class<T> reference,
final HttpMethod method,
final URI uri) {
@@ -183,7 +182,7 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
private T invokeResult = null;
- private ODataInvokeResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ private ODataInvokeResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java
index d40deba..ce49d47 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.core.communication.request.invoke;
import java.net.URI;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
@@ -29,7 +29,7 @@ public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends Abstrac
private ODataFormat format;
- public ODataInvokeRequestImpl(final CommonODataClient<?> odataClient, final Class<T> reference,
+ public ODataInvokeRequestImpl(final ODataClient odataClient, final Class<T> reference,
final HttpMethod method, final URI uri) {
super(odataClient, reference, method, uri);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java
index 243bc58..3cdd349 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java
@@ -20,14 +20,14 @@ package org.apache.olingo.client.core.communication.request.retrieve;
import java.net.URI;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.ODataRequest;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
public abstract class AbstractMetadataRequestImpl<V> extends AbstractODataRetrieveRequest<V> {
- public AbstractMetadataRequestImpl(final CommonODataClient<?> odataClient, final URI query) {
+ public AbstractMetadataRequestImpl(final ODataClient odataClient, final URI query) {
super(odataClient, query);
super.setAccept(ContentType.APPLICATION_XML.toContentTypeString());
super.setContentType(ContentType.APPLICATION_XML.toContentTypeString());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java
index 9cabf3d..1896dcd 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java
@@ -23,7 +23,7 @@ import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
-import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
@@ -43,7 +43,7 @@ public abstract class AbstractODataRetrieveRequest<T>
* @param odataClient client instance getting this request
* @param query query to be executed.
*/
- public AbstractODataRetrieveRequest(final CommonODataClient<?> odataClient, final URI query) {
+ public AbstractODataRetrieveRequest(final ODataClient odataClient, final URI query) {
super(odataClient, HttpMethod.GET, query);
}
@@ -64,7 +64,7 @@ public abstract class AbstractODataRetrieveRequest<T>
protected abstract class AbstractODataRetrieveResponse
extends AbstractODataResponse implements ODataRetrieveResponse<T> {
- protected AbstractODataRetrieveResponse(final CommonODataClient<?> odataClient, final HttpClient httpClient,
+ protected AbstractODataRetrieveResponse(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
super(odataClient, httpClient, res);