diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java index c62133e..ad5db3f 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java @@ -1,10 +1,7 @@ package org.gcube.application.cms.plugins.implementations; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; +import lombok.*; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.accounting.User; @@ -16,18 +13,21 @@ import java.util.HashMap; import java.util.List; @Slf4j +@ToString public class RoleManager { HashMap accessMap=new HashMap<>(); public RoleManager(HandlerDeclaration config) throws ConfigurationException { + log.debug("Instantiating for configuration {}",config); List l =config.getConfiguration().get("step_access", List.class); if(l==null|| l.isEmpty()) throw new ConfigurationException("Missing Role management in UCD"); for (Object o : l) { StepAccess a= Serialization.convert(o, StepAccess.class); accessMap.put(a.getStepId(),a); } + log.debug("Access Map is {}",accessMap); } public boolean canInvokeStep(String stepID,User u) throws ConfigurationException { @@ -44,6 +44,7 @@ public class RoleManager { } @XmlRootElement + @NoArgsConstructor @AllArgsConstructor @Getter @Setter diff --git a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java b/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java index fa499a0..3bc4302 100644 --- a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java +++ b/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java @@ -1,6 +1,6 @@ package org.gcube.application.cms.plugins; -public class SimpleLifecycleTests{ +public class SimpleLifecycleTests { // NB cannot use test commons, need to separate modules // extends diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/PluginsTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/PluginsTests.java deleted file mode 100644 index ddb7c18..0000000 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/PluginsTests.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.gcube.application.geoportal.service; - -public class PluginsTests { - - - -} diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java index 08d75ea..274ea2a 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java @@ -69,4 +69,6 @@ public class UCDTests extends BasicServiceTestUnit{ MediaType.APPLICATION_JSON)), UseCaseDescriptor.class); } + + } diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java new file mode 100644 index 0000000..d3566f2 --- /dev/null +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java @@ -0,0 +1,38 @@ +package org.gcube.application.geoportal.service.framework.lifecycleManagers; + +import lombok.extern.slf4j.Slf4j; +import org.gcube.application.cms.plugins.implementations.RoleManager; +import org.gcube.application.cms.tests.TestProfiles; +import org.gcube.application.geoportal.common.model.document.accounting.User; +import org.gcube.application.geoportal.common.model.plugins.LifecycleManagerDescriptor; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; +import org.junit.Test; + +import java.util.Collection; +import java.util.List; + +@Slf4j +public class RoleManagerTests { + + @Test + public void testRead(){ + TestProfiles.profiles.forEach((s,u)->{ + System.out.println("Checking "+s); + List descriptors =u.getHandlersByType(LifecycleManagerDescriptor.LIFECYCLE_MANAGER_TYPE); + descriptors.stream().forEach(h->{ + RoleManager r = null; + try { + System.out.println("Role manager : "+ new RoleManager(h)); + } catch (ConfigurationException e){ + log.error("Not supported "+ s,e); + } catch (Throwable e) { + throw new RuntimeException(e); + } + + + }); + }); + } + +}