+ *
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntityCreateResponseImpl() {
- super();
- }
+ private ODataEntityCreateResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntityCreateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
/**
@@ -125,9 +112,9 @@ public class ODataEntityCreateRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntityUpdateResponseImpl() {}
+ private ODataEntityUpdateResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntityUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -126,8 +115,8 @@ public class ODataEntityUpdateRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataInvokeResponseImpl() {
- super();
- }
+ private ODataInvokeResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataInvokeResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
/**
@@ -213,19 +200,19 @@ public abstract class AbstractODataInvokeRequest
- * Just to create response templates to be initialized from batch.
- */
- protected AbstractODataRetrieveResponse() {
- super();
- }
+ protected AbstractODataRetrieveResponse(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- protected AbstractODataRetrieveResponse(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java
index 64486fff5..c902eacd4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java
@@ -49,11 +49,12 @@ class EdmMetadataRequestImpl extends AbstractMetadataRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntitySetResponseImpl() {
- super();
- }
+ private ODataEntitySetResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntitySetResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -91,8 +78,8 @@ public class ODataEntitySetRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataPropertyResponseImpl() {
- }
+ private ODataPropertyResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataPropertyResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -88,7 +76,7 @@ public class ODataPropertyRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataServiceResponseImpl() {}
+ private ODataServiceResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataServiceResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
public ODataServiceDocument getBody() {
if (serviceDocument == null) {
try {
- final ResWrap
- * Just to create response templates to be initialized from batch.
- */
- private ODataLinkCollectionResponseImpl() {
- }
+ private ODataLinkCollectionResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataLinkCollectionResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java
index 1304b84e4..2b0cd1817 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
+import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.XMLMetadataRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.edm.xml.Schema;
@@ -42,30 +43,17 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataMediaEntityCreateResponseImpl() {
- }
+ private ODataMediaEntityCreateResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataMediaEntityCreateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -122,8 +110,7 @@ public class ODataMediaEntityCreateRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataStreamUpdateResponseImpl() {
- }
+ private ODataStreamUpdateResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataStreamUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
/**
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java
index 2ec51e098..98866986c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java
@@ -85,13 +85,13 @@ public class AsyncRequestWrapperImpl
* This method has to be used to build response items about a batch request.
*
- * @param
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntityResponseImpl() {
- super();
- }
+ private ODataEntityResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntityResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -88,11 +75,11 @@ public class ODataEntityRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataRawResponseImpl() {
- }
+ private ODataRawResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataRawResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -101,8 +89,7 @@ public class ODataRawRequestImpl extends AbstractODataRequest implements ODataRa
}
try {
- return odataClient.getReader().
- read(new ByteArrayInputStream(obj), getContentType(), reference);
+ return odataClient.getReader().read(new ByteArrayInputStream(obj), getContentType(), reference);
} catch (final ODataDeserializerException e) {
throw new IllegalArgumentException(e);
}
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java
index d252c6e6f..21dabf9be 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java
@@ -35,7 +35,7 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
* This class implements an OData service document request.
*/
public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveRequest
- * Just to create response templates to be initialized from batch.
- */
- private XMLMetadataResponseImpl() {
- super();
- }
+ private XMLMetadataResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private XMLMetadataResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
@@ -73,8 +61,7 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl
- * Just to create response templates to be initialized from batch.
- */
- private ODataMediaEntityUpdateResponseImpl() {
- super();
- }
+ private ODataMediaEntityUpdateResponseImpl(final CommonODataClient odataClient, final HttpClient httpClient,
+ final HttpResponse res) {
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataMediaEntityUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
+ super(odataClient, httpClient, res);
}
@Override
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java
index 216c5214c..c9dcf5e84 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java
@@ -85,7 +85,7 @@ public class ODataStreamUpdateRequestImpl
@Override
protected ODataStreamUpdateResponse getResponse(final long timeout, final TimeUnit unit) {
finalizeBody();
- return new ODataStreamUpdateResponseImpl(httpClient, getHttpResponse(timeout, unit));
+ return new ODataStreamUpdateResponseImpl(odataClient, httpClient, getHttpResponse(timeout, unit));
}
}
@@ -96,22 +96,10 @@ public class ODataStreamUpdateRequestImpl
private InputStream input = null;
- /**
- * Constructor.
- * format is parseable and can be used as input for {@link #create(String)} method.
+ *
* @param format to be validated string
* @return true if format is parseable otherwise false
*/
@@ -118,6 +136,7 @@ public class ContentType {
/**
* Creates a content type from format and key-value pairs for parameters
+ *
* @param format for example "application/json"
* @param parameters for example "a=b", "c=d"
* @return a new ContentType object
@@ -126,7 +145,7 @@ public class ContentType {
ContentType ct = parse(format);
for (String p : parameters) {
- String[] keyvalue = p.split("=");
+ final String[] keyvalue = p.split("=");
ct.parameters.put(keyvalue[0], keyvalue[1]);
}
@@ -135,7 +154,8 @@ public class ContentType {
/**
* Creates a content type from format and key-value pairs for parameters
- * @param format for example "application/json"
+ *
+ * @param contentType for example "application/json"
* @param parameters for example "a=b", "c=d"
* @return a new ContentType object
*/
@@ -151,8 +171,9 @@ public class ContentType {
}
/**
- * Creates a {@link ContentType} based on given input string (format).
- * Supported format is Media Type format as defined in RFC 7231, chapter 3.1.1.1.
+ * Creates a {@link ContentType} based on given input string (format). Supported format is
+ * Media Type format as defined in RFC 7231, chapter 3.1.1.1.
+ *
* @param format a string in format as defined in RFC 7231, chapter 3.1.1.1
* @return a new ContentType object
* @throws IllegalArgumentException if input string is not parseable
@@ -161,8 +182,8 @@ public class ContentType {
if (format == null) {
throw new IllegalArgumentException("Parameter format MUST NOT be NULL.");
}
- Listformat) and returns created {@link ContentType} if input was valid or
* return NULL if input was not parseable.
- *
+ *
* For the definition of the supported format see {@link #create(String)}.
- *
+ *
* @param format a string in format as defined in RFC 7231, chapter 3.1.1.1
* @return a new ContentType object
*/
@@ -184,14 +205,13 @@ public class ContentType {
}
}
- private static void
- parse(final String format, final Listtype and/or subtype is set to "*" (in such a case the parameters are
* ignored).true if both instances are equal (see definition above), otherwise false.
*/
@Override
public boolean equals(final Object obj) {
// NULL validation is done in method 'isEqualWithoutParameters(obj)'
- Boolean compatible = isEqualWithoutParameters(obj);
+ final Boolean compatible = isEqualWithoutParameters(obj);
if (compatible == null) {
ContentType other = (ContentType) obj;
@@ -258,11 +278,11 @@ public class ContentType {
return false;
}
} else if (parameters.size() == other.parameters.size()) {
- Iteratorparameters are always ignored (for compare with parameters see {@link #equals(Object)}
* ).
- *
+ *
* @return true if both instances are equal (see definition above), otherwise false.
*/
public boolean isCompatible(final ContentType obj) {
@@ -301,13 +321,12 @@ public class ContentType {
}
/**
- * Check equal without parameters.
- * It is possible that no decision about equal/none equal can be determined a NULL is
- * returned.
- *
+ * Check equal without parameters. It is possible that no decision about equal/none equal can be
+ * determined a NULL is returned.
+ *
* @param obj to checked object
- * @return true if both instances are equal (see definition above), otherwise false
- * or NULL if no decision about equal/none equal could be determined.
+ * @return true if both instances are equal (see definition above), otherwise false or
+ * NULL if no decision about equal/none equal could be determined.
*/
private Boolean isEqualWithoutParameters(final Object obj) {
// basic checks
@@ -346,7 +365,7 @@ public class ContentType {
/**
* Check whether both string are equal ignoring the case of the strings.
- *
+ *
* @param first first string
* @param second second string
* @return true if both strings are equal (by ignoring the case), otherwise false is
@@ -357,12 +376,13 @@ public class ContentType {
}
/**
- * Get {@link ContentType} as string as defined in RFC 7231
- * (http://www.ietf.org/rfc/rfc7231.txt, chapter 3.1.1.1: Media Type)
+ * Get {@link ContentType} as string as defined in RFC 7231 (http://www.ietf.org/rfc/rfc7231.txt, chapter 3.1.1.1:
+ * Media Type)
+ *
* @return string representation of ContentType object
*/
public String toContentTypeString() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append(type).append(TypeUtil.TYPE_SUBTYPE_SEPARATOR).append(subtype);
diff --git a/pom.xml b/pom.xml
index 447aaa8ca..213a050a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,8 @@