From 6ccc1cd9bab51d200ed05972566872127cabd635 Mon Sep 17 00:00:00 2001
From: Alfredo Oliviero <alfredo.oliviero@isti.cnr.it>
Date: Mon, 22 Apr 2024 18:03:23 +0200
Subject: [PATCH] moved beans to commons

---
 .../service/{rest => idm/common/beans}/ResponseBean.java  | 2 +-
 .../{rest => idm/common/beans}/ResponseBeanMap.java       | 2 +-
 .../{rest => idm/common/beans}/ResponseBeanPaginated.java | 2 +-
 .../service/idm/mappers/ForbiddenExceptionMapper.java     | 4 ++--
 .../org/gcube/service/idm/mappers/IDMExceptionMapper.java | 4 ++--
 src/main/java/org/gcube/service/idm/rest/ClientsAPI.java  | 4 ++--
 src/main/java/org/gcube/service/idm/rest/JwtAPI.java      | 2 +-
 src/main/java/org/gcube/service/idm/rest/RolesAPI.java    | 6 +++---
 .../java/org/gcube/service/idm/rest/SocialPeopleAPI.java  | 2 +-
 .../java/org/gcube/service/idm/rest/SocialUsersAPI.java   | 2 +-
 src/main/java/org/gcube/service/idm/rest/UserAPI.java     | 8 ++++----
 11 files changed, 19 insertions(+), 19 deletions(-)
 rename src/main/java/org/gcube/service/{rest => idm/common/beans}/ResponseBean.java (97%)
 rename src/main/java/org/gcube/service/{rest => idm/common/beans}/ResponseBeanMap.java (97%)
 rename src/main/java/org/gcube/service/{rest => idm/common/beans}/ResponseBeanPaginated.java (97%)

diff --git a/src/main/java/org/gcube/service/rest/ResponseBean.java b/src/main/java/org/gcube/service/idm/common/beans/ResponseBean.java
similarity index 97%
rename from src/main/java/org/gcube/service/rest/ResponseBean.java
rename to src/main/java/org/gcube/service/idm/common/beans/ResponseBean.java
index 8565c53..7a51bd8 100644
--- a/src/main/java/org/gcube/service/rest/ResponseBean.java
+++ b/src/main/java/org/gcube/service/idm/common/beans/ResponseBean.java
@@ -1,4 +1,4 @@
-package org.gcube.service.rest;
+package org.gcube.service.idm.common.beans;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/gcube/service/rest/ResponseBeanMap.java b/src/main/java/org/gcube/service/idm/common/beans/ResponseBeanMap.java
similarity index 97%
rename from src/main/java/org/gcube/service/rest/ResponseBeanMap.java
rename to src/main/java/org/gcube/service/idm/common/beans/ResponseBeanMap.java
index 0db7f69..c303c2c 100644
--- a/src/main/java/org/gcube/service/rest/ResponseBeanMap.java
+++ b/src/main/java/org/gcube/service/idm/common/beans/ResponseBeanMap.java
@@ -1,4 +1,4 @@
-package org.gcube.service.rest;
+package org.gcube.service.idm.common.beans;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/gcube/service/rest/ResponseBeanPaginated.java b/src/main/java/org/gcube/service/idm/common/beans/ResponseBeanPaginated.java
similarity index 97%
rename from src/main/java/org/gcube/service/rest/ResponseBeanPaginated.java
rename to src/main/java/org/gcube/service/idm/common/beans/ResponseBeanPaginated.java
index eee23a7..f9fc286 100644
--- a/src/main/java/org/gcube/service/rest/ResponseBeanPaginated.java
+++ b/src/main/java/org/gcube/service/idm/common/beans/ResponseBeanPaginated.java
@@ -1,4 +1,4 @@
-package org.gcube.service.rest;
+package org.gcube.service.idm.common.beans;
 
 /**
  * Response bean
diff --git a/src/main/java/org/gcube/service/idm/mappers/ForbiddenExceptionMapper.java b/src/main/java/org/gcube/service/idm/mappers/ForbiddenExceptionMapper.java
index 6cfa503..b59b06a 100644
--- a/src/main/java/org/gcube/service/idm/mappers/ForbiddenExceptionMapper.java
+++ b/src/main/java/org/gcube/service/idm/mappers/ForbiddenExceptionMapper.java
@@ -1,5 +1,7 @@
 package org.gcube.service.idm.mappers;
 
+import org.gcube.service.idm.common.beans.ResponseBean;
+
 import jakarta.ws.rs.ForbiddenException;
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
@@ -8,8 +10,6 @@ import jakarta.ws.rs.core.Response.Status;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
-import org.gcube.service.rest.ResponseBean;
-
 /**
  * @author Alfredo Oliviero (ISTI - CNR)
  */
diff --git a/src/main/java/org/gcube/service/idm/mappers/IDMExceptionMapper.java b/src/main/java/org/gcube/service/idm/mappers/IDMExceptionMapper.java
index df3f521..89de21e 100644
--- a/src/main/java/org/gcube/service/idm/mappers/IDMExceptionMapper.java
+++ b/src/main/java/org/gcube/service/idm/mappers/IDMExceptionMapper.java
@@ -1,5 +1,7 @@
 package org.gcube.service.idm.mappers;
 
+import org.gcube.service.idm.common.beans.ResponseBean;
+
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
@@ -7,8 +9,6 @@ import jakarta.ws.rs.core.Response.Status;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
-import org.gcube.service.rest.ResponseBean;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/main/java/org/gcube/service/idm/rest/ClientsAPI.java b/src/main/java/org/gcube/service/idm/rest/ClientsAPI.java
index 0d597dc..224185d 100644
--- a/src/main/java/org/gcube/service/idm/rest/ClientsAPI.java
+++ b/src/main/java/org/gcube/service/idm/rest/ClientsAPI.java
@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Set;
 
 import org.gcube.service.idm.IdMManager;
+import org.gcube.service.idm.common.beans.ResponseBean;
+import org.gcube.service.idm.common.beans.ResponseBeanMap;
 import org.gcube.service.idm.controller.AdminKeycloakController;
 import org.gcube.service.idm.controller.AuthController;
 import org.gcube.service.idm.controller.KCClientsController;
@@ -15,8 +17,6 @@ import org.gcube.service.idm.controller.KCUserController;
 import org.gcube.service.idm.keycloack.KkClientFactory;
 import org.gcube.service.idm.serializers.IdmObjectSerializator;
 import org.gcube.service.rest.ErrorMessages;
-import org.gcube.service.rest.ResponseBean;
-import org.gcube.service.rest.ResponseBeanMap;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.keycloak.admin.client.resource.ClientResource;
 import org.keycloak.admin.client.resource.GroupResource;
diff --git a/src/main/java/org/gcube/service/idm/rest/JwtAPI.java b/src/main/java/org/gcube/service/idm/rest/JwtAPI.java
index 0c00dff..b3f7168 100644
--- a/src/main/java/org/gcube/service/idm/rest/JwtAPI.java
+++ b/src/main/java/org/gcube/service/idm/rest/JwtAPI.java
@@ -3,11 +3,11 @@ package org.gcube.service.idm.rest;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.gcube.service.idm.common.beans.ResponseBean;
 import org.gcube.service.idm.controller.AuthController;
 import org.gcube.service.idm.controller.JWTController;
 import org.gcube.service.idm.serializers.IdmObjectSerializator;
 import org.gcube.service.rest.ErrorMessages;
-import org.gcube.service.rest.ResponseBean;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/main/java/org/gcube/service/idm/rest/RolesAPI.java b/src/main/java/org/gcube/service/idm/rest/RolesAPI.java
index aa60c2a..7f70b6d 100644
--- a/src/main/java/org/gcube/service/idm/rest/RolesAPI.java
+++ b/src/main/java/org/gcube/service/idm/rest/RolesAPI.java
@@ -4,13 +4,13 @@ import java.util.List;
 import java.util.Set;
 
 import org.gcube.service.idm.IdMManager;
+import org.gcube.service.idm.common.beans.ResponseBean;
+import org.gcube.service.idm.common.beans.ResponseBeanMap;
+import org.gcube.service.idm.common.beans.ResponseBeanPaginated;
 import org.gcube.service.idm.controller.KCRolesController;
 import org.gcube.service.idm.controller.KCUserController;
 import org.gcube.service.idm.keycloack.KkClientFactory;
 import org.gcube.service.idm.serializers.IdmObjectSerializator;
-import org.gcube.service.rest.ResponseBean;
-import org.gcube.service.rest.ResponseBeanMap;
-import org.gcube.service.rest.ResponseBeanPaginated;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.keycloak.admin.client.resource.ClientResource;
 import org.keycloak.admin.client.resource.RoleResource;
diff --git a/src/main/java/org/gcube/service/idm/rest/SocialPeopleAPI.java b/src/main/java/org/gcube/service/idm/rest/SocialPeopleAPI.java
index 9ff2c23..68f3f3d 100644
--- a/src/main/java/org/gcube/service/idm/rest/SocialPeopleAPI.java
+++ b/src/main/java/org/gcube/service/idm/rest/SocialPeopleAPI.java
@@ -4,9 +4,9 @@ import org.gcube.common.security.Owner;
 import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.service.idm.IdMManager;
+import org.gcube.service.idm.common.beans.ResponseBeanMap;
 import org.gcube.service.idm.controller.LiferayProfileClient;
 import org.gcube.service.rest.ErrorMessages;
-import org.gcube.service.rest.ResponseBeanMap;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/service/idm/rest/SocialUsersAPI.java b/src/main/java/org/gcube/service/idm/rest/SocialUsersAPI.java
index 49a8c53..5ce4380 100644
--- a/src/main/java/org/gcube/service/idm/rest/SocialUsersAPI.java
+++ b/src/main/java/org/gcube/service/idm/rest/SocialUsersAPI.java
@@ -9,13 +9,13 @@ import org.gcube.common.security.Owner;
 import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.service.idm.IdMManager;
+import org.gcube.service.idm.common.beans.ResponseBean;
 import org.gcube.service.idm.controller.AuthController;
 import org.gcube.service.idm.controller.KCUserController;
 import org.gcube.service.idm.controller.LiferayProfileClient;
 import org.gcube.service.idm.keycloack.KkClientFactory;
 import org.gcube.service.idm.serializers.IdmObjectSerializator;
 import org.gcube.service.rest.ErrorMessages;
-import org.gcube.service.rest.ResponseBean;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 import org.keycloak.admin.client.resource.RealmResource;
diff --git a/src/main/java/org/gcube/service/idm/rest/UserAPI.java b/src/main/java/org/gcube/service/idm/rest/UserAPI.java
index 8a26d1b..e8affa0 100644
--- a/src/main/java/org/gcube/service/idm/rest/UserAPI.java
+++ b/src/main/java/org/gcube/service/idm/rest/UserAPI.java
@@ -8,6 +8,9 @@ import org.gcube.common.security.Owner;
 import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.service.idm.IdMManager;
+import org.gcube.service.idm.common.beans.ResponseBean;
+import org.gcube.service.idm.common.beans.ResponseBeanMap;
+import org.gcube.service.idm.common.beans.ResponseBeanPaginated;
 import org.gcube.service.idm.controller.AuthController;
 import org.gcube.service.idm.controller.JWTController;
 import org.gcube.service.idm.controller.KCUserController;
@@ -15,9 +18,6 @@ import org.gcube.service.idm.controller.LiferayProfileClient;
 import org.gcube.service.idm.keycloack.KkClientFactory;
 import org.gcube.service.idm.serializers.IdmObjectSerializator;
 import org.gcube.service.rest.ErrorMessages;
-import org.gcube.service.rest.ResponseBean;
-import org.gcube.service.rest.ResponseBeanMap;
-import org.gcube.service.rest.ResponseBeanPaginated;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 import org.keycloak.admin.client.resource.RealmResource;
@@ -72,7 +72,7 @@ import jakarta.ws.rs.core.Response;
 public class UserAPI {
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserAPI.class);
 
-    /**
+    /** 
      * Returns infos about the authenticated user
      * 
      * <ul>