From 878b5cfae960f3fb407082f2b31780914a490d81 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 10 Feb 2021 14:18:38 +0100 Subject: [PATCH] Removed owner_org from created/updated/read item --- .../gcube/gcat/persistence/ckan/CKANPackage.java | 13 +++++++++++++ .../gcat/persistence/ckan/CKANPackageTest.java | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) 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 2d36947..464269d 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java @@ -237,6 +237,14 @@ public class CKANPackage extends CKAN { return checkBaseInformation(json, false); } + public JsonNode cleanResult(JsonNode jsonNode) { + if(jsonNode.has(OWNER_ORG_KEY)) { + ((ObjectNode) jsonNode).remove(OWNER_ORG_KEY); + } + return jsonNode; + } + + /** * @param json The json to check * @param allowPartialInfo used for patch method which provide only partial information (i.e. the info to patch) @@ -596,6 +604,8 @@ public class CKANPackage extends CKAN { sendSocialPost(title, catalogueItemURL); } + result = cleanResult(result); + return getAsString(result); } catch(WebApplicationException e) { rollbackManagedResources(); @@ -667,6 +677,7 @@ public class CKANPackage extends CKAN { String catalogueItemURL = uriResolver.getCatalogueItemURL(name); ((ObjectNode) result).put(ITEM_URL_KEY, catalogueItemURL); */ + result = cleanResult(result); return getAsString(result); } catch(WebApplicationException e) { @@ -742,6 +753,8 @@ public class CKANPackage extends CKAN { ((ObjectNode) result).put(ITEM_URL_KEY, catalogueItemURL); */ + result = cleanResult(result); + return getAsString(result); } catch(WebApplicationException e) { rollbackManagedResources(); 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 6b5dd32..d5068af 100644 --- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java +++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java @@ -43,7 +43,7 @@ public class CKANPackageTest extends ContextTest { private static final String ITEM_NAME_VALUE = "restful_transaction_model"; private static final String LICENSE_VALUE = "CC-BY-SA-4.0"; - private static final String EXTRAS_TYPE_VALUE_VALUE = "TestEmptyProfile"; + private static final String EXTRAS_TYPE_VALUE_VALUE = "EmptyProfile"; @Test public void count() throws Exception { @@ -330,7 +330,7 @@ public class CKANPackageTest extends ContextTest { @Test public void create() throws Exception { - ContextTest.setContextByName("/gcube/devNext/NextNext"); + ContextTest.setContextByName("/gcube/devsec/devVRE"); ObjectMapper mapper = new ObjectMapper(); createPackage(mapper); } @@ -346,7 +346,7 @@ public class CKANPackageTest extends ContextTest { @Test public void createReadUpdateUpdatePurge() throws Exception { - ContextTest.setContextByName("/gcube/devNext/NextNext"); + ContextTest.setContextByName("/gcube/devsec/devVRE"); ObjectMapper mapper = new ObjectMapper(); createPackage(mapper);