Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

WebTargetBuilder minor refactor

Rich Turnercef2b0ca67c1
diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
index fa36cc829..32fa5943d 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
@@ -187,7 +187,7 @@ public class ControllerProtocol extends AbstractProtocol {
@Override
public void init(Container container) throws Exception {
super.init(container);
- client = createClient(executorService, CONNECTION_POOL_SIZE, 70000);
+ client = createClient(executorService, CONNECTION_POOL_SIZE, 70000, null);
}
@Override
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
index ad5d1a6cf..167a49420 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
@@ -628,7 +628,11 @@ public class HttpClientProtocol extends AbstractProtocol {
@Override
public void init(Container container) throws Exception {
super.init(container);
- client = createClient(executorService);
+ client = createClient();
+ }
+
+ protected ResteasyClient createClient() {
+ return WebTargetBuilder.createClient(executorService);
}
@Override
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java b/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java
index bc4deaad0..d6e429f07 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java
@@ -36,6 +36,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
+import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
/**
@@ -170,10 +171,10 @@ public class WebTargetBuilder {
}
public static ResteasyClient createClient(ExecutorService executorService) {
- return createClient(executorService, CONNECTION_POOL_SIZE, CONNECTION_TIMEOUT_MILLISECONDS);
+ return createClient(executorService, CONNECTION_POOL_SIZE, CONNECTION_TIMEOUT_MILLISECONDS, null);
}
- public static ResteasyClient createClient(ExecutorService executorService, int connectionPoolSize, long overrideSocketTimeout) {
+ public static ResteasyClient createClient(ExecutorService executorService, int connectionPoolSize, long overrideSocketTimeout, UnaryOperator<ResteasyClientBuilder> builderConfigurator) {
ResteasyClientBuilder clientBuilder = new ResteasyClientBuilder()
.connectionPoolSize(connectionPoolSize)
.connectionCheckoutTimeout(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS)
@@ -185,6 +186,10 @@ public class WebTargetBuilder {
clientBuilder.asyncExecutor(executorService);
}
+ if (builderConfigurator != null) {
+ clientBuilder = builderConfigurator.apply(clientBuilder);
+ }
+
return clientBuilder.build();
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java
index a46a4d1f5..87a42633c 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java
@@ -272,7 +272,7 @@ public class WebsocketClient extends AbstractNettyIoClient<String, InetSocketAdd
if (oAuthGrant != null) {
LOG.fine("Retrieving OAuth access token: " + getSocketAddressString());
- ResteasyClient client = createClient(executorService, 1, CONNECTION_TIMEOUT_MILLISECONDS);
+ ResteasyClient client = createClient(executorService, 1, CONNECTION_TIMEOUT_MILLISECONDS, null);
try {
WebTarget authTarget = client.target(oAuthGrant.getTokenEndpointUri());
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
index 775fe06f0..271475a42 100644
--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
@@ -65,6 +65,61 @@ import static org.openremote.model.Constants.REQUEST_HEADER_REALM;
public abstract class KeycloakIdentityProvider implements IdentityProvider {
+// TODO: Below is here ready for Resteasy 4.x but their maven packages are a mess at the moment
+// protected static class EngineBuilder extends ClientHttpEngineBuilder43 {
+//
+// protected final UnaryOperator<HttpClientBuilder> httpClientBuilderConfigurator;
+//
+// public EngineBuilder(UnaryOperator<HttpClientBuilder> httpClientBuilderConfigurator) {
+// this.httpClientBuilderConfigurator = httpClientBuilderConfigurator;
+// }
+//
+// @Override
+// protected ClientHttpEngine createEngine(HttpClientConnectionManager cm, RequestConfig.Builder rcBuilder, HttpHost defaultProxy, int responseBufferSize, HostnameVerifier verifier, SSLContext theContext) {
+// final HttpClient httpClient;
+// rcBuilder.setProxy(defaultProxy);
+// if (System.getSecurityManager() == null)
+// {
+// HttpClientBuilder clientBuilder = HttpClientBuilder.create()
+// .setConnectionManager(cm)
+// .setDefaultRequestConfig(rcBuilder.build())
+// .disableContentCompression();
+//
+// if (httpClientBuilderConfigurator != null) {
+// clientBuilder = httpClientBuilderConfigurator.apply(clientBuilder);
+// }
+//
+// httpClient = clientBuilder.build();
+// }
+// else {
+// httpClient = AccessController.doPrivileged(new PrivilegedAction<HttpClient>()
+// {
+// @Override
+// public HttpClient run()
+// {
+// HttpClientBuilder clientBuilder = HttpClientBuilder.create()
+// .setConnectionManager(cm)
+// .setDefaultRequestConfig(rcBuilder.build())
+// .disableContentCompression();
+//
+// if (httpClientBuilderConfigurator != null) {
+// clientBuilder = httpClientBuilderConfigurator.apply(clientBuilder);
+// }
+//
+// return clientBuilder.build();
+// }
+// });
+// }
+//
+// ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine(httpClient, true);
+// engine.setResponseBufferSize(responseBufferSize);
+// engine.setHostnameVerifier(verifier);
+// // this may be null. We can't really support this with Apache Client.
+// engine.setSslContext(theContext);
+// return engine;
+// }
+// }
+
private static final Logger LOG = Logger.getLogger(KeycloakIdentityProvider.class.getName());
public static final String KEYCLOAK_HOST = "KEYCLOAK_HOST";
@@ -156,6 +211,28 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {
.connectionPoolSize(
getInteger(container.getConfig(), KEYCLOAK_CLIENT_POOL_SIZE, KEYCLOAK_CLIENT_POOL_SIZE_DEFAULT)
);
+// ResteasyClientBuilder clientBuilder = (ResteasyClientBuilder) ResteasyClientBuilder.newBuilder();
+// clientBuilder.httpEngine(
+// new EngineBuilder(httpClientBuilder ->
+// httpClientBuilder.addInterceptorLast((HttpRequestInterceptor) (request, context) ->
+// request.setHeader(HTTP.TARGET_HOST, new HttpHost(externalServerUri.build().getHost(), externalServerUri.build().getPort()).toHostString())
+// )
+// ).build()
+// );
+//
+// clientBuilder
+// .connectionCheckoutTimeout(
+// getInteger(container.getConfig(), KEYCLOAK_CONNECT_TIMEOUT, KEYCLOAK_CONNECT_TIMEOUT_DEFAULT),
+// TimeUnit.MILLISECONDS
+// )
+// .readTimeout(
+// getInteger(container.getConfig(), KEYCLOAK_REQUEST_TIMEOUT, KEYCLOAK_REQUEST_TIMEOUT_DEFAULT),
+// TimeUnit.MILLISECONDS
+// )
+// .connectionPoolSize(
+// getInteger(container.getConfig(), KEYCLOAK_CLIENT_POOL_SIZE, KEYCLOAK_CLIENT_POOL_SIZE_DEFAULT)
+// );
+
httpClient = WebClient.registerDefaults(clientBuilder).build();
diff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
index 603a94be4..7acf6843c 100644
--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
@@ -1,11 +1,9 @@
package org.openremote.test
-import com.google.common.collect.Lists
import org.apache.camel.spi.BrowsableEndpoint
import org.openremote.container.Container
import org.openremote.container.ContainerService
import org.openremote.container.message.MessageBrokerSetupService
-import org.openremote.container.security.keycloak.KeycloakIdentityProvider
import org.openremote.container.timer.TimerService
import org.openremote.manager.asset.AssetProcessingService
import spock.util.concurrent.PollingConditions
@@ -14,7 +12,6 @@ import java.util.concurrent.TimeUnit
import java.util.stream.Collectors
import static java.util.stream.StreamSupport.stream
-import static org.openremote.container.security.IdentityService.IDENTITY_NETWORK_HOST
import static org.openremote.container.security.IdentityService.IDENTITY_NETWORK_WEBSERVER_PORT
import static org.openremote.container.timer.TimerService.Clock.PSEUDO
import static org.openremote.container.timer.TimerService.TIMER_CLOCK_TYPE