move findAllTenantAdminsBuTenantId from TenantController to UserContr…

…oller, added appropriate method to AdminClient.java

doc/Programming-guide/Server-REST-APIs/swagger.json

@@ -639,6 +639,46 @@
         }
       }
     },
+    "/api/admins/{tenantId}" : {
+      "post" : {
+        "tags" : [ "User" ],
+        "summary" : "Select tenant admins by tenant id",
+        "description" : "",
+        "operationId" : "findAllTenantAdminsByTenantId",
+        "parameters" : [ {
+          "name" : "",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/UserDto"
+              }
+            }
+          },
+          "400" : {
+            "description" : "The specified tenantId is not valid"
+          },
+          "401" : {
+            "description" : "The user is not authenticated or invalid credentials were provided"
+          },
+          "403" : {
+            "description" : "The authenticated user does not have the required TENANT_ADMIN role or the Tenant ID of the editing user does not match the Tenant ID of the authenticated user"
+          },
+          "404" : {
+            "description" : "The user with the specified tenantId does not exist"
+          },
+          "500" : {
+            "description" : "An unexpected error occurred on the server side"
+          }
+        }
+      }
+    },
     "/api/application" : {
       "post" : {
         "tags" : [ "Application" ],

pom.xml

@@ -76,7 +76,6 @@ Copyright 2014-2016 CyberVision, Inc.
         <httpcomponents.version>4.3.2</httpcomponents.version>
         <jackson.version>2.4.1</jackson.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
-        <hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
         <joda-time.version>2.2</joda-time.version>
         <junit.version>4.11</junit.version>
         <embed.mongo.version>1.42</embed.mongo.version>
@@ -135,7 +134,7 @@ Copyright 2014-2016 CyberVision, Inc.
         <swagger-maven-plugin.version>3.1.3</swagger-maven-plugin.version>
         <swagger-annotations.version>1.5.9</swagger-annotations.version>
         <javax.el>2.2.4</javax.el>
-        <org.glassfish.web>2.2.4</org.glassfish.web>
+        <org.glassfish.web>2.2.6</org.glassfish.web>
         <hibernate-validator>5.2.4.Final</hibernate-validator>
     </properties>
 

server/common/admin-rest-client/src/main/java/org/kaaproject/kaa/server/common/admin/AdminClient.java

@@ -180,6 +180,14 @@ public List<TenantDto> getTenants() throws Exception {
         return entity.getBody();
     }
 
+
+    public List<UserDto> getAllTenantAdminsBytenantId(String tenantId){
+        ParameterizedTypeReference<List<UserDto>> typeRef = new ParameterizedTypeReference<List<UserDto>>() {
+        };
+        ResponseEntity<List<UserDto>> entity = restTemplate.exchange(restTemplate.getUrl() + "admins/" + tenantId, HttpMethod.GET, null, typeRef);
+        return entity.getBody();
+    }
+
     public TenantDto getTenant(String userId) throws Exception {
         return restTemplate.getForObject(restTemplate.getUrl() + "tenant/" + userId, TenantDto.class);
     }

server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java

@@ -147,7 +147,7 @@ protected void onResult(UserDto result) {
 
     public void loadAllTenantAdminsByTenantId(String tenantId,  final AsyncCallback<List<UserDto>> callback) {
 
-            tenantRpcService.findAllTenantAdminsByTenantId(tenantId, new DataCallback<List<UserDto>>(
+            userRpcService.findAllTenantAdminsByTenantId(tenantId, new DataCallback<List<UserDto>>(
                     callback) {
                 @Override
                 protected void onResult(List<UserDto> result) {

server/node/src/main/java/org/kaaproject/kaa/server/admin/controller/AbstractAdminController.java

@@ -36,6 +36,7 @@
 import org.kaaproject.kaa.server.admin.shared.services.TenantService;
 import org.kaaproject.kaa.server.admin.shared.services.UserService;
 import org.kaaproject.kaa.server.admin.shared.services.VerifierService;
+import org.kaaproject.kaa.server.control.service.ControlService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,6 +157,11 @@ public abstract class AbstractAdminController {
      */
     @Autowired
     UserFacade userFacade;
+    /**
+     * The control service.
+     */
+    @Autowired
+    ControlService controlService;
 
     /**
      * The password encoder.

server/node/src/main/java/org/kaaproject/kaa/server/admin/controller/UserController.java

@@ -271,4 +271,23 @@ public void deleteUser(
             @RequestParam(value = "userId") String userId) throws KaaAdminServiceException {
         userService.deleteUser(userId);
     }
+
+
+    @ApiOperation(value = "Select tenant admins by tenant id")
+    @ApiResponses(value = {
+            @ApiResponse(code = 400, message = "The specified tenantId is not valid"),
+            @ApiResponse(code = 401, message = "The user is not authenticated or invalid credentials were provided"),
+            @ApiResponse(code = 403, message = "The authenticated user does not have the required TENANT_ADMIN role or the Tenant ID of the editing user " +
+                    "does not match the Tenant ID of the authenticated user"),
+            @ApiResponse(code = 404, message = "The user with the specified tenantId does not exist"),
+            @ApiResponse(code = 500, message = "An unexpected error occurred on the server side")})
+    @RequestMapping(value = "admins/{tenantId}", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public List<UserDto> findAllTenantAdminsByTenantId(
+            @PathVariable String tenantId) throws KaaAdminServiceException {
+       return  userService.findAllTenantAdminsByTenantId(tenantId);
+    }
+
+
+
 }

server/node/src/main/java/org/kaaproject/kaa/server/admin/services/TenantServiceImpl.java

@@ -83,20 +83,5 @@ public void deleteTenant(String tenantId) throws KaaAdminServiceException {
         }
     }
 
-    @Override
-    public List<org.kaaproject.kaa.common.dto.admin.UserDto> findAllTenantAdminsByTenantId(String tenantId) throws KaaAdminServiceException {
-        checkAuthority(KaaAuthorityDto.KAA_ADMIN);
-        List<org.kaaproject.kaa.common.dto.admin.UserDto> tenantAdminList=new ArrayList<>();
-        try {
-            List<UserDto> userDtoList=controlService.findAllTenantAdminsByTenantId(tenantId);
-            if(userDtoList!=null){
-                for(UserDto userDto:userDtoList)
-                    tenantAdminList.add(toUser(userDto));
-            }
-        } catch (Exception e) {
-            throw Utils.handleException(e);
-        }
-        return tenantAdminList;
-    }
 
 }

server/node/src/main/java/org/kaaproject/kaa/server/admin/services/UserServiceImpl.java

@@ -145,6 +145,23 @@ public void deleteUser(String userId) throws KaaAdminServiceException {
         }
     }
 
+    @Override
+    public List<org.kaaproject.kaa.common.dto.admin.UserDto> findAllTenantAdminsByTenantId(String tenantId) throws KaaAdminServiceException {
+        checkAuthority(KaaAuthorityDto.KAA_ADMIN);
+        List<org.kaaproject.kaa.common.dto.admin.UserDto> tenantAdminList=new ArrayList<>();
+        try {
+            List<UserDto> userDtoList=controlService.findAllTenantAdminsByTenantId(tenantId);
+            if(userDtoList!=null){
+                for(UserDto userDto:userDtoList)
+                    tenantAdminList.add(toUser(userDto));
+            }
+        } catch (Exception e) {
+            throw Utils.handleException(e);
+        }
+        return tenantAdminList;
+    }
+
+
     private void checkUserProfile(UserProfileUpdateDto userProfileUpdateDto) throws KaaAdminServiceException {
         if (isEmpty(userProfileUpdateDto.getFirstName())) {
             throw new IllegalArgumentException("First name is not valid.");

server/node/src/main/java/org/kaaproject/kaa/server/admin/shared/services/TenantService.java

@@ -34,5 +34,4 @@ public interface TenantService extends RemoteService {
 
     void deleteTenant(String tenantId) throws KaaAdminServiceException;
 
-    List<UserDto> findAllTenantAdminsByTenantId(String id) throws KaaAdminServiceException;
 }

server/node/src/main/java/org/kaaproject/kaa/server/admin/shared/services/UserService.java

@@ -37,4 +37,6 @@ public interface UserService extends RemoteService {
     UserDto editUser(UserDto user) throws KaaAdminServiceException;
 
     void deleteUser(String userId) throws KaaAdminServiceException;
+
+    List<UserDto> findAllTenantAdminsByTenantId(String id) throws KaaAdminServiceException;
 }