moved beans to commons
This commit is contained in:
parent
5ad8978d15
commit
6ccc1cd9ba
|
@ -1,4 +1,4 @@
|
||||||
package org.gcube.service.rest;
|
package org.gcube.service.idm.common.beans;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.gcube.service.rest;
|
package org.gcube.service.idm.common.beans;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.gcube.service.rest;
|
package org.gcube.service.idm.common.beans;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Response bean
|
* Response bean
|
|
@ -1,5 +1,7 @@
|
||||||
package org.gcube.service.idm.mappers;
|
package org.gcube.service.idm.mappers;
|
||||||
|
|
||||||
|
import org.gcube.service.idm.common.beans.ResponseBean;
|
||||||
|
|
||||||
import jakarta.ws.rs.ForbiddenException;
|
import jakarta.ws.rs.ForbiddenException;
|
||||||
import jakarta.ws.rs.WebApplicationException;
|
import jakarta.ws.rs.WebApplicationException;
|
||||||
import jakarta.ws.rs.core.MediaType;
|
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.ExceptionMapper;
|
||||||
import jakarta.ws.rs.ext.Provider;
|
import jakarta.ws.rs.ext.Provider;
|
||||||
|
|
||||||
import org.gcube.service.rest.ResponseBean;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Alfredo Oliviero (ISTI - CNR)
|
* @author Alfredo Oliviero (ISTI - CNR)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package org.gcube.service.idm.mappers;
|
package org.gcube.service.idm.mappers;
|
||||||
|
|
||||||
|
import org.gcube.service.idm.common.beans.ResponseBean;
|
||||||
|
|
||||||
import jakarta.ws.rs.WebApplicationException;
|
import jakarta.ws.rs.WebApplicationException;
|
||||||
import jakarta.ws.rs.core.MediaType;
|
import jakarta.ws.rs.core.MediaType;
|
||||||
import jakarta.ws.rs.core.Response;
|
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.ExceptionMapper;
|
||||||
import jakarta.ws.rs.ext.Provider;
|
import jakarta.ws.rs.ext.Provider;
|
||||||
|
|
||||||
import org.gcube.service.rest.ResponseBean;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -6,6 +6,8 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.gcube.service.idm.IdMManager;
|
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.AdminKeycloakController;
|
||||||
import org.gcube.service.idm.controller.AuthController;
|
import org.gcube.service.idm.controller.AuthController;
|
||||||
import org.gcube.service.idm.controller.KCClientsController;
|
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.keycloack.KkClientFactory;
|
||||||
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
||||||
import org.gcube.service.rest.ErrorMessages;
|
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.gcube.smartgears.annotations.ManagedBy;
|
||||||
import org.keycloak.admin.client.resource.ClientResource;
|
import org.keycloak.admin.client.resource.ClientResource;
|
||||||
import org.keycloak.admin.client.resource.GroupResource;
|
import org.keycloak.admin.client.resource.GroupResource;
|
||||||
|
|
|
@ -3,11 +3,11 @@ package org.gcube.service.idm.rest;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
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.AuthController;
|
||||||
import org.gcube.service.idm.controller.JWTController;
|
import org.gcube.service.idm.controller.JWTController;
|
||||||
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
||||||
import org.gcube.service.rest.ErrorMessages;
|
import org.gcube.service.rest.ErrorMessages;
|
||||||
import org.gcube.service.rest.ResponseBean;
|
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
|
|
@ -4,13 +4,13 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.gcube.service.idm.IdMManager;
|
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.KCRolesController;
|
||||||
import org.gcube.service.idm.controller.KCUserController;
|
import org.gcube.service.idm.controller.KCUserController;
|
||||||
import org.gcube.service.idm.keycloack.KkClientFactory;
|
import org.gcube.service.idm.keycloack.KkClientFactory;
|
||||||
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
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.gcube.smartgears.annotations.ManagedBy;
|
||||||
import org.keycloak.admin.client.resource.ClientResource;
|
import org.keycloak.admin.client.resource.ClientResource;
|
||||||
import org.keycloak.admin.client.resource.RoleResource;
|
import org.keycloak.admin.client.resource.RoleResource;
|
||||||
|
|
|
@ -4,9 +4,9 @@ import org.gcube.common.security.Owner;
|
||||||
import org.gcube.common.security.providers.SecretManagerProvider;
|
import org.gcube.common.security.providers.SecretManagerProvider;
|
||||||
import org.gcube.common.security.secrets.Secret;
|
import org.gcube.common.security.secrets.Secret;
|
||||||
import org.gcube.service.idm.IdMManager;
|
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.idm.controller.LiferayProfileClient;
|
||||||
import org.gcube.service.rest.ErrorMessages;
|
import org.gcube.service.rest.ErrorMessages;
|
||||||
import org.gcube.service.rest.ResponseBeanMap;
|
|
||||||
import org.gcube.smartgears.annotations.ManagedBy;
|
import org.gcube.smartgears.annotations.ManagedBy;
|
||||||
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
|
@ -9,13 +9,13 @@ import org.gcube.common.security.Owner;
|
||||||
import org.gcube.common.security.providers.SecretManagerProvider;
|
import org.gcube.common.security.providers.SecretManagerProvider;
|
||||||
import org.gcube.common.security.secrets.Secret;
|
import org.gcube.common.security.secrets.Secret;
|
||||||
import org.gcube.service.idm.IdMManager;
|
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.AuthController;
|
||||||
import org.gcube.service.idm.controller.KCUserController;
|
import org.gcube.service.idm.controller.KCUserController;
|
||||||
import org.gcube.service.idm.controller.LiferayProfileClient;
|
import org.gcube.service.idm.controller.LiferayProfileClient;
|
||||||
import org.gcube.service.idm.keycloack.KkClientFactory;
|
import org.gcube.service.idm.keycloack.KkClientFactory;
|
||||||
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
||||||
import org.gcube.service.rest.ErrorMessages;
|
import org.gcube.service.rest.ErrorMessages;
|
||||||
import org.gcube.service.rest.ResponseBean;
|
|
||||||
import org.gcube.smartgears.annotations.ManagedBy;
|
import org.gcube.smartgears.annotations.ManagedBy;
|
||||||
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
||||||
import org.keycloak.admin.client.resource.RealmResource;
|
import org.keycloak.admin.client.resource.RealmResource;
|
||||||
|
|
|
@ -8,6 +8,9 @@ import org.gcube.common.security.Owner;
|
||||||
import org.gcube.common.security.providers.SecretManagerProvider;
|
import org.gcube.common.security.providers.SecretManagerProvider;
|
||||||
import org.gcube.common.security.secrets.Secret;
|
import org.gcube.common.security.secrets.Secret;
|
||||||
import org.gcube.service.idm.IdMManager;
|
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.AuthController;
|
||||||
import org.gcube.service.idm.controller.JWTController;
|
import org.gcube.service.idm.controller.JWTController;
|
||||||
import org.gcube.service.idm.controller.KCUserController;
|
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.keycloack.KkClientFactory;
|
||||||
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
import org.gcube.service.idm.serializers.IdmObjectSerializator;
|
||||||
import org.gcube.service.rest.ErrorMessages;
|
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.smartgears.annotations.ManagedBy;
|
||||||
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
||||||
import org.keycloak.admin.client.resource.RealmResource;
|
import org.keycloak.admin.client.resource.RealmResource;
|
||||||
|
@ -72,7 +72,7 @@ import jakarta.ws.rs.core.Response;
|
||||||
public class UserAPI {
|
public class UserAPI {
|
||||||
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserAPI.class);
|
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserAPI.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns infos about the authenticated user
|
* Returns infos about the authenticated user
|
||||||
*
|
*
|
||||||
* <ul>
|
* <ul>
|
||||||
|
|
Loading…
Reference in New Issue