From 5d0b45649a7a3acb7f6ccdf5debea7187b5cfa34 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 6 Dec 2021 17:03:01 +0100 Subject: [PATCH] refactored --- ...r.java => GNADataConfigProfileReader.java} | 15 ++++---- .../config/GNADataEntryConfigs.java | 38 ------------------- .../shared/GNADataConfigProfile.java | 14 ++++++- .../GNAUserRightsConfigException.java | 2 +- .../org/gcube/application/TestGNACommon.java | 16 +++++++- 5 files changed, 37 insertions(+), 48 deletions(-) rename src/main/java/org/gcube/application/geoportalcommon/config/{GNADataEntryConfigsProfileReader.java => GNADataConfigProfileReader.java} (95%) delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigs.java rename src/main/java/org/gcube/application/geoportalcommon/shared/{config => exception}/GNAUserRightsConfigException.java (72%) diff --git a/src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigsProfileReader.java b/src/main/java/org/gcube/application/geoportalcommon/config/GNADataConfigProfileReader.java similarity index 95% rename from src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigsProfileReader.java rename to src/main/java/org/gcube/application/geoportalcommon/config/GNADataConfigProfileReader.java index deac0d2..2537241 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigsProfileReader.java +++ b/src/main/java/org/gcube/application/geoportalcommon/config/GNADataConfigProfileReader.java @@ -12,12 +12,13 @@ import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.gcube.application.geoportalcommon.shared.GNADataConfigProfile; import org.gcube.application.geoportalcommon.shared.config.ACTION_ON_ITEM; -import org.gcube.application.geoportalcommon.shared.config.GNAUserRightsConfigException; import org.gcube.application.geoportalcommon.shared.config.GcubeUserRole; import org.gcube.application.geoportalcommon.shared.config.RoleRights; import org.gcube.application.geoportalcommon.shared.config.RoleRights.OPERATION_TYPE; import org.gcube.application.geoportalcommon.shared.exception.ApplicationProfileNotFoundException; +import org.gcube.application.geoportalcommon.shared.exception.GNAUserRightsConfigException; import org.gcube.common.resources.gcore.utils.XPathHelper; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.resources.discovery.client.api.DiscoveryClient; @@ -29,13 +30,13 @@ import org.w3c.dom.Document; import org.xml.sax.InputSource; /** - * The Class GNADataEntryConfigsProfileReader. + * The Class GNADataConfigProfileReader. * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * * Dec 2, 2021 */ -public class GNADataEntryConfigsProfileReader { +public class GNADataConfigProfileReader { private static final String RESOURCE_PROFILE_BODY = "/Resource/Profile/Body"; public static final String SECONDARY_TYPE = "ApplicationProfile"; @@ -44,12 +45,12 @@ public class GNADataEntryConfigsProfileReader { private String scope; - private static final Logger LOG = LoggerFactory.getLogger(GNADataEntryConfigsProfileReader.class); + private static final Logger LOG = LoggerFactory.getLogger(GNADataConfigProfileReader.class); /** * Instantiates a new application profile reader. */ - public GNADataEntryConfigsProfileReader() { + public GNADataConfigProfileReader() { } /** @@ -58,7 +59,7 @@ public class GNADataEntryConfigsProfileReader { * @return the map * @throws Exception the exception */ - public GNADataEntryConfigs readProfileFromInfrastrucure() throws Exception { + public GNADataConfigProfile readProfileFromInfrastrucure() throws Exception { LOG.info("called readProfileFromInfrastrucure"); String queryString = getGcubeGenericQueryString(SECONDARY_TYPE, GENERIC_RESOURCE_NAME); LOG.info("Scope " + scope + ", trying to perform query: " + queryString); @@ -67,7 +68,7 @@ public class GNADataEntryConfigsProfileReader { if (scope == null) throw new Exception("Scope is null, set scope into ScopeProvider"); - GNADataEntryConfigs gnDEC = new GNADataEntryConfigs(); + GNADataConfigProfile gnDEC = new GNADataConfigProfile(); String permissions_for_role = ""; try { diff --git a/src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigs.java b/src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigs.java deleted file mode 100644 index 77d1995..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/config/GNADataEntryConfigs.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.gcube.application.geoportalcommon.config; - -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.config.RoleRights; - - -public class GNADataEntryConfigs { - - List permissionsForRole = null; - - public GNADataEntryConfigs() { - - } - - public GNADataEntryConfigs(List permissionsForRole) { - super(); - this.permissionsForRole = permissionsForRole; - } - - public List getPermissionsForRole() { - return permissionsForRole; - } - - public void setPermissionsForRole(List permissionsForRole) { - this.permissionsForRole = permissionsForRole; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("GNADataEntryConfigs [permissionsForRole="); - builder.append(permissionsForRole); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/GNADataConfigProfile.java b/src/main/java/org/gcube/application/geoportalcommon/shared/GNADataConfigProfile.java index bf4a39a..2c5172f 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/GNADataConfigProfile.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/GNADataConfigProfile.java @@ -3,6 +3,8 @@ package org.gcube.application.geoportalcommon.shared; import java.io.Serializable; import java.util.List; +import org.gcube.application.geoportalcommon.shared.config.RoleRights; + public class GNADataConfigProfile implements Serializable { /** @@ -10,14 +12,16 @@ public class GNADataConfigProfile implements Serializable { */ private static final long serialVersionUID = 5152380669677928785L; private List listItemFields; + private List permissionsForRole; public GNADataConfigProfile() { } - public GNADataConfigProfile(List listItemFields) { + public GNADataConfigProfile(List listItemFields, List permissionsForRole) { super(); this.listItemFields = listItemFields; + this.permissionsForRole = permissionsForRole; } public List getListItemFields() { @@ -28,6 +32,14 @@ public class GNADataConfigProfile implements Serializable { this.listItemFields = listItemFields; } + public List getPermissionsForRole() { + return permissionsForRole; + } + + public void setPermissionsForRole(List permissionsForRole) { + this.permissionsForRole = permissionsForRole; + } + @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/config/GNAUserRightsConfigException.java b/src/main/java/org/gcube/application/geoportalcommon/shared/exception/GNAUserRightsConfigException.java similarity index 72% rename from src/main/java/org/gcube/application/geoportalcommon/shared/config/GNAUserRightsConfigException.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/exception/GNAUserRightsConfigException.java index 81560c6..7035781 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/config/GNAUserRightsConfigException.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/exception/GNAUserRightsConfigException.java @@ -1,4 +1,4 @@ -package org.gcube.application.geoportalcommon.shared.config; +package org.gcube.application.geoportalcommon.shared.exception; @SuppressWarnings("serial") public class GNAUserRightsConfigException extends Exception { diff --git a/src/test/java/org/gcube/application/TestGNACommon.java b/src/test/java/org/gcube/application/TestGNACommon.java index c262aa4..6b9f2c5 100644 --- a/src/test/java/org/gcube/application/TestGNACommon.java +++ b/src/test/java/org/gcube/application/TestGNACommon.java @@ -2,6 +2,7 @@ package org.gcube.application; import org.gcube.application.geoportalcommon.GeoportalCommon; import org.gcube.application.geoportalcommon.MongoServiceCommon; +import org.gcube.application.geoportalcommon.config.GNADataConfigProfileReader; import org.gcube.application.geoportalcommon.shared.GeoNaDataViewerProfile; import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData; @@ -46,7 +47,7 @@ public class TestGNACommon { return links; } - @Test + //@Test public void queryConcessioniTest() throws Exception { try { @@ -67,5 +68,18 @@ public class TestGNACommon { } } + + @Test + public void readUserRights() throws Exception { + + GNADataConfigProfileReader r = new GNADataConfigProfileReader(); + try { + ScopeProvider.instance.set(CONTEXT); + r.readProfileFromInfrastrucure(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }