You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/05 12:30:17 UTC
[5/5] git commit: White noise: formatting
White noise: formatting
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/585ddaea
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/585ddaea
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/585ddaea
Branch: refs/heads/olingo263
Commit: 585ddaead8c14b428a7f235769232c6cc8232a55
Parents: 7c079a1
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 5 12:29:56 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 5 12:29:56 2014 +0200
----------------------------------------------------------------------
.../communication/request/AbstractRequest.java | 3 +--
.../http/ProxyWrapperHttpClientFactory.java | 4 +--
.../apache/olingo/client/core/uri/URIUtils.java | 28 ++++++++++----------
3 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/585ddaea/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 31b65b3..1023618 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
@@ -17,7 +17,6 @@ package org.apache.olingo.client.core.communication.request;
import java.io.IOException;
-import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
@@ -87,7 +86,7 @@ public abstract class AbstractRequest {
response.getStatusLine().getReasonPhrase(),
isXML);
}
-
+
if (response.getStatusLine().getStatusCode() >= 500) {
throw new ODataServerErrorException(response.getStatusLine());
} else {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/585ddaea/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java
index f76b083..29b6fe4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java
@@ -62,8 +62,8 @@ public class ProxyWrapperHttpClientFactory implements HttpClientFactory {
this.proxyPassword = proxyPassword;
this.wrapped = wrapped;
}
-
- public DefaultHttpClientFactory getWrappedHttpClientFactory(){
+
+ public DefaultHttpClientFactory getWrappedHttpClientFactory() {
return this.wrapped;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/585ddaea/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 a4cfce3..0e1d029 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
@@ -38,6 +38,7 @@ import org.apache.commons.codec.binary.Hex;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.entity.InputStreamEntity;
@@ -389,25 +390,24 @@ public final class URIUtils {
return value;
}
- private static boolean shouldUseRepeatableHttpBodyEntry(final CommonODataClient<?> client)
- {
+ private static boolean shouldUseRepeatableHttpBodyEntry(final CommonODataClient<?> client) {
// returns true for authentication request in case of http401 which needs retry so requires being repeatable.
- HttpClientFactory httpclientFactory = client.getConfiguration().getHttpClientFactory();
- if(httpclientFactory instanceof BasicAuthHttpClientFactory){
+ HttpClientFactory httpclientFactory = client.getConfiguration().getHttpClientFactory();
+ if (httpclientFactory instanceof BasicAuthHttpClientFactory) {
return true;
- } else if (httpclientFactory instanceof ProxyWrapperHttpClientFactory){
- ProxyWrapperHttpClientFactory tmp = (ProxyWrapperHttpClientFactory)httpclientFactory;
- if(tmp.getWrappedHttpClientFactory() instanceof BasicAuthHttpClientFactory){
+ } else if (httpclientFactory instanceof ProxyWrapperHttpClientFactory) {
+ ProxyWrapperHttpClientFactory tmp = (ProxyWrapperHttpClientFactory) httpclientFactory;
+ if (tmp.getWrappedHttpClientFactory() instanceof BasicAuthHttpClientFactory) {
return true;
}
}
-
+
return false;
}
-
- public static AbstractHttpEntity buildInputStreamEntity(final CommonODataClient<?> client, final InputStream input) {
- AbstractHttpEntity entity = null;
- boolean repeatableRequired= shouldUseRepeatableHttpBodyEntry(client);
+
+ public static HttpEntity buildInputStreamEntity(final CommonODataClient<?> client, final InputStream input) {
+ HttpEntity entity;
+ boolean repeatableRequired = shouldUseRepeatableHttpBodyEntry(client);
if (!repeatableRequired) {
entity = new InputStreamEntity(input, -1);
} else {
@@ -420,9 +420,9 @@ public final class URIUtils {
entity = new ByteArrayEntity(bytes);
}
-
+
// both entities can be sent in chunked way or not
- entity.setChunked(client.getConfiguration().isUseChuncked());
+ ((AbstractHttpEntity) entity).setChunked(client.getConfiguration().isUseChuncked());
return entity;
}
}