Repository: olingo-odata4 Updated Branches: refs/heads/master 51f7af4b9 -> 68d2e23ad
[OLINGO-989] Checkbuild issues Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/68d2e23a Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/68d2e23a Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/68d2e23a Branch: refs/heads/master Commit: 68d2e23ad43a938587544365d47aa2d15ef843f7 Parents: 51f7af4 Author: Christian Amend <[email protected]> Authored: Wed Jul 27 15:22:00 2016 +0200 Committer: Christian Amend <[email protected]> Committed: Wed Jul 27 15:22:00 2016 +0200 ---------------------------------------------------------------------- lib/client-api/pom.xml | 7 +++++++ lib/client-core/pom.xml | 7 +++++++ .../request/AbstractODataBasicRequest.java | 2 +- .../request/streamed/AbstractODataStreamedRequest.java | 4 ++-- .../org/apache/olingo/client/core/uri/URIUtils.java | 5 +++-- lib/pom.xml | 2 +- lib/server-core-ext/pom.xml | 12 ++++++++++++ .../server/core/serializer/BatchResponseSerializer.java | 2 +- 8 files changed, 34 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/client-api/pom.xml ---------------------------------------------------------------------- diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index 0f08647..8561b40 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -61,6 +61,13 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>${maven.bundle.plugin.version}</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/client-core/pom.xml ---------------------------------------------------------------------- diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index 1af1dea..7ec36bd 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -89,6 +89,13 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <inherited>true</inherited> <configuration> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/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 e8b1659..5435f7f 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 @@ -70,7 +70,7 @@ public abstract class AbstractODataBasicRequest<T extends ODataResponse> public final Future<T> asyncExecute() { return odataClient.getConfiguration().getExecutor().submit(new Callable<T>() { @Override - public T call() throws Exception { + public T call() throws Exception { //NOSONAR return execute(); } }); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java ---------------------------------------------------------------------- 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 76e5633..5da0ce6 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 @@ -101,7 +101,7 @@ public abstract class AbstractODataStreamedRequest<V extends ODataResponse, T ex if (URIUtils.shouldUseRepeatableHttpBodyEntry(odataClient)) { futureWrapper.setWrapped(odataClient.getConfiguration().getExecutor().submit(new Callable<HttpResponse>() { @Override - public HttpResponse call() throws Exception { + public HttpResponse call() throws Exception { //NOSONAR ((HttpEntityEnclosingRequestBase) request).setEntity( URIUtils.buildInputStreamEntity(odataClient, payloadManager.getBody())); @@ -114,7 +114,7 @@ public abstract class AbstractODataStreamedRequest<V extends ODataResponse, T ex futureWrapper.setWrapped(odataClient.getConfiguration().getExecutor().submit(new Callable<HttpResponse>() { @Override - public HttpResponse call() throws Exception { + public HttpResponse call() throws Exception { //NOSONAR return doExecute(); } })); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java index bf2405d..ecde086 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java @@ -45,14 +45,15 @@ import org.apache.http.entity.AbstractHttpEntity; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.InputStreamEntity; import org.apache.olingo.client.api.ODataClient; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.WrappingHttpClientFactory; import org.apache.olingo.client.api.uri.SegmentType; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.Constants; -import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.geo.Geospatial; +import org.apache.olingo.commons.api.ex.ODataRuntimeException; import org.apache.olingo.commons.core.edm.primitivetype.EdmBinary; import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset; import org.apache.olingo.commons.core.edm.primitivetype.EdmDecimal; @@ -293,7 +294,7 @@ public final class URIUtils { bytes = IOUtils.toByteArray(input); IOUtils.closeQuietly(input); } catch (IOException e) { - throw new RuntimeException("While reading input for not chunked encoding", e); + throw new ODataRuntimeException("While reading input for not chunked encoding", e); } entity = new ByteArrayEntity(bytes); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/pom.xml ---------------------------------------------------------------------- diff --git a/lib/pom.xml b/lib/pom.xml index 60e48fa..1f25a52 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -58,7 +58,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> - <skip>${olingo.deploy.skip}</skip> + <skip>false</skip> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/server-core-ext/pom.xml ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/pom.xml b/lib/server-core-ext/pom.xml index 7daeeaa..db6f6fc 100644 --- a/lib/server-core-ext/pom.xml +++ b/lib/server-core-ext/pom.xml @@ -97,4 +97,16 @@ </exclusions> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>${olingo.deploy.skip}</skip> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/68d2e23a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java ---------------------------------------------------------------------- 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 e4a2a83..7ef81b0 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 @@ -239,7 +239,7 @@ public class BatchResponseSerializer { } private byte[] getContent() { - return content; + return content; //NOSONAR } private byte[] getBody(final ODataResponse response) {
