diff --git a/CHANGELOG.md b/CHANGELOG.md index b060df8..dbc0bb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v3.0.0-SNAPSHOT] - Service migrated to Smartgears 4 - - -## [v2.4.2-SNAPSHOT] - - Switched form commons-lang3 to commons-lang to avoid duplicates +- Set resource-registry-publisher dependency scope to provided ## [v2.4.1] diff --git a/pom.xml b/pom.xml index 782f1f7..5385722 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ org.gcube.data-catalogue gcat-api - [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) + [2.0.0,3.0.0-SNAPSHOT) org.gcube.social-networking @@ -100,7 +100,6 @@ org.gcube.information-system resource-registry-publisher - provided org.gcube.resources diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKAN.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKAN.java index 55bc404..29f6292 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKAN.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKAN.java @@ -22,7 +22,6 @@ import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.node.NullNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.common.gxhttp.request.GXHTTPStringRequest; -import org.gcube.gcat.configuration.CatalogueConfigurationFactory; import org.gcube.gcat.utils.HTTPUtility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java index 8910dab..a9b9da0 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java @@ -21,6 +21,7 @@ import javax.ws.rs.core.MultivaluedMap; import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; +import org.gcube.common.security.ContextBean; import org.gcube.common.security.ContextBean.Type; import org.gcube.gcat.api.GCatConstants; import org.gcube.gcat.api.configuration.CatalogueConfiguration; @@ -891,7 +892,10 @@ public class CKANPackage extends CKAN implements Moderated { ((ObjectNode) jsonNode).remove(RESOURCES_KEY); } - if(configuration.getContextBean().is(Type.VRE)) { + String context = configuration.getContext(); + ContextBean contextBean = new ContextBean(context); + + if(contextBean.is(Type.VRE)) { addItemURLViaResolver(jsonNode); } @@ -904,7 +908,7 @@ public class CKANPackage extends CKAN implements Moderated { postItemCreated(); if(!isModerationEnabled()) { - if(configuration.getContextBean().is(Type.VRE)) { + if(contextBean.is(Type.VRE)) { // Actions performed after a package has been correctly created on ckan. sendSocialPost(); } @@ -1489,7 +1493,9 @@ public class CKANPackage extends CKAN implements Moderated { moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL); moderationThread.postItemApproved(moderatorMessage); - if(configuration.getContextBean().is(Type.VRE)) { + String context = configuration.getContext(); + ContextBean contextBean = new ContextBean(context); + if(contextBean.is(Type.VRE)) { // Actions performed after a package has been correctly created on ckan. sendSocialPost(); } diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANOrganizationTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANOrganizationTest.java index 58bc6d3..0e626fc 100644 --- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANOrganizationTest.java +++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANOrganizationTest.java @@ -73,7 +73,7 @@ public class CKANOrganizationTest extends ContextTest { ContextBean contextBean = new ContextBean(context); CKANOrganization ckanOrganization = new CKANOrganization(); ckanOrganization.setApiKey(CKANUtility.getSysAdminAPI()); - String name = CatalogueConfiguration.getOrganizationName(contextBean); + String name = CatalogueConfiguration.getOrganizationName(context); ckanOrganization.setName(name); String json = "{\"display_name\": \"" + contextBean.name() + "\",\"description\": \"" + context + " Organization\",\"name\": \"" + name + "\"}"; logger.info("Going to create Organization {} : {}", name, json); diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java index b7f27a1..5e894d1 100644 --- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java +++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java @@ -22,7 +22,6 @@ import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.common.authorization.library.provider.UserInfo; -import org.gcube.common.security.ContextBean; import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.gcat.ContextTest; import org.gcube.gcat.api.GCatConstants; @@ -178,8 +177,7 @@ public class CKANPackageTest extends ContextTest { @Test public void listWithParameters() throws Exception { String contextName = "/gcube/devNext/NextNext"; - ContextBean contextBean = new ContextBean(contextName); - String ckanOrganizationName = CatalogueConfiguration.getOrganizationName(contextBean); + String ckanOrganizationName = CatalogueConfiguration.getOrganizationName(contextName); ContextTest.setContextByName(contextName); CKANPackage ckanPackage = new CKANPackage(); @@ -310,8 +308,7 @@ public class CKANPackageTest extends ContextTest { protected CKANPackage createPackage(ObjectMapper mapper, Boolean socialPost) throws Exception { String currentContext = SecretManagerProvider.instance.get().getContext(); - ContextBean contextBean = new ContextBean(currentContext); - String organization = CatalogueConfiguration.getOrganizationName(contextBean); + String organization = CatalogueConfiguration.getOrganizationName(currentContext); ObjectNode itemObjectNode = mapper.createObjectNode(); itemObjectNode.put(CKAN.NAME_KEY, ITEM_NAME_VALUE);