change findUserEndConfigurationByEndpointKeyHash() method name to fin…

…dEndpointConfigurationByEndpointKeyHash()
kaaproject · Sep 7, 2016 · 92df4a3 · 92df4a3
1 parent 6cfe4c6
commit 92df4a3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/ProfileService.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/ProfileService.java
@@ -19,9 +19,9 @@
 
 import java.util.Collection;
 import java.util.List;
-
 import org.kaaproject.kaa.common.dto.*;
 
+
 /**
  * The interface Profile service.
  */

diff --git a/...ode/src/main/java/org/kaaproject/kaa/server/admin/controller/ConfigurationController.java b/...ode/src/main/java/org/kaaproject/kaa/server/admin/controller/ConfigurationController.java
@@ -406,7 +406,7 @@ public EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppToke
     public String findEndpointConfigurationByEndpointKeyHash(
         @ApiParam(name = "endpointKeyHash", value = "A unique identifier of the endpoint", required = true)
         @PathVariable String endpointKeyHash) throws KaaAdminServiceException {
-                return  configurationService.findUserEndConfigurationByEndpointKeyHash(endpointKeyHash);
+                return  configurationService.findEndpointConfigurationByEndpointKeyHash(endpointKeyHash);
     }
 
         }
diff --git a/...node/src/main/java/org/kaaproject/kaa/server/admin/services/ConfigurationServiceImpl.java b/...node/src/main/java/org/kaaproject/kaa/server/admin/services/ConfigurationServiceImpl.java
@@ -423,9 +423,9 @@ public ConfigurationSchemaViewDto createConfigurationSchemaFormCtlSchema(CtlSche
     }
 
     @Override
-    public String findUserEndConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException {
+    public String findEndpointConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException {
               checkAuthority(KaaAuthorityDto.TENANT_DEVELOPER, KaaAuthorityDto.TENANT_USER);
-               return controlService.findUserConfigurationByEndpointKeyHash(endpointKeyHash);
+               return controlService.findEndpointConfigurationByEndpointKeyHash(endpointKeyHash);
             }
 
 

diff --git a/...e/src/main/java/org/kaaproject/kaa/server/admin/shared/services/ConfigurationService.java b/...e/src/main/java/org/kaaproject/kaa/server/admin/shared/services/ConfigurationService.java
@@ -100,7 +100,7 @@ public interface ConfigurationService extends RemoteService {
 
     ConfigurationSchemaViewDto createConfigurationSchemaFormCtlSchema(CtlSchemaFormDto ctlSchemaForm) throws KaaAdminServiceException;
 
-    String findUserEndConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException;
+    String findEndpointConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException;
 
     EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppTokenAndSchemaVersion(String externalUId, String appToken, Integer schemaVersion) throws KaaAdminServiceException;
 

diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
@@ -1774,5 +1774,5 @@ CTLSchemaDto getCTLSchemaByFqnVersionTenantIdAndApplicationId(String fqn, int ve
 
     EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppTokenAndSchemaVersion(String userId, String appToken, Integer schemaVersion,String tenantId);
 
-    String findUserConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException;
+    String findEndpointConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException;
 }
diff --git a/...r/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java b/...r/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java
@@ -2370,7 +2370,7 @@ public EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppToke
     }
 
     @Override
-    public String findUserConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException {
+    public String findEndpointConfigurationByEndpointKeyHash(String endpointKeyHash) throws KaaAdminServiceException {
         EndpointProfileDto endpointProfileDto = profileService.findEndpointProfileByEndpointKeyHash(endpointKeyHash);
 
                        ConfigurationDto configuration = configurationService.findConfigurationByAppIdAndVersion(endpointProfileDto.getApplicationId()