concrete > expand setup

Author: DC2-DanielKrueger

hivemq-edge/src/main/java/com/hivemq/HiveMQEdgeBootstrap.java

@@ -162,7 +162,8 @@ private void bootstrapCoreComponents() {
         try {
             commercialModuleLoaderDiscovery = new CommercialModuleLoaderDiscovery(moduleLoader);
             commercialModuleLoaderDiscovery.discoverModuleLoaderMainClasses();
-            generalBootstrapService = new GeneralBootstrapServiceImpl(shutdownHooks, metricRegistry, systemInformation);
+            generalBootstrapService =
+                    new GeneralBootstrapServiceImpl(shutdownHooks, metricRegistry, systemInformation, configService);
             commercialModuleLoaderDiscovery.generalBootstrap(generalBootstrapService);
         } catch (Exception e) {
             log.warn("Error on loading the commercial module loader.", e);
@@ -178,7 +179,6 @@ private void bootstrapPersistences() {
 
         try {
             persistenceBootstrapService = PersistenceBootstrapServiceImpl.decorate(generalBootstrapService,
-                    configService,
                     persistencesService,
                     capabilityService);
             commercialModuleLoaderDiscovery.persistenceBootstrap(persistenceBootstrapService);

hivemq-edge/src/main/java/com/hivemq/bootstrap/services/GeneralBootstrapService.java

@@ -3,6 +3,7 @@
 import com.codahale.metrics.MetricRegistry;
 import com.hivemq.common.shutdown.ShutdownHooks;
 import com.hivemq.configuration.info.SystemInformation;
+import com.hivemq.configuration.service.ConfigurationService;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 
 public interface GeneralBootstrapService {
@@ -14,4 +15,5 @@ public interface GeneralBootstrapService {
 
     @NotNull ShutdownHooks shutdownHooks();
 
+    @NotNull ConfigurationService configurationService();
 }

hivemq-edge/src/main/java/com/hivemq/bootstrap/services/GeneralBootstrapServiceImpl.java

@@ -3,6 +3,7 @@
 import com.codahale.metrics.MetricRegistry;
 import com.hivemq.common.shutdown.ShutdownHooks;
 import com.hivemq.configuration.info.SystemInformation;
+import com.hivemq.configuration.service.ConfigurationService;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 
 /**
@@ -14,14 +15,17 @@ public class GeneralBootstrapServiceImpl implements GeneralBootstrapService {
     private final @NotNull ShutdownHooks shutdownHooks;
     private final @NotNull MetricRegistry metricRegistry;
     private final @NotNull SystemInformation systemInformation;
+    private final @NotNull ConfigurationService configurationService;
 
     public GeneralBootstrapServiceImpl(
             final @NotNull ShutdownHooks shutdownHooks,
             final @NotNull MetricRegistry metricRegistry,
-            final @NotNull SystemInformation systemInformation) {
+            final @NotNull SystemInformation systemInformation,
+            final @NotNull ConfigurationService configurationService) {
         this.shutdownHooks = shutdownHooks;
         this.metricRegistry = metricRegistry;
         this.systemInformation = systemInformation;
+        this.configurationService = configurationService;
     }
 
     @Override
@@ -39,5 +43,10 @@ public GeneralBootstrapServiceImpl(
         return shutdownHooks;
     }
 
+    @Override
+    public @NotNull ConfigurationService configurationService() {
+        return configurationService;
+    }
+
 
 }

hivemq-edge/src/main/java/com/hivemq/bootstrap/services/PersistenceBootstrapService.java

@@ -16,11 +16,9 @@ public interface PersistenceBootstrapService extends GeneralBootstrapService {
 
     static PersistenceBootstrapService decorate(
             final @NotNull GeneralBootstrapService generalBootstrapService,
-            final @NotNull ConfigurationService configurationService,
             final @NotNull PersistencesService persistencesService,
             final @NotNull HiveMQCapabilityService capabilityService) {
         return PersistenceBootstrapServiceImpl.decorate(generalBootstrapService,
-                configurationService,
                 persistencesService,
                 capabilityService);
     }

hivemq-edge/src/main/java/com/hivemq/bootstrap/services/PersistenceBootstrapServiceImpl.java

@@ -11,17 +11,14 @@
 public class PersistenceBootstrapServiceImpl implements PersistenceBootstrapService {
 
     private final @NotNull GeneralBootstrapService delegate;
-    private final @NotNull ConfigurationService configurationService;
     private final @NotNull PersistencesService persistencesService;
     private final @NotNull HiveMQCapabilityService capabilityService;
 
     private PersistenceBootstrapServiceImpl(
             final @NotNull GeneralBootstrapService delegate,
-            final @NotNull ConfigurationService configurationService,
             final @NotNull PersistencesService persistencesService,
             final @NotNull HiveMQCapabilityService capabilityService) {
         this.delegate = delegate;
-        this.configurationService = configurationService;
         this.persistencesService = persistencesService;
         this.capabilityService = capabilityService;
     }
@@ -44,7 +41,7 @@ private PersistenceBootstrapServiceImpl(
 
     @Override
     public @NotNull ConfigurationService configurationService() {
-        return configurationService;
+        return delegate.configurationService();
     }
 
     @Override
@@ -59,11 +56,9 @@ private PersistenceBootstrapServiceImpl(
 
     public static @NotNull PersistenceBootstrapService decorate(
             final @NotNull GeneralBootstrapService generalBootstrapService,
-            final @NotNull ConfigurationService configurationService,
             final @NotNull PersistencesService persistencesService,
             final @NotNull HiveMQCapabilityService capabilityService) {
         return new PersistenceBootstrapServiceImpl(generalBootstrapService,
-                configurationService,
                 persistencesService,
                 capabilityService);
     }