This is an automated email from the ASF dual-hosted git repository.
mibo 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 ffb0496 [OLINGO-1352] Sonar issues clean up
ffb0496 is described below
commit ffb0496b08d2d8afd56661c4012172b1c11dbf03
Author: mibo <[email protected]>
AuthorDate: Wed May 1 06:07:59 2019 +0200
[OLINGO-1352] Sonar issues clean up
---
.../olingo/client/api/communication/request/ODataStreamer.java | 2 +-
.../core/communication/request/AbstractODataBasicRequest.java | 6 +++---
.../client/core/communication/request/AbstractODataRequest.java | 7 ++++---
.../client/core/communication/request/AbstractODataStreamer.java | 1 +
.../core/communication/request/batch/ODataBatchUtilities.java | 4 ++--
.../request/streamed/AbstractODataStreamedRequest.java | 5 +++--
.../client/core/communication/response/AbstractODataResponse.java | 5 +++--
.../olingo/server/core/serializer/BatchResponseSerializer.java | 2 +-
8 files changed, 18 insertions(+), 14 deletions(-)
diff --git
a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataStreamer.java
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataStreamer.java
index 8ec773f..0eedb3d 100644
---
a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataStreamer.java
+++
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataStreamer.java
@@ -28,7 +28,7 @@ public interface ODataStreamer {
/**
* CR/LF.
*/
- public static final byte[] CRLF = {13, 10};
+ byte[] CRLF = {13, 10};
/**
* Gets the piped stream to be used to stream the payload.
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 29b7404..cf09ba2 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
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.StringUtils;
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.ODataBatchRequest;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.commons.api.format.ContentType;
@@ -45,6 +44,7 @@ public abstract class AbstractODataBasicRequest<T extends
ODataResponse>
extends AbstractODataRequest implements ODataBasicRequest<T> {
private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+ private static final byte[] CRLF = {13, 10};
/**
* Constructor.
@@ -105,9 +105,9 @@ public abstract class AbstractODataBasicRequest<T extends
ODataResponse>
req.rawAppend(toByteArray());
if (StringUtils.isNotBlank(contentId)) {
req.rawAppend((ODataBatchConstants.CHANGESET_CONTENT_ID_NAME + ": " +
contentId).getBytes(DEFAULT_CHARSET));
- req.rawAppend(ODataStreamer.CRLF);
+ req.rawAppend(CRLF);
}
- req.rawAppend(ODataStreamer.CRLF);
+ req.rawAppend(CRLF);
final InputStream payload = getPayload();
if (payload != null) {
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 12ad732..0e8ea24 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
@@ -55,8 +55,9 @@ import org.apache.olingo.commons.api.http.HttpMethod;
*/
public abstract class AbstractODataRequest extends AbstractRequest implements
ODataRequest {
- protected final ODataClient odataClient;
+ private static final byte[] CRLF = {13, 10};
private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+ protected final ODataClient odataClient;
/**
* OData request method.
@@ -226,7 +227,7 @@ public abstract class AbstractODataRequest extends
AbstractRequest implements OD
baos.write(requestBuilder.toString().getBytes(DEFAULT_CHARSET));
- baos.write(ODataStreamer.CRLF);
+ baos.write(CRLF);
// Set Content-Type and Accept headers with default values, if not yet
set
if
(StringUtils.isBlank(odataHeaders.getHeader(HttpHeader.CONTENT_TYPE))) {
@@ -241,7 +242,7 @@ public abstract class AbstractODataRequest extends
AbstractRequest implements OD
if (StringUtils.isNotBlank(value)) {
baos.write((name + ": " + value).getBytes(DEFAULT_CHARSET));
- baos.write(ODataStreamer.CRLF);
+ baos.write(CRLF);
}
}
diff --git
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java
index f98e16e..a1093de 100644
---
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java
+++
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java
@@ -36,6 +36,7 @@ public abstract class AbstractODataStreamer implements
ODataStreamer {
* Logger.
*/
protected static final Logger LOG =
LoggerFactory.getLogger(AbstractODataStreamer.class);
+ private static final byte[] CRLF = {13, 10};
/**
* OutputStream to be used to write objects to the stream.
diff --git
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java
index b2c5c40..ad36781 100644
---
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java
+++
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java
@@ -34,7 +34,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.ODataBatchConstants;
-import org.apache.olingo.client.api.communication.request.ODataStreamer;
import
org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.format.ContentType;
@@ -47,6 +46,7 @@ import org.slf4j.LoggerFactory;
*/
public class ODataBatchUtilities {
+ private static final byte[] CRLF = {13, 10};
public static enum BatchItemType {
NONE,
CHANGESET,
@@ -139,7 +139,7 @@ public class ODataBatchUtilities {
if (notEndLine && os != null && currentLine!=null) {
os.write(currentLine.getBytes(Constants.UTF8));
- os.write(ODataStreamer.CRLF);
+ os.write(CRLF);
}
}
diff --git
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java
index 5da0ce6..afb6b40 100644
---
a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java
+++
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java
@@ -56,6 +56,7 @@ public abstract class AbstractODataStreamedRequest<V extends
ODataResponse, T ex
*/
protected ODataPayloadManager<V> payloadManager;
private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+ private static final byte[] CRLF = {13, 10};
/**
* Wrapper for actual streamed request's future. This holds information
about the HTTP request / response currently
@@ -153,9 +154,9 @@ public abstract class AbstractODataStreamedRequest<V
extends ODataResponse, T ex
req.rawAppend(toByteArray());
if (StringUtils.isNotBlank(contentId)) {
req.rawAppend((ODataBatchConstants.CHANGESET_CONTENT_ID_NAME + ": " +
contentId).getBytes(DEFAULT_CHARSET));
- req.rawAppend(ODataStreamer.CRLF);
+ req.rawAppend(CRLF);
}
- req.rawAppend(ODataStreamer.CRLF);
+ req.rawAppend(CRLF);
try {
req.rawAppend(IOUtils.toByteArray(input));
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 bd2c481..d16006c 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
@@ -34,7 +34,6 @@ import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
import org.apache.http.client.utils.HttpClientUtils;
import org.apache.olingo.client.api.ODataClient;
-import org.apache.olingo.client.api.communication.request.ODataStreamer;
import
org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.http.NoContentException;
@@ -62,6 +61,8 @@ public abstract class AbstractODataResponse implements
ODataResponse {
protected final ODataClient odataClient;
+ private static final byte[] CRLF = {13, 10};
+
/**
* HTTP client.
*/
@@ -227,7 +228,7 @@ public abstract class AbstractODataResponse implements
ODataResponse {
while (batchLineIterator.hasNext()) {
bos.write(batchLineIterator.nextLine().getBytes(Constants.UTF8));
- bos.write(ODataStreamer.CRLF);
+ bos.write(CRLF);
}
try {
diff --git
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
index 62d74cb..067fe95 100644
---
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
+++
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
@@ -198,7 +198,7 @@ public class BatchResponseSerializer {
private void put(final byte[] b) {
if (isClosed) {
- throw new RuntimeException("BodyBuilder is closed.");
+ throw new ODataRuntimeException("BodyBuilder is closed.");
}
if (buffer.remaining() < b.length) {
buffer.flip();
