Renamed KapuaDeviceRegistrySettings to DeviceRegistrySettings and its…

… SettingKeys Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Feb 3, 2023 · f77502e · f77502e
1 parent 21ab5e6
commit f77502e
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 35 deletions.
diff --git a/...istry/KapuaDeviceRegistrySettingKeys.java → ...e/registry/DeviceRegistrySettingKeys.java b/...istry/KapuaDeviceRegistrySettingKeys.java → ...e/registry/DeviceRegistrySettingKeys.java
@@ -15,39 +15,42 @@
 import org.eclipse.kapua.commons.setting.SettingKey;
 
 /**
- * Available settings key for user service
- *
- * @since 1.0
+ * {@link SettingKey}s for {@link DeviceRegistrySettings}.
  *
+ * @since 1.0.0
  */
-public enum KapuaDeviceRegistrySettingKeys implements SettingKey {
+public enum DeviceRegistrySettingKeys implements SettingKey {
 
     /**
      * The key value in the configuration resources.
+     *
+     * @since 1.0.0
+     */
+    DEVICE_REGISTRY_KEY("device.registry.key"),
+
+    /**
+     * @since 1.0.0
      */
-    DEVICE_REGISTRY_KEY("device_registry.key"),
-    DEVICE_EVENT_ADDRESS("device.eventAddress");
+    DEVICE_REGISTRY_EVENT_ADDRESS("device.registry.event.address");
 
-    private String key;
+    private final String key;
 
     /**
      * Set up the {@code enum} with the key value provided
      *
-     * @param key
-     *            The value mapped by this {@link Enum} value
-     *
-     * @since 1.0
+     * @param key The value mapped by this {@link Enum} value
+     * @since 1.0.0
      */
-    private KapuaDeviceRegistrySettingKeys(String key) {
+    DeviceRegistrySettingKeys(String key) {
         this.key = key;
     }
 
     /**
-     * Gets the key for this {@link KapuaDeviceRegistrySettingKeys}
+     * Gets the key for this {@link DeviceRegistrySettingKeys}
      *
      * @since 1.0.0
-     *
      */
+    @Override
     public String key() {
         return key;
     }

diff --git a/...registry/KapuaDeviceRegistrySettings.java → ...vice/registry/DeviceRegistrySettings.java b/...registry/KapuaDeviceRegistrySettings.java → ...vice/registry/DeviceRegistrySettings.java
@@ -12,27 +12,36 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry;
 
+import org.eclipse.kapua.commons.setting.AbstractBaseKapuaSetting;
 import org.eclipse.kapua.commons.setting.AbstractKapuaSetting;
 
-public class KapuaDeviceRegistrySettings extends AbstractKapuaSetting<KapuaDeviceRegistrySettingKeys> {
+/**
+ * {@link AbstractBaseKapuaSetting} for `kapua-device-registry-internal` module.
+ *
+ * @since 1.0.0
+ */
+public class DeviceRegistrySettings extends AbstractKapuaSetting<DeviceRegistrySettingKeys> {
 
-    private static final String DEVICE_REGISTRY_SETTING_RESOURCE = "kapua-device-registry-setting.properties";
+    private static final String DEVICE_REGISTRY_SETTING_RESOURCE = "device-registry-setting.properties";
 
-    private static final KapuaDeviceRegistrySettings INSTANCE = new KapuaDeviceRegistrySettings();
+    private static final DeviceRegistrySettings INSTANCE = new DeviceRegistrySettings();
 
     /**
-     * Construct a new device registry setting reading settings from {@link KapuaDeviceRegistrySettings#DEVICE_REGISTRY_SETTING_RESOURCE}
+     * Constructor.
+     *
+     * @since 1.0.0
      */
-    private KapuaDeviceRegistrySettings() {
+    private DeviceRegistrySettings() {
         super(DEVICE_REGISTRY_SETTING_RESOURCE);
     }
 
     /**
-     * Return the device registry setting instance (singleton)
+     * Gets the {@link DeviceRegistrySettings} singleton instance.
      *
-     * @return
+     * @return The {@link DeviceRegistrySettings} instance.
+     * @since 1.0.0
      */
-    public static KapuaDeviceRegistrySettings getInstance() {
+    public static DeviceRegistrySettings getInstance() {
         return INSTANCE;
     }
 

diff --git a/...internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceServiceModule.java b/...internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceServiceModule.java
@@ -12,19 +12,17 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
 import org.eclipse.kapua.commons.event.ServiceEventClientConfiguration;
 import org.eclipse.kapua.commons.event.ServiceEventModule;
 import org.eclipse.kapua.commons.event.ServiceEventModuleConfiguration;
 import org.eclipse.kapua.commons.event.ServiceInspector;
 import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionService;
 import org.eclipse.kapua.service.device.registry.internal.DeviceEntityManagerFactory;
 
-//@KapuaProvider
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
 public class DeviceServiceModule extends ServiceEventModule {
 
     @Inject
@@ -34,14 +32,17 @@ public class DeviceServiceModule extends ServiceEventModule {
 
     @Override
     protected ServiceEventModuleConfiguration initializeConfiguration() {
-        KapuaDeviceRegistrySettings kds = KapuaDeviceRegistrySettings.getInstance();
-        List<ServiceEventClientConfiguration> selc = new ArrayList<>();
-        selc.addAll(ServiceInspector.getEventBusClients(deviceRegistryService, DeviceRegistryService.class));
-        selc.addAll(ServiceInspector.getEventBusClients(deviceConnectionService, DeviceConnectionService.class));
+        DeviceRegistrySettings deviceRegistrySettings = DeviceRegistrySettings.getInstance();
+
+        List<ServiceEventClientConfiguration> serviceEventListenerConfigurations = new ArrayList<>();
+        serviceEventListenerConfigurations.addAll(ServiceInspector.getEventBusClients(deviceRegistryService, DeviceRegistryService.class));
+        serviceEventListenerConfigurations.addAll(ServiceInspector.getEventBusClients(deviceConnectionService, DeviceConnectionService.class));
+
         return new ServiceEventModuleConfiguration(
-                kds.getString(KapuaDeviceRegistrySettingKeys.DEVICE_EVENT_ADDRESS),
+                deviceRegistrySettings.getString(DeviceRegistrySettingKeys.DEVICE_REGISTRY_EVENT_ADDRESS),
                 DeviceEntityManagerFactory.instance(),
-                selc.toArray(new ServiceEventClientConfiguration[0]));
+                serviceEventListenerConfigurations.toArray(new ServiceEventClientConfiguration[0])
+        );
     }
 
 }
diff --git a/.../kapua-device-registry-setting.properties → ...ources/device-registry-setting.properties b/.../kapua-device-registry-setting.properties → ...ources/device-registry-setting.properties
@@ -11,4 +11,6 @@
 #     Eurotech - initial API and implementation
 #
 ###############################################################################
-device.eventAddress=device
+device.registry.key=device.registry
+
+device.registry.eventAddress=device