control plane > fix injection

Author: DC2-DanielKrueger

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

@@ -8,11 +8,8 @@
 import com.hivemq.bootstrap.ioc.DaggerInjector;
 import com.hivemq.bootstrap.ioc.Injector;
 import com.hivemq.bootstrap.ioc.Persistences;
-import com.hivemq.bootstrap.services.CompleteBootstrapService;
-import com.hivemq.bootstrap.services.CompleteBootstrapServiceImpl;
 import com.hivemq.bootstrap.services.GeneralBootstrapServiceImpl;
 import com.hivemq.bootstrap.services.PersistenceBootstrapService;
-import com.hivemq.bootstrap.services.PersistenceBootstrapServiceImpl;
 import com.hivemq.common.shutdown.ShutdownHooks;
 import com.hivemq.configuration.ConfigurationBootstrap;
 import com.hivemq.configuration.HivemqId;
@@ -64,7 +61,6 @@ public class HiveMQEdgeBootstrap {
     private @Nullable GeneralBootstrapServiceImpl generalBootstrapService;
     private @Nullable PersistenceBootstrapService persistenceBootstrapService;
     private @Nullable Injector injector;
-    private CompleteBootstrapService completeBootstrapService;
 
     public HiveMQEdgeBootstrap(
             final @NotNull MetricRegistry metricRegistry,
@@ -153,7 +149,7 @@ private void bootstrapInjector() {
                 .restComponentsHolder(genericAPIHolder)
                 .connectionPersistence(connectionPersistence)
                 .commercialModuleDiscovery(commercialModuleLoaderDiscovery)
-                .completeBootstrapService(completeBootstrapService)
+                .generalBootstrapService(generalBootstrapService)
                 .hivemqId(hivemqId)
                 .build();
         log.trace("Initialized injector in {}ms", (System.currentTimeMillis() - startDagger));
@@ -182,9 +178,7 @@ private void bootstrapPersistences() {
         Preconditions.checkNotNull(commercialModuleLoaderDiscovery);
 
         try {
-            persistenceBootstrapService = PersistenceBootstrapServiceImpl.decorate(generalBootstrapService,
-                    persistencesService,
-                    capabilityService);
+            persistenceBootstrapService = injector.persistenceBootstrapService();
             commercialModuleLoaderDiscovery.persistenceBootstrap(persistenceBootstrapService);
         } catch (Exception e) {
             log.warn("Error on bootstrapping persistences.", e);
@@ -198,15 +192,9 @@ private void finishBootstrap() {
         Preconditions.checkNotNull(persistences);
         Preconditions.checkNotNull(configService);
         Preconditions.checkNotNull(commercialModuleLoaderDiscovery);
-        Preconditions.checkNotNull(persistenceBootstrapService);
 
         try {
-            completeBootstrapService = CompleteBootstrapServiceImpl.decorate(
-                    persistenceBootstrapService,
-                    persistences,
-                    restComponentsService,
-                    handlerService);
-            commercialModuleLoaderDiscovery.completeBootstrap(completeBootstrapService);
+            commercialModuleLoaderDiscovery.completeBootstrap(injector.completeBootstrapService());
         } catch (Exception e) {
             log.warn("Error on bootstraping persistences.", e);
             throw new HiveMQEdgeStartupException(e);

hivemq-edge/src/main/java/com/hivemq/bootstrap/ioc/BootstrapServicesModule.java

@@ -0,0 +1,29 @@
+package com.hivemq.bootstrap.ioc;
+
+import com.hivemq.bootstrap.services.AfterHiveMQStartBootstrapService;
+import com.hivemq.bootstrap.services.AfterHiveMQStartBootstrapServiceImpl;
+import com.hivemq.bootstrap.services.CompleteBootstrapService;
+import com.hivemq.bootstrap.services.CompleteBootstrapServiceImpl;
+import com.hivemq.bootstrap.services.PersistenceBootstrapService;
+import com.hivemq.bootstrap.services.PersistenceBootstrapServiceImpl;
+import com.hivemq.extension.sdk.api.annotations.NotNull;
+import dagger.Binds;
+import dagger.Module;
+
+import javax.inject.Singleton;
+
+@Module
+public abstract class BootstrapServicesModule {
+
+    @Singleton
+    @Binds
+    abstract @NotNull PersistenceBootstrapService persistenceBootstrapService(final @NotNull PersistenceBootstrapServiceImpl persistenceBootstrapService);
+
+    @Singleton
+    @Binds
+    abstract @NotNull CompleteBootstrapService completeBootstrapService(final @NotNull CompleteBootstrapServiceImpl completeBootstrapService);
+
+    @Singleton
+    @Binds
+    abstract @NotNull AfterHiveMQStartBootstrapService afterHiveMQStartBootstrapService(final @NotNull AfterHiveMQStartBootstrapServiceImpl afterHiveMQStartBootstrapService);
+}

hivemq-edge/src/main/java/com/hivemq/bootstrap/ioc/Injector.java

@@ -20,7 +20,10 @@
 import com.hivemq.api.ioc.ApiModule;
 import com.hivemq.api.resources.GenericAPIHolder;
 import com.hivemq.bootstrap.netty.ioc.NettyModule;
+import com.hivemq.bootstrap.services.AfterHiveMQStartBootstrapService;
 import com.hivemq.bootstrap.services.CompleteBootstrapService;
+import com.hivemq.bootstrap.services.GeneralBootstrapService;
+import com.hivemq.bootstrap.services.PersistenceBootstrapService;
 import com.hivemq.bridge.ioc.BridgeModule;
 import com.hivemq.common.executors.ioc.ExecutorsModule;
 import com.hivemq.common.shutdown.ShutdownHooks;
@@ -75,7 +78,8 @@
         ModulesModule.class,
         UnsServiceModule.class,
         DataGovernanceModule.class,
-        RemoteServiceModule.class})
+        RemoteServiceModule.class,
+        BootstrapServicesModule.class})
 @Singleton
 public interface Injector {
 
@@ -103,6 +107,12 @@ public interface Injector {
 
     CompleteBootstrapService completeBootstrapService();
 
+    GeneralBootstrapService generalBootstrapService();
+
+    PersistenceBootstrapService persistenceBootstrapService();
+
+    AfterHiveMQStartBootstrapService afterHiveMQStartBootstrapService();
+
     ProtocolAdapterManager protocolAdapterManager();
 
 //    UnsServiceModule uns();
@@ -155,8 +165,7 @@ interface Builder {
         Builder commercialModuleDiscovery(CommercialModuleLoaderDiscovery commercialModuleLoaderDiscovery);
 
         @BindsInstance
-        Builder completeBootstrapService(CompleteBootstrapService completeBootstrapService);
-
+        Builder generalBootstrapService(GeneralBootstrapService generalBootstrapService);
 
         Injector build();
     }

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

@@ -14,12 +14,17 @@
 import com.hivemq.extensions.core.RestComponentsService;
 import com.hivemq.protocols.ProtocolAdapterManager;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
 public class AfterHiveMQStartBootstrapServiceImpl implements AfterHiveMQStartBootstrapService {
 
     private final @NotNull CompleteBootstrapService delegate;
     private final @NotNull ProtocolAdapterManager protocolAdapterManager;
     private final @NotNull ModulesAndExtensionsService modulesAndExtensionsService;
 
+    @Inject
     public AfterHiveMQStartBootstrapServiceImpl(
             final @NotNull CompleteBootstrapService delegate,
             final @NotNull ProtocolAdapterManager protocolAdapterManager,

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

@@ -12,13 +12,18 @@
 import com.hivemq.extensions.core.PersistencesService;
 import com.hivemq.extensions.core.RestComponentsService;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
 public class CompleteBootstrapServiceImpl implements CompleteBootstrapService {
 
     private final @NotNull Persistences persistences;
     private final @NotNull RestComponentsService restComponentsService;
     private final @NotNull HandlerService handlerService;
     private final @NotNull PersistenceBootstrapService delegate;
 
+    @Inject
     public CompleteBootstrapServiceImpl(
             final @NotNull PersistenceBootstrapService delegate,
             final @NotNull Persistences persistences,

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

@@ -9,13 +9,18 @@
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extensions.core.PersistencesService;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
 public class PersistenceBootstrapServiceImpl implements PersistenceBootstrapService {
 
     private final @NotNull GeneralBootstrapService delegate;
     private final @NotNull PersistencesService persistencesService;
     private final @NotNull HiveMQCapabilityService capabilityService;
 
-    private PersistenceBootstrapServiceImpl(
+    @Inject
+    public PersistenceBootstrapServiceImpl(
             final @NotNull GeneralBootstrapService delegate,
             final @NotNull PersistencesService persistencesService,
             final @NotNull HiveMQCapabilityService capabilityService) {

hivemq-edge/src/main/java/com/hivemq/util/Checkpoints.java

@@ -48,6 +48,9 @@ public class Checkpoints {
     public static final @NotNull String CONTROL_PLANE_CONNECTION_ESTABLISHED =
             "control-plane-connection-established";
 
+    public static final @NotNull String CONTROL_PLANE_CONNECTION_HANDSHAKE_REISSUED =
+            "control-plane-connection-handshake-reissued";
+
 
     public static boolean enabled() {
         return enabled;