You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ar...@apache.org on 2019/03/26 11:03:25 UTC
[olingo-odata4] branch master updated: [OLINGO-1315]OData
v4.0:Client: API to return HTTP Request details
This is an automated email from the ASF dual-hosted git repository.
archanarai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
The following commit(s) were added to refs/heads/master by this push:
new 5b32c3a [OLINGO-1315]OData v4.0:Client: API to return HTTP Request details
5b32c3a is described below
commit 5b32c3acbf026140b39b308d7fc3b56a145f8947
Author: Archana Rai <ar...@sap.com>
AuthorDate: Tue Mar 26 16:33:14 2019 +0530
[OLINGO-1315]OData v4.0:Client: API to return HTTP Request details
---
.../test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java | 4 +++-
.../client/core/communication/request/AbstractODataBasicRequest.java | 2 +-
.../client/core/communication/request/cud/ODataDeleteRequestImpl.java | 2 +-
.../core/communication/request/cud/ODataEntityCreateRequestImpl.java | 2 +-
.../core/communication/request/cud/ODataEntityUpdateRequestImpl.java | 2 +-
.../communication/request/cud/ODataPropertyUpdateRequestImpl.java | 2 +-
.../communication/request/cud/ODataReferenceAddingRequestImpl.java | 2 +-
.../core/communication/request/cud/ODataValueUpdateRequestImpl.java | 2 +-
.../core/communication/request/invoke/AbstractODataInvokeRequest.java | 2 +-
.../communication/request/retrieve/AbstractODataRetrieveRequest.java | 2 +-
.../client/core/communication/response/AbstractODataResponse.java | 2 +-
11 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 0cfb163..8e303ba 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -84,6 +84,7 @@ import org.apache.olingo.client.api.uri.FilterFactory;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.uri.URIFilter;
import org.apache.olingo.client.core.ODataClientFactory;
+import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmActionImport;
@@ -538,7 +539,8 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
newEntity);
assertNotNull(createRequest);
final ODataEntityCreateResponse<ClientEntity> createResponse = createRequest.execute();
-
+ assertNotNull(createRequest.getHttpRequest());
+ assertNotNull(((AbstractODataBasicRequest)createRequest).getPayload());
assertEquals(HttpStatusCode.CREATED.getStatusCode(), createResponse.getStatusCode());
assertEquals(SERVICE_URI + ES_ALL_PRIM + "(1)", createResponse.getHeader(HttpHeader.LOCATION).iterator().next());
final ClientEntity createdEntity = createResponse.getBody();
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 5435f7f..29b7404 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
@@ -81,7 +81,7 @@ public abstract class AbstractODataBasicRequest<T extends ODataResponse>
*
* @return InputStream for entire payload.
*/
- protected abstract InputStream getPayload();
+ public abstract InputStream getPayload();
/**
* Serializes the full request into the given batch request.
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 245c9b5..7ff866e 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
@@ -50,7 +50,7 @@ public class ODataDeleteRequestImpl extends AbstractODataBasicRequest<ODataDelet
* No payload: null will be returned.
*/
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
return null;
}
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 ef5daa7..fbfcefd 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
@@ -71,7 +71,7 @@ public class ODataEntityCreateRequestImpl<E extends ClientEntity>
}
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
try {
return odataClient.getWriter().writeEntity(entity, ContentType.parse(getContentType()));
} catch (final ODataSerializerException e) {
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 2ddefbb..35b9dec 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
@@ -75,7 +75,7 @@ public class ODataEntityUpdateRequestImpl<E extends ClientEntity>
}
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
try {
return odataClient.getWriter().writeEntity(changes, ContentType.parse(getContentType()));
} catch (final ODataSerializerException e) {
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 d7882b4..da889b4 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
@@ -84,7 +84,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
}
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
try {
return odataClient.getWriter().writeProperty(property, ContentType.parse(getContentType()));
} catch (final ODataSerializerException e) {
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 d0a3268..7475010 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
@@ -62,7 +62,7 @@ public class ODataReferenceAddingRequestImpl extends AbstractODataBasicRequest<O
* No payload: null will be returned.
*/
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
if (reference == null) {
return null;
} else {
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 407a199..7528184 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
@@ -85,7 +85,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
* {@inheritDoc }
*/
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
return IOUtils.toInputStream(value.toString());
}
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 5cf9385..502c521 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
@@ -112,7 +112,7 @@ public abstract class AbstractODataInvokeRequest<T extends ClientInvokeResult>
protected abstract ContentType getPOSTParameterFormat();
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
if (!this.parameters.isEmpty() && this.method == HttpMethod.POST) {
// Additional, non-binding parameters MUST be sent as JSON
final ClientEntity tmp = odataClient.getObjectFactory().newEntity(null);
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 1896dcd..feec211 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
@@ -54,7 +54,7 @@ public abstract class AbstractODataRetrieveRequest<T>
* This kind of request doesn't have any payload: null will be returned.
*/
@Override
- protected InputStream getPayload() {
+ public InputStream getPayload() {
return null;
}
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
index 94460d9..5052e91 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java
@@ -256,7 +256,7 @@ public abstract class AbstractODataResponse implements ODataResponse {
throw new NoContentException();
}
- if (payload == null && batchInfo.isValidBatch()) {
+ if (payload == null && batchInfo != null && batchInfo.isValidBatch()) {
// get input stream till the end of item
payload = new PipedInputStream();