control plane > update with changes form library

Author: DC2-DanielKrueger

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

@@ -15,6 +15,7 @@
 import com.hivemq.bootstrap.services.PersistenceBootstrapServiceImpl;
 import com.hivemq.common.shutdown.ShutdownHooks;
 import com.hivemq.configuration.ConfigurationBootstrap;
+import com.hivemq.configuration.HivemqId;
 import com.hivemq.configuration.info.SystemInformation;
 import com.hivemq.configuration.service.ConfigurationService;
 import com.hivemq.edge.HiveMQCapabilityService;
@@ -48,6 +49,7 @@ public class HiveMQEdgeBootstrap {
     private final @NotNull SystemInformation systemInformation;
     private final @NotNull ModuleLoader moduleLoader;
     private @Nullable ConfigurationService configService;
+    private final @NotNull HivemqId hivemqId = new HivemqId();
 
     private final @NotNull PersistenceStartup persistenceStartup = new PersistenceStartup();
     private final @NotNull HandlerService handlerService = new HandlerService();
@@ -149,6 +151,7 @@ private void bootstrapInjector() {
                 .restComponentService(restComponentsService)
                 .restComponentsHolder(genericAPIHolder)
                 .connectionPersistence(connectionPersistence)
+                .hivemqId(hivemqId)
                 .build();
         log.trace("Initialized injector in {}ms", (System.currentTimeMillis() - startDagger));
     }
@@ -158,12 +161,11 @@ private void bootstrapCoreComponents() {
         // configService is always set in caller
         assert configService != null;
 
-
         try {
             commercialModuleLoaderDiscovery = new CommercialModuleLoaderDiscovery(moduleLoader);
             commercialModuleLoaderDiscovery.discoverModuleLoaderMainClasses();
             generalBootstrapService =
-                    new GeneralBootstrapServiceImpl(shutdownHooks, metricRegistry, systemInformation, configService);
+                    new GeneralBootstrapServiceImpl(shutdownHooks, metricRegistry, systemInformation, configService, hivemqId);
             commercialModuleLoaderDiscovery.generalBootstrap(generalBootstrapService);
         } catch (Exception e) {
             log.warn("Error on loading the commercial module loader.", e);

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

@@ -23,6 +23,7 @@
 import com.hivemq.bridge.ioc.BridgeModule;
 import com.hivemq.common.executors.ioc.ExecutorsModule;
 import com.hivemq.common.shutdown.ShutdownHooks;
+import com.hivemq.configuration.HivemqId;
 import com.hivemq.configuration.info.SystemInformation;
 import com.hivemq.configuration.ioc.ConfigurationModule;
 import com.hivemq.configuration.service.ConfigurationService;
@@ -138,6 +139,9 @@ interface Builder {
         @BindsInstance
         Builder connectionPersistence(ConnectionPersistence connectionPersistence);
 
+        @BindsInstance
+        Builder hivemqId(HivemqId hivemqId);
+
         Injector build();
     }
 

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

@@ -49,6 +49,11 @@ public CompleteBootstrapServiceImpl(
         return delegate.configurationService();
     }
 
+    @Override
+    public @NotNull String getHivemqId() {
+        return delegate.getHivemqId();
+    }
+
     @Override
     public @NotNull PersistencesService persistenceService() {
         return delegate.persistenceService();

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

@@ -16,4 +16,6 @@ public interface GeneralBootstrapService {
     @NotNull ShutdownHooks shutdownHooks();
 
     @NotNull ConfigurationService configurationService();
+
+    @NotNull String getHivemqId();
 }

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

@@ -2,6 +2,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.hivemq.common.shutdown.ShutdownHooks;
+import com.hivemq.configuration.HivemqId;
 import com.hivemq.configuration.info.SystemInformation;
 import com.hivemq.configuration.service.ConfigurationService;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
@@ -16,16 +17,19 @@ public class GeneralBootstrapServiceImpl implements GeneralBootstrapService {
     private final @NotNull MetricRegistry metricRegistry;
     private final @NotNull SystemInformation systemInformation;
     private final @NotNull ConfigurationService configurationService;
+    private final @NotNull HivemqId hivemqId;
 
     public GeneralBootstrapServiceImpl(
             final @NotNull ShutdownHooks shutdownHooks,
             final @NotNull MetricRegistry metricRegistry,
             final @NotNull SystemInformation systemInformation,
-            final @NotNull ConfigurationService configurationService) {
+            final @NotNull ConfigurationService configurationService,
+            final @NotNull HivemqId hivemqId) {
         this.shutdownHooks = shutdownHooks;
         this.metricRegistry = metricRegistry;
         this.systemInformation = systemInformation;
         this.configurationService = configurationService;
+        this.hivemqId = hivemqId;
     }
 
     @Override
@@ -48,5 +52,10 @@ public GeneralBootstrapServiceImpl(
         return configurationService;
     }
 
+    @Override
+    public @NotNull String getHivemqId() {
+        return hivemqId.get();
+    }
+
 
 }

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

@@ -44,6 +44,11 @@ private PersistenceBootstrapServiceImpl(
         return delegate.configurationService();
     }
 
+    @Override
+    public @NotNull String getHivemqId() {
+        return delegate.getHivemqId();
+    }
+
     @Override
     public @NotNull PersistencesService persistenceService() {
         return persistencesService;

hivemq-edge/src/main/java/com/hivemq/configuration/HivemqId.java

@@ -15,31 +15,23 @@
  */
 package com.hivemq.configuration;
 
+import com.hivemq.extension.sdk.api.annotations.NotNull;
 import org.apache.commons.lang3.RandomStringUtils;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-@Singleton
 public class HivemqId {
 
-    private String hivemqId;
+    private final @NotNull String hivemqId;
 
-    @Inject
     public HivemqId() {
         hivemqId = generateId();
     }
 
-    public String get() {
+    public @NotNull String get() {
         return hivemqId;
     }
 
     //needs to be at least 5 characters long to provide acceptable uniqueness
-    public String generateId() {
+    public @NotNull String generateId() {
         return RandomStringUtils.randomAlphanumeric(5);
     }
-
-    public void set(final String hivemqId) {
-        this.hivemqId = hivemqId;
-    }
 }