ChannelInfo, ClientInfo and MetricInfo registry service are not confi…

…gurable Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse · Nov 14, 2019 · 8d3e9ea · 8d3e9ea
1 parent 4655120
commit 8d3e9ea
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/...ore/api/src/main/java/org/eclipse/kapua/service/datastore/ChannelInfoRegistryService.java b/...ore/api/src/main/java/org/eclipse/kapua/service/datastore/ChannelInfoRegistryService.java
@@ -14,7 +14,6 @@
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.KapuaService;
-import org.eclipse.kapua.service.config.KapuaConfigurableService;
 import org.eclipse.kapua.service.datastore.model.ChannelInfo;
 import org.eclipse.kapua.service.datastore.model.ChannelInfoListResult;
 import org.eclipse.kapua.service.datastore.model.StorableId;
@@ -26,8 +25,7 @@
  *
  * @since 1.0.0
  */
-public interface ChannelInfoRegistryService extends KapuaService,
-        KapuaConfigurableService {
+public interface ChannelInfoRegistryService extends KapuaService {
 
     /**
      * Find channel information by identifier

diff --git a/...tore/api/src/main/java/org/eclipse/kapua/service/datastore/ClientInfoRegistryService.java b/...tore/api/src/main/java/org/eclipse/kapua/service/datastore/ClientInfoRegistryService.java
@@ -14,7 +14,6 @@
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.KapuaService;
-import org.eclipse.kapua.service.config.KapuaConfigurableService;
 import org.eclipse.kapua.service.datastore.model.ClientInfo;
 import org.eclipse.kapua.service.datastore.model.ClientInfoListResult;
 import org.eclipse.kapua.service.datastore.model.StorableId;
@@ -26,8 +25,7 @@
  *
  * @since 1.0.0
  */
-public interface ClientInfoRegistryService extends KapuaService,
-        KapuaConfigurableService {
+public interface ClientInfoRegistryService extends KapuaService {
 
     /**
      * Find client information by identifier

diff --git a/...tore/api/src/main/java/org/eclipse/kapua/service/datastore/MetricInfoRegistryService.java b/...tore/api/src/main/java/org/eclipse/kapua/service/datastore/MetricInfoRegistryService.java
@@ -14,7 +14,6 @@
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.KapuaService;
-import org.eclipse.kapua.service.config.KapuaConfigurableService;
 import org.eclipse.kapua.service.datastore.model.MetricInfo;
 import org.eclipse.kapua.service.datastore.model.MetricInfoListResult;
 import org.eclipse.kapua.service.datastore.model.StorableId;
@@ -27,7 +26,7 @@
  *
  * @since 1.0.0
  */
-public interface MetricInfoRegistryService extends KapuaService, KapuaConfigurableService {
+public interface MetricInfoRegistryService extends KapuaService {
 
     /**
      * Find metric information by identifier

diff --git a/...ain/java/org/eclipse/kapua/service/datastore/internal/ChannelInfoRegistryServiceImpl.java b/...ain/java/org/eclipse/kapua/service/datastore/internal/ChannelInfoRegistryServiceImpl.java
@@ -13,7 +13,7 @@
 package org.eclipse.kapua.service.datastore.internal;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.AbstractKapuaConfigurableService;
+import org.eclipse.kapua.commons.service.internal.AbstractKapuaService;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.locator.KapuaProvider;
@@ -61,7 +61,7 @@
  * @since 1.0.0
  */
 @KapuaProvider
-public class ChannelInfoRegistryServiceImpl extends AbstractKapuaConfigurableService implements ChannelInfoRegistryService {
+public class ChannelInfoRegistryServiceImpl extends AbstractKapuaService implements ChannelInfoRegistryService {
 
     private static final Logger LOG = LoggerFactory.getLogger(ChannelInfoRegistryServiceImpl.class);
 
@@ -78,7 +78,7 @@ public class ChannelInfoRegistryServiceImpl extends AbstractKapuaConfigurableSer
      * @throws ClientUnavailableException
      */
     public ChannelInfoRegistryServiceImpl() throws ClientUnavailableException {
-        super(ChannelInfoRegistryService.class.getName(), DatastoreDomains.DATASTORE_DOMAIN, DatastoreEntityManagerFactory.getInstance());
+        super(DatastoreEntityManagerFactory.getInstance());
 
         KapuaLocator locator = KapuaLocator.getInstance();
         accountService = locator.getService(AccountService.class);

diff --git a/...main/java/org/eclipse/kapua/service/datastore/internal/ClientInfoRegistryServiceImpl.java b/...main/java/org/eclipse/kapua/service/datastore/internal/ClientInfoRegistryServiceImpl.java
@@ -13,7 +13,7 @@
 package org.eclipse.kapua.service.datastore.internal;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.AbstractKapuaConfigurableService;
+import org.eclipse.kapua.commons.service.internal.AbstractKapuaService;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.locator.KapuaProvider;
@@ -61,7 +61,7 @@
  * @since 1.0.0
  */
 @KapuaProvider
-public class ClientInfoRegistryServiceImpl extends AbstractKapuaConfigurableService implements ClientInfoRegistryService {
+public class ClientInfoRegistryServiceImpl extends AbstractKapuaService implements ClientInfoRegistryService {
 
     private static final Logger LOG = LoggerFactory.getLogger(ClientInfoRegistryServiceImpl.class);
 
@@ -78,7 +78,7 @@ public class ClientInfoRegistryServiceImpl extends AbstractKapuaConfigurableServ
      * @throws ClientUnavailableException
      */
     public ClientInfoRegistryServiceImpl() throws ClientUnavailableException {
-        super(ClientInfoRegistryService.class.getName(), DatastoreDomains.DATASTORE_DOMAIN, DatastoreEntityManagerFactory.getInstance());
+        super(DatastoreEntityManagerFactory.getInstance());
 
         KapuaLocator locator = KapuaLocator.getInstance();
         accountService = locator.getService(AccountService.class);

diff --git a/...main/java/org/eclipse/kapua/service/datastore/internal/MetricInfoRegistryServiceImpl.java b/...main/java/org/eclipse/kapua/service/datastore/internal/MetricInfoRegistryServiceImpl.java
@@ -13,7 +13,7 @@
 package org.eclipse.kapua.service.datastore.internal;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.AbstractKapuaConfigurableService;
+import org.eclipse.kapua.commons.service.internal.AbstractKapuaService;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.locator.KapuaProvider;
@@ -63,7 +63,7 @@
  * @since 1.0.0
  */
 @KapuaProvider
-public class MetricInfoRegistryServiceImpl extends AbstractKapuaConfigurableService implements MetricInfoRegistryService {
+public class MetricInfoRegistryServiceImpl extends AbstractKapuaService implements MetricInfoRegistryService {
 
     private static final Logger LOG = LoggerFactory.getLogger(MetricInfoRegistryServiceImpl.class);
 
@@ -80,7 +80,7 @@ public class MetricInfoRegistryServiceImpl extends AbstractKapuaConfigurableServ
      * @throws ClientUnavailableException
      */
     public MetricInfoRegistryServiceImpl() throws ClientUnavailableException {
-        super(MetricInfoRegistryService.class.getName(), DatastoreDomains.DATASTORE_DOMAIN, DatastoreEntityManagerFactory.getInstance());
+        super(DatastoreEntityManagerFactory.getInstance());
 
         KapuaLocator locator = KapuaLocator.getInstance();
         accountService = locator.getService(AccountService.class);