From 12020bc9c27e2b120748ec210e5e8c4e1216324f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 1 Dec 2020 16:45:05 +0100 Subject: [PATCH] refactored --- .classpath | 15 +++++++++++++-- .../GeoNaDataViewerProfileReader.java | 8 ++++---- .../{ => geoportalcommon}/GeoportalCommon.java | 11 ++++++----- .../GeoportalCommonConstants.java | 2 +- .../shared/GeoNaDataViewerProfile.java | 2 +- .../shared/GeoNaItemRef.java | 2 +- .../{ => geoportalcommon}/shared/LayerItem.java | 2 +- .../{ => geoportalcommon}/shared/PublicLink.java | 2 +- .../ApplicationProfileNotFoundException.java | 2 +- .../GeoportalDataCommon.gwt.xml | 0 .../org/gcube/application/TestGeonaReader.java | 5 +++-- 11 files changed, 32 insertions(+), 19 deletions(-) rename src/main/java/org/gcube/application/{ => geoportalcommon}/GeoNaDataViewerProfileReader.java (95%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/GeoportalCommon.java (91%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/GeoportalCommonConstants.java (89%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/shared/GeoNaDataViewerProfile.java (97%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/shared/GeoNaItemRef.java (98%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/shared/LayerItem.java (95%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/shared/PublicLink.java (96%) rename src/main/java/org/gcube/application/{ => geoportalcommon}/shared/exception/ApplicationProfileNotFoundException.java (87%) rename src/main/resources/org/gcube/application/{ => geoportalcommon}/GeoportalDataCommon.gwt.xml (100%) diff --git a/.classpath b/.classpath index b5fd6de..3f8d197 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,23 @@ - + + + + + + - + + + + + + + diff --git a/src/main/java/org/gcube/application/GeoNaDataViewerProfileReader.java b/src/main/java/org/gcube/application/geoportalcommon/GeoNaDataViewerProfileReader.java similarity index 95% rename from src/main/java/org/gcube/application/GeoNaDataViewerProfileReader.java rename to src/main/java/org/gcube/application/geoportalcommon/GeoNaDataViewerProfileReader.java index 80dd8b5..b067e14 100644 --- a/src/main/java/org/gcube/application/GeoNaDataViewerProfileReader.java +++ b/src/main/java/org/gcube/application/geoportalcommon/GeoNaDataViewerProfileReader.java @@ -1,4 +1,4 @@ -package org.gcube.application; +package org.gcube.application.geoportalcommon; import static org.gcube.resources.discovery.icclient.ICFactory.client; @@ -14,9 +14,9 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import org.gcube.application.shared.GeoNaDataViewerProfile; -import org.gcube.application.shared.LayerItem; -import org.gcube.application.shared.exception.ApplicationProfileNotFoundException; +import org.gcube.application.geoportalcommon.shared.GeoNaDataViewerProfile; +import org.gcube.application.geoportalcommon.shared.LayerItem; +import org.gcube.application.geoportalcommon.shared.exception.ApplicationProfileNotFoundException; import org.gcube.common.resources.gcore.utils.XPathHelper; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.resources.discovery.client.api.DiscoveryClient; diff --git a/src/main/java/org/gcube/application/GeoportalCommon.java b/src/main/java/org/gcube/application/geoportalcommon/GeoportalCommon.java similarity index 91% rename from src/main/java/org/gcube/application/GeoportalCommon.java rename to src/main/java/org/gcube/application/geoportalcommon/GeoportalCommon.java index ac4cd55..4a729ef 100644 --- a/src/main/java/org/gcube/application/GeoportalCommon.java +++ b/src/main/java/org/gcube/application/geoportalcommon/GeoportalCommon.java @@ -1,12 +1,12 @@ -package org.gcube.application; +package org.gcube.application.geoportalcommon; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Arrays; -import org.gcube.application.shared.GeoNaDataViewerProfile; -import org.gcube.application.shared.GeoNaItemRef; -import org.gcube.application.shared.PublicLink; +import org.gcube.application.geoportalcommon.shared.GeoNaDataViewerProfile; +import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; +import org.gcube.application.geoportalcommon.shared.PublicLink; import org.gcube.portlets.user.urlshortener.UrlShortener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,11 +82,12 @@ public class GeoportalCommon { * @throws Exception the exception */ public GeoNaDataViewerProfile getGeoNaDataViewProfile(String appID) throws Exception { - LOG.info("getGeoNaDataViewProfile called"); + LOG.info("getGeoNaDataViewProfile called for: "+appID); if(appID==null || appID.isEmpty()) appID = GeoportalCommonConstants.GEOPORTAL_DATA_VIEWER_APP; + LOG.info("using AppId: "+appID); GeoNaDataViewerProfileReader gdvp = new GeoNaDataViewerProfileReader(appID); GeoNaDataViewerProfile profile = gdvp.readProfileFromInfrastrucure(); LOG.info("Returning profile: " + profile); diff --git a/src/main/java/org/gcube/application/GeoportalCommonConstants.java b/src/main/java/org/gcube/application/geoportalcommon/GeoportalCommonConstants.java similarity index 89% rename from src/main/java/org/gcube/application/GeoportalCommonConstants.java rename to src/main/java/org/gcube/application/geoportalcommon/GeoportalCommonConstants.java index 006e257..cb31d03 100644 --- a/src/main/java/org/gcube/application/GeoportalCommonConstants.java +++ b/src/main/java/org/gcube/application/geoportalcommon/GeoportalCommonConstants.java @@ -1,4 +1,4 @@ -package org.gcube.application; +package org.gcube.application.geoportalcommon; /** * The Class GeoportalCommonConstants. diff --git a/src/main/java/org/gcube/application/shared/GeoNaDataViewerProfile.java b/src/main/java/org/gcube/application/geoportalcommon/shared/GeoNaDataViewerProfile.java similarity index 97% rename from src/main/java/org/gcube/application/shared/GeoNaDataViewerProfile.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/GeoNaDataViewerProfile.java index 2a6024b..1c0dfcb 100644 --- a/src/main/java/org/gcube/application/shared/GeoNaDataViewerProfile.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/GeoNaDataViewerProfile.java @@ -1,4 +1,4 @@ -package org.gcube.application.shared; +package org.gcube.application.geoportalcommon.shared; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/org/gcube/application/shared/GeoNaItemRef.java b/src/main/java/org/gcube/application/geoportalcommon/shared/GeoNaItemRef.java similarity index 98% rename from src/main/java/org/gcube/application/shared/GeoNaItemRef.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/GeoNaItemRef.java index 4e56eb4..6396bdf 100644 --- a/src/main/java/org/gcube/application/shared/GeoNaItemRef.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/GeoNaItemRef.java @@ -1,4 +1,4 @@ -package org.gcube.application.shared; +package org.gcube.application.geoportalcommon.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/application/shared/LayerItem.java b/src/main/java/org/gcube/application/geoportalcommon/shared/LayerItem.java similarity index 95% rename from src/main/java/org/gcube/application/shared/LayerItem.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/LayerItem.java index 428ec44..33db1b7 100644 --- a/src/main/java/org/gcube/application/shared/LayerItem.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/LayerItem.java @@ -1,4 +1,4 @@ -package org.gcube.application.shared; +package org.gcube.application.geoportalcommon.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/application/shared/PublicLink.java b/src/main/java/org/gcube/application/geoportalcommon/shared/PublicLink.java similarity index 96% rename from src/main/java/org/gcube/application/shared/PublicLink.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/PublicLink.java index 606f4f0..33dc343 100644 --- a/src/main/java/org/gcube/application/shared/PublicLink.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/PublicLink.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.application.shared; +package org.gcube.application.geoportalcommon.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/application/shared/exception/ApplicationProfileNotFoundException.java b/src/main/java/org/gcube/application/geoportalcommon/shared/exception/ApplicationProfileNotFoundException.java similarity index 87% rename from src/main/java/org/gcube/application/shared/exception/ApplicationProfileNotFoundException.java rename to src/main/java/org/gcube/application/geoportalcommon/shared/exception/ApplicationProfileNotFoundException.java index 5c69de1..9d80b0a 100644 --- a/src/main/java/org/gcube/application/shared/exception/ApplicationProfileNotFoundException.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/exception/ApplicationProfileNotFoundException.java @@ -1,4 +1,4 @@ -package org.gcube.application.shared.exception; +package org.gcube.application.geoportalcommon.shared.exception; /** * The Class ApplicationProfileException. diff --git a/src/main/resources/org/gcube/application/GeoportalDataCommon.gwt.xml b/src/main/resources/org/gcube/application/geoportalcommon/GeoportalDataCommon.gwt.xml similarity index 100% rename from src/main/resources/org/gcube/application/GeoportalDataCommon.gwt.xml rename to src/main/resources/org/gcube/application/geoportalcommon/GeoportalDataCommon.gwt.xml diff --git a/src/test/java/org/gcube/application/TestGeonaReader.java b/src/test/java/org/gcube/application/TestGeonaReader.java index 500ef33..b5296d7 100644 --- a/src/test/java/org/gcube/application/TestGeonaReader.java +++ b/src/test/java/org/gcube/application/TestGeonaReader.java @@ -1,7 +1,8 @@ package org.gcube.application; -import org.gcube.application.shared.GeoNaDataViewerProfile; -import org.gcube.application.shared.GeoNaItemRef; +import org.gcube.application.geoportalcommon.GeoportalCommon; +import org.gcube.application.geoportalcommon.shared.GeoNaDataViewerProfile; +import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.common.scope.api.ScopeProvider; public class TestGeonaReader {