You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/09/06 11:54:47 UTC
[05/10] brooklyn-server git commit: No https
No https
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/acfd9562
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/acfd9562
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/acfd9562
Branch: refs/heads/master
Commit: acfd95625da146da267435cde8a70e41f6ee8242
Parents: 3a4f870
Author: Valentin Aitken <bo...@gmail.com>
Authored: Thu Sep 1 14:39:37 2016 +0300
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Thu Sep 1 14:39:37 2016 +0300
----------------------------------------------------------------------
.../brooklyn/util/http/executor/HttpExecutorFactoryImpl.java | 2 +-
.../org/apache/brooklyn/util/http/executor/HttpRequest.java | 8 --------
.../apache/brooklyn/util/http/executor/HttpRequestImpl.java | 6 ------
.../util/http/executor/apacheclient/HttpExecutorImpl.java | 1 -
4 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/acfd9562/core/src/main/java/org/apache/brooklyn/util/http/executor/HttpExecutorFactoryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/http/executor/HttpExecutorFactoryImpl.java b/core/src/main/java/org/apache/brooklyn/util/http/executor/HttpExecutorFactoryImpl.java
index 1d392e1..e9b769a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/http/executor/HttpExecutorFactoryImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/util/http/executor/HttpExecutorFactoryImpl.java
@@ -55,7 +55,7 @@ public class HttpExecutorFactoryImpl implements HttpExecutorFactory {
}
try {
- httpExecutor = (HttpExecutor) new ClassLoaderUtils(HttpExecutorFactoryImpl.class).loadClass(httpExecutorClass).getConstructor(Map.class).newInstance(httpExecutorProps);
+ httpExecutor = (HttpExecutor) new ClassLoaderUtils(getClass()).loadClass(httpExecutorClass).getConstructor(Map.class).newInstance(httpExecutorProps);
} catch (Exception e) {
throw Exceptions.propagate(e);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/acfd9562/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequest.java b/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequest.java
index d7b6539..4659766 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequest.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequest.java
@@ -37,7 +37,6 @@ public interface HttpRequest {
@Beta
public static class Builder {
- protected boolean isHttps;
protected URI uri;
protected String method;
protected byte[] body;
@@ -45,11 +44,6 @@ public interface HttpRequest {
protected Credentials.BasicAuth credentials;
protected HttpConfig config;
- public Builder isHttps(boolean val) {
- isHttps = val;
- return this;
- }
-
public Builder uri(URI val) {
uri = checkNotNull(val, "uri");
return this;
@@ -103,8 +97,6 @@ public interface HttpRequest {
}
}
- boolean isHttps();
-
URI uri();
String method();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/acfd9562/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequestImpl.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequestImpl.java b/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequestImpl.java
index c2e19e9..0c76da8 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequestImpl.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/HttpRequestImpl.java
@@ -35,7 +35,6 @@ import com.google.common.collect.Multimaps;
@Beta
public class HttpRequestImpl implements HttpRequest {
- protected final boolean isHttps;
protected final URI uri;
protected final String method;
protected final byte[] body;
@@ -44,7 +43,6 @@ public class HttpRequestImpl implements HttpRequest {
protected final HttpConfig config;
protected HttpRequestImpl(HttpRequest.Builder builder) {
- this.isHttps = builder.isHttps;
this.uri = checkNotNull(builder.uri, "uri");
this.method = checkNotNull(builder.method, "method");
this.body = builder.body;
@@ -54,10 +52,6 @@ public class HttpRequestImpl implements HttpRequest {
}
@Override
- public boolean isHttps() {
- return isHttps;
- }
- @Override
public URI uri() {
return uri;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/acfd9562/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/apacheclient/HttpExecutorImpl.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/apacheclient/HttpExecutorImpl.java b/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/apacheclient/HttpExecutorImpl.java
index e973843..b2d2ada 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/apacheclient/HttpExecutorImpl.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/http/executor/apacheclient/HttpExecutorImpl.java
@@ -77,7 +77,6 @@ public class HttpExecutorImpl implements HttpExecutor {
Credentials creds = (request.credentials() != null) ? new UsernamePasswordCredentials(request.credentials().username(), request.credentials().password()) : null;
HttpClient httpClient = HttpTool.HttpClientBuilder.fromBuilder(baseBuilder)
.uri(request.uri())
- .https(request.isHttps())
.credential(Optional.fromNullable(creds))
.laxRedirect(config.laxRedirect())
.trustSelfSigned(config.trustSelfSigned())