Skip to content

armgit / core

Public Imported from GitHub
0

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

Cleanup of Undertow initialisation

Rich Turner7f2453a6e8a4
diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
index 4c48dd208..35f6176ca 100644
--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
@@ -134,8 +134,7 @@ public class MessageBrokerService implements ContainerService {
String allowedOrigin = getString(container.getConfig(), MESSAGE_SESSION_ALLOWED_ORIGIN, MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT);
WebsocketComponent websocketComponent = new DefaultWebsocketComponent(
- container.getService(IdentityService.class),
- container.getService(WebService.class),
+ container,
allowedOrigin
);
diff --git a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
index 30c017740..c43f78626 100644
--- a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
+++ b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
@@ -30,12 +30,12 @@ import io.undertow.websockets.jsr.UndertowContainerProvider;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.keycloak.KeycloakPrincipal;
import org.openremote.container.security.AuthContext;
-import org.openremote.container.security.IdentityService;
import org.openremote.container.security.basic.BasicAuthContext;
import org.openremote.container.security.keycloak.AccessTokenAuthContext;
import org.openremote.container.web.socket.WebsocketAdapter;
import org.openremote.container.web.socket.WebsocketComponent;
import org.openremote.model.Constants;
+import org.openremote.model.Container;
import org.xnio.OptionMap;
import org.xnio.Options;
import org.xnio.Xnio;
@@ -43,13 +43,10 @@ import org.xnio.Xnio;
import javax.websocket.HandshakeResponse;
import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig;
-import javax.ws.rs.WebApplicationException;
import java.security.Principal;
import java.util.Optional;
import java.util.logging.Logger;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static org.openremote.container.web.WebService.pathStartsWithHandler;
public class DefaultWebsocketComponent extends WebsocketComponent {
@@ -61,15 +58,15 @@ public class DefaultWebsocketComponent extends WebsocketComponent {
UndertowContainerProvider.disableDefaultContainer();
}
- final protected IdentityService identityService;
+ final protected Container container;
final protected WebService webService;
final protected String allowedOrigin;
protected DeploymentInfo deploymentInfo;
protected WebService.RequestHandler websocketHttpHandler;
- public DefaultWebsocketComponent(IdentityService identityService, WebService webService, String allowedOrigin) {
- this.identityService = identityService;
- this.webService = webService;
+ public DefaultWebsocketComponent(Container container, String allowedOrigin) {
+ this.container = container;
+ this.webService = container.getService(WebService.class);
this.allowedOrigin = allowedOrigin;
}
@@ -152,12 +149,9 @@ public class DefaultWebsocketComponent extends WebsocketComponent {
constraint.addWebResourceCollection(resourceCollection);
deploymentInfo.addSecurityConstraints(constraint);
- HttpHandler handler = webService.addServletDeployment(identityService, deploymentInfo, true);
+ HttpHandler handler = WebService.addServletDeployment(container, deploymentInfo, true);
- HttpHandler tempHandler = (exchange) -> {
- handler.handleRequest(exchange);
- };
- websocketHttpHandler = pathStartsWithHandler(deploymentName, WEBSOCKET_PATH, tempHandler);
+ websocketHttpHandler = pathStartsWithHandler(deploymentName, WEBSOCKET_PATH, handler);
// Give web socket handler higher priority than any other handlers already added
webService.getRequestHandlers().add(0, websocketHttpHandler);
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.java
index 6031dc172..ba18bd88e 100644
--- a/container/src/main/java/org/openremote/container/web/WebService.java
+++ b/container/src/main/java/org/openremote/container/web/WebService.java
@@ -29,11 +29,11 @@ import io.undertow.servlet.api.DeploymentManager;
import io.undertow.servlet.api.FilterInfo;
import io.undertow.servlet.util.ImmediateInstanceHandle;
import org.jboss.resteasy.spi.ResteasyDeployment;
-import org.openremote.model.Container;
-import org.openremote.model.ContainerService;
import org.openremote.container.json.JacksonConfig;
import org.openremote.container.security.CORSFilter;
import org.openremote.container.security.IdentityService;
+import org.openremote.model.Container;
+import org.openremote.model.ContainerService;
import org.xnio.Options;
import javax.servlet.DispatcherType;
@@ -44,6 +44,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -91,13 +92,13 @@ public abstract class WebService implements ContainerService {
public static final String WEBSERVER_WORKER_THREADS_MAX = "WEBSERVER_WORKER_THREADS_MAX";
public static final int WEBSERVER_WORKER_THREADS_MAX_DEFAULT = Math.max(Runtime.getRuntime().availableProcessors(), 10);
private static final Logger LOG = Logger.getLogger(WebService.class.getName());
+ protected static AtomicReference<CORSFilter> corsFilterRef;
protected boolean devMode;
protected String host;
protected int port;
protected Undertow undertow;
protected List<RequestHandler> httpHandlers = new ArrayList<>();
protected URI containerHostUri;
- protected FilterInfo corsFilterInfo;
protected static String getLocalIpAddress() throws Exception {
return Inet4Address.getLocalHost().getHostAddress();
@@ -116,8 +117,6 @@ public abstract class WebService implements ContainerService {
? getLocalIpAddress()
: host;
- createCorsFilter(container);
-
containerHostUri =
UriBuilder.fromPath("/")
.scheme("http")
@@ -153,12 +152,12 @@ public abstract class WebService implements ContainerService {
/**
* Adds a deployment to the default servlet container and returns the started handler.
- *
- * @param identityService Must not be null if secure deployment is used
- * @param deploymentInfo The deployment to add to the default container
- * @param secure If authentication/authorization should be enabled for this deployment
*/
- public HttpHandler addServletDeployment(IdentityService identityService, DeploymentInfo deploymentInfo, boolean secure) {
+ public static HttpHandler addServletDeployment(Container container, DeploymentInfo deploymentInfo, boolean secure) {
+
+ IdentityService identityService = container.getService(IdentityService.class);
+ boolean devMode = container.isDevMode();
+
try {
if (secure) {
if (identityService == null)
@@ -174,6 +173,8 @@ public abstract class WebService implements ContainerService {
deploymentInfo.setExceptionHandler(new WebServiceExceptions.ServletUndertowExceptionHandler(devMode));
// Add CORS filter that works for any servlet deployment
+ FilterInfo corsFilterInfo = getCorsFilterInfo(container);
+
if (corsFilterInfo != null) {
deploymentInfo.addFilter(corsFilterInfo);
deploymentInfo.addFilterUrlMapping(corsFilterInfo.getName(), "*", DispatcherType.REQUEST);
@@ -270,33 +271,41 @@ public abstract class WebService implements ContainerService {
return resteasyDeployment;
}
- protected void createCorsFilter(Container container) {
- CORSFilter corsFilter = null;
- if (!devMode) {
- String allowedOriginsStr = getString(container.getConfig(), WEBSERVER_ALLOWED_ORIGINS, WEBSERVER_ALLOWED_ORIGINS_DEFAULT);
- if (allowedOriginsStr != null) {
+ public static synchronized FilterInfo getCorsFilterInfo(Container container) {
+
+ if (corsFilterRef == null) {
+ CORSFilter corsFilter = null;
+
+ if (!container.isDevMode()) {
+ String allowedOriginsStr = getString(container.getConfig(), WEBSERVER_ALLOWED_ORIGINS, WEBSERVER_ALLOWED_ORIGINS_DEFAULT);
+ if (allowedOriginsStr != null) {
+ corsFilter = new CORSFilter();
+ corsFilter.setAllowCredentials(true);
+ corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");
+ corsFilter.setExposedHeaders("*");
+ corsFilter.setCorsMaxAge(1209600);
+ String[] allowedOrigins = allowedOriginsStr.split(";");
+ corsFilter.getAllowedOrigins().addAll(Arrays.asList(allowedOrigins));
+ }
+ } else {
corsFilter = new CORSFilter();
+ corsFilter.getAllowedOrigins().add("*");
corsFilter.setAllowCredentials(true);
- corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");
corsFilter.setExposedHeaders("*");
+ corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");
corsFilter.setCorsMaxAge(1209600);
- String[] allowedOrigins = allowedOriginsStr.split(";");
- corsFilter.getAllowedOrigins().addAll(Arrays.asList(allowedOrigins));
}
- } else {
- corsFilter = new CORSFilter();
- corsFilter.getAllowedOrigins().add("*");
- corsFilter.setAllowCredentials(true);
- corsFilter.setExposedHeaders("*");
- corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");
- corsFilter.setCorsMaxAge(1209600);
+
+ corsFilterRef = new AtomicReference<>(corsFilter);
}
- if (corsFilter != null) {
- CORSFilter finalCorsFilter = corsFilter;
- corsFilterInfo = Servlets.filter("CORS Filter", CORSFilter.class, () -> new ImmediateInstanceHandle<>(finalCorsFilter))
- .setAsyncSupported(true);
+ if (corsFilterRef.get() != null) {
+ CORSFilter finalCorsFilter = corsFilterRef.get();
+ return Servlets.filter("CORS Filter", CORSFilter.class, () -> new ImmediateInstanceHandle<>(finalCorsFilter))
+ .setAsyncSupported(true);
}
+
+ return null;
}
}
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 8f14688f5..214b0275a 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -5,6 +5,7 @@ ARG GIT_COMMIT=unknown
LABEL git-commit=$GIT_COMMIT
+USER root
ENV JAVA_TOOL_OPTIONS ${JAVA_TOOL_OPTIONS}
ENV TZ ${TZ:-Europe/Amsterdam}
@@ -38,6 +39,7 @@ ENV KEYCLOAK_PORT ${KEYCLOAK_PORT:-8080}
ENV KEYCLOAK_GRANT_FILE ${KEYCLOAK_GRANT_FILE:-/deployment/manager/keycloak.json}
ENV APP_DOCROOT ${APP_DOCROOT:-/opt/web}
ENV CUSTOM_APP_DOCROOT ${CUSTOM_APP_DOCROOT:-/deployment/manager/app}
+ENV CONSOLE_APP_CONFIG_DOCROOT ${CONSOLE_APP_CONFIG_DOCROOT:-/deployment/manager/consoleappconfig}
ENV PROVISIONING_DOCROOT ${PROVISIONING_DOCROOT:-/deployment/manager/provisioning}
ENV ROOT_REDIRECT_PATH ${ROOT_REDIRECT_PATH:-/manager}
ENV MAP_TILES_PATH ${MAP_TILES_PATH:-/deployment/map/mapdata.mbtiles}
@@ -58,6 +60,8 @@ ENV MANAGER_JAVA_OPTS ${MANAGER_JAVA_OPTS:--Xms400m -Xmx400m \
-XX:MaxDirectMemorySize=25m -XX:NativeMemoryTracking=summary \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/javadump.core.hprof}
+RUN mkdir -p /deployment/manager/extensions
+
WORKDIR /opt/app
ADD lib /opt/app/lib
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
index fb8086ba6..a1c090717 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -125,7 +125,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
return;
}
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new AgentResourceImpl(
container.getService(TimerService.class),
container.getService(ManagerIdentityService.class),
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
index faf1a6d9f..65326e533 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
@@ -71,7 +71,7 @@ public class AssetModelService extends RouteBuilder implements ContainerService
clientEventService = container.getService(ClientEventService.class);
gatewayService = container.getService(GatewayService.class);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new AssetModelResourceImpl(
container.getService(TimerService.class),
identityService,
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index e883c14be..57f190264 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -327,7 +327,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
return assetEventAuthorizer.authorise(realm, auth, subscription);
});
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new AssetResourceImpl(
container.getService(TimerService.class),
identityService,
@@ -336,7 +336,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
)
);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new ConsoleResourceImpl(container.getService(TimerService.class),
identityService,
this,
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
index de6bc51ef..1c7a9d171 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -65,7 +65,7 @@ public class AssetDatapointService extends AbstractDatapointService<AssetDatapoi
public void init(Container container) throws Exception {
super.init(container);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new AssetDatapointResourceImpl(
container.getService(TimerService.class),
container.getService(ManagerIdentityService.class),
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java
index 39c65799b..33189fdde 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java
@@ -54,7 +54,7 @@ public class AssetPredictedDatapointService extends AbstractDatapointService<Ass
public void init(Container container) throws Exception {
super.init(container);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new AssetPredictedDatapointResourceImpl(
container.getService(TimerService.class),
container.getService(ManagerIdentityService.class),
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
index 1687f446b..37c936180 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
@@ -90,7 +90,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
timerService = container.getService(TimerService.class);
identityService = container.getService(ManagerIdentityService.class);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new GatewayClientResourceImpl(timerService, identityService, this)
);
diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.java
index 81a3439e8..b3858d387 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapService.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java
@@ -182,7 +182,7 @@ public class MapService implements ContainerService {
}
}
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new MapResourceImpl(this, container.getService(ManagerIdentityService.class))
);
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
index 0480d5bb1..45d22c3fb 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
@@ -120,7 +120,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
container.getServices(NotificationHandler.class).forEach(notificationHandler ->
notificationHandlerMap.put(notificationHandler.getTypeName(), notificationHandler));
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new NotificationResourceImpl(this,
container.getService(MessageBrokerService.class),
container.getService(AssetStorageService.class),
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
index 34179752a..a10b88ad9 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
@@ -52,7 +52,7 @@ public class ProvisioningService implements ContainerService {
identityService = container.getService(ManagerIdentityService.class);
TimerService timerService = container.getService(TimerService.class);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new ProvisioningResourceImpl(this, timerService, identityService)
);
}
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
index 97d2ae6bc..ce996892f 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -189,7 +189,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
container.getService(MessageBrokerService.class).getContext().addRoutes(this);
configEventExpires = getString(container.getConfig(), RULE_EVENT_EXPIRES, RULE_EVENT_EXPIRES_DEFAULT);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new FlowResourceImpl(
container.getService(TimerService.class),
container.getService(ManagerIdentityService.class)
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
index c8ab44ce0..6f3e4170b 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
@@ -76,7 +76,7 @@ public class RulesetStorageService implements ContainerService {
persistenceService = container.getService(PersistenceService.class);
identityService = container.getService(ManagerIdentityService.class);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new RulesResourceImpl(
container.getService(TimerService.class),
container.getService(ManagerIdentityService.class),
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java
index 7b83b76cd..332528700 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java
@@ -41,10 +41,10 @@ public class ManagerIdentityService extends IdentityService {
super.init(container);
persistenceService = container.getService(PersistenceService.class);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new TenantResourceImpl(container.getService(TimerService.class), this, container)
);
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new UserResourceImpl(container.getService(TimerService.class), this)
);
}
diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
index 66a69f371..011d7490e 100644
--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
@@ -85,7 +85,7 @@ public class SyslogService extends Handler implements ContainerService {
}
if (container.hasService(ManagerWebService.class)) {
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new SyslogResourceImpl(this)
);
}
diff --git a/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java b/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java
index 956b1328a..c46073596 100644
--- a/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java
+++ b/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java
@@ -52,7 +52,7 @@ public class HealthStatusService implements ContainerService {
}
}
- container.getService(ManagerWebService.class).getApiSingletons().add(
+ container.getService(ManagerWebService.class).addApiSingleton(
new StatusResourceImpl(healthStatusProviderList)
);
}
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
index 315df9a46..f6c880c27 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
@@ -88,6 +88,7 @@ public class ManagerWebService extends WebService {
private static final Logger LOG = Logger.getLogger(ManagerWebService.class.getName());
protected static final Pattern PATTERN_REALM_SUB = Pattern.compile("/([a-zA-Z0-9\\-_]+)/(.*)");
+ protected boolean initialised;
protected Path builtInAppDocRoot;
protected Path customAppDocRoot;
protected Collection<Class<?>> apiClasses = new HashSet<>();
@@ -104,7 +105,6 @@ public class ManagerWebService extends WebService {
public void init(Container container) throws Exception {
super.init(container);
- IdentityService identityService = container.getService(IdentityService.class);
String rootRedirectPath = getString(container.getConfig(), ROOT_REDIRECT_PATH, ROOT_REDIRECT_PATH_DEFAULT);
// Modify swagger object mapper to match ours
@@ -138,12 +138,13 @@ public class ManagerWebService extends WebService {
OpenApiResource openApiResource = new OpenApiResource();
openApiResource.openApiConfiguration(oasConfig);
- getApiSingletons().add(openApiResource);
+ addApiSingleton(openApiResource);
- ResteasyDeployment resteasyDeployment = createResteasyDeployment(container, getApiClasses(), getApiSingletons(), true);
+ initialised = true;
+ ResteasyDeployment resteasyDeployment = createResteasyDeployment(container, getApiClasses(), apiSingletons, true);
// Serve REST API
- HttpHandler apiHandler = createApiHandler(identityService, resteasyDeployment);
+ HttpHandler apiHandler = createApiHandler(container, resteasyDeployment);
if (apiHandler != null) {
@@ -186,14 +187,12 @@ public class ManagerWebService extends WebService {
HttpHandler defaultHandler = null;
if (Files.isDirectory(customAppDocRoot)) {
- HttpHandler customBaseFileHandler = createFileHandler(devMode, identityService, customAppDocRoot, null);
+ HttpHandler customBaseFileHandler = createFileHandler(container, customAppDocRoot, null);
defaultHandler = exchange -> {
if (exchange.getRelativePath().isEmpty() || "/".equals(exchange.getRelativePath())) {
exchange.setRelativePath("/index.html");
}
- if (customBaseFileHandler != null) {
- customBaseFileHandler.handleRequest(exchange);
- }
+ customBaseFileHandler.handleRequest(exchange);
};
}
@@ -201,7 +200,7 @@ public class ManagerWebService extends WebService {
// Serve deployment files
if (Files.isDirectory(builtInAppDocRoot)) {
- HttpHandler appBaseFileHandler = createFileHandler(devMode, identityService, builtInAppDocRoot, null);
+ HttpHandler appBaseFileHandler = createFileHandler(container, builtInAppDocRoot, null);
HttpHandler appFileHandler = exchange -> {
if (exchange.getRelativePath().isEmpty() || "/".equals(exchange.getRelativePath())) {
exchange.setRelativePath("/index.html");
@@ -256,8 +255,11 @@ public class ManagerWebService extends WebService {
/**
* Add resource/provider/etc. singletons to enable REST API.
*/
- public Collection<Object> getApiSingletons() {
- return apiSingletons;
+ public void addApiSingleton(Object singleton) {
+ if (this.initialised) {
+ throw new IllegalStateException("API singletons must be added before the service is initialised");
+ }
+ apiSingletons.add(singleton);
}
public Path getBuiltInAppDocRoot() {
@@ -268,7 +270,7 @@ public class ManagerWebService extends WebService {
return customAppDocRoot;
}
- protected HttpHandler createApiHandler(IdentityService identityService, ResteasyDeployment resteasyDeployment) {
+ protected HttpHandler createApiHandler(Container container, ResteasyDeployment resteasyDeployment) {
if (resteasyDeployment == null)
return null;
@@ -284,27 +286,30 @@ public class ManagerWebService extends WebService {
.addServlet(restServlet)
.setClassLoader(Container.class.getClassLoader());
+ IdentityService identityService = container.getService(IdentityService.class);
+
if (identityService != null) {
resteasyDeployment.setSecurityEnabled(true);
} else {
throw new RuntimeException("No identity service deployed, can't enable API security");
}
- return addServletDeployment(identityService, deploymentInfo, resteasyDeployment.isSecurityEnabled());
+ return addServletDeployment(container, deploymentInfo, resteasyDeployment.isSecurityEnabled());
}
// TODO: Switch to use PathResourceManager
- public HttpHandler createFileHandler(boolean devMode, IdentityService identityService, Path filePath, String[] requiredRoles) {
+ public static HttpHandler createFileHandler(Container container, Path filePath, String[] requiredRoles) {
+ boolean devMode = container.isDevMode();
requiredRoles = requiredRoles == null ? new String[0] : requiredRoles;
DeploymentInfo deploymentInfo = ManagerFileServlet.createDeploymentInfo(devMode, "", filePath, requiredRoles);
- return new CanonicalPathHandler(addServletDeployment(identityService, deploymentInfo, requiredRoles.length != 0));
+ return new CanonicalPathHandler(addServletDeployment(container, deploymentInfo, requiredRoles.length != 0));
}
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- "appDocRoot=" + builtInAppDocRoot +
- "customAppDocRoot=" + customAppDocRoot +
- '}';
+ "builtInAppDocRoot=" + builtInAppDocRoot +
+ ", customAppDocRoot=" + customAppDocRoot +
+ '}';
}
}
diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy
index 0df79723a..cc009ec80 100644
--- a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy
@@ -1,6 +1,6 @@
package org.openremote.test.energy
-import org.junit.Ignore
+
import org.openremote.manager.asset.AssetProcessingService
import org.openremote.manager.asset.AssetStorageService
import org.openremote.manager.datapoint.AssetPredictedDatapointService
@@ -13,6 +13,7 @@ import org.openremote.model.geo.GeoJSONPoint
import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.setup.ManagerTestSetup
+import spock.lang.Ignore
import spock.lang.Shared
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy
index 7c6f624cf..9e0ba7493 100644
--- a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy
@@ -1,6 +1,5 @@
package org.openremote.test.energy
-import org.junit.Ignore
import org.openremote.manager.asset.AssetProcessingService
import org.openremote.manager.asset.AssetStorageService
import org.openremote.manager.datapoint.AssetPredictedDatapointService
@@ -14,6 +13,7 @@ import org.openremote.model.geo.GeoJSONPoint
import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.setup.ManagerTestSetup
+import spock.lang.Ignore
import spock.lang.Shared
import spock.lang.Specification
import spock.util.concurrent.PollingConditions