From f00127a82a1b970461fe47b4fdccd701321e242f Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 18 Nov 2021 16:54:17 +0100 Subject: [PATCH] Reorganized function order --- .../gcat/persistence/ckan/CKANPackage.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 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 6ba6082..1064165 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java @@ -31,8 +31,8 @@ import org.gcube.gcat.oldutils.Validator; import org.gcube.gcat.profile.MetadataUtility; import org.gcube.gcat.social.PortalUser; import org.gcube.gcat.social.SocialPost; -import org.gcube.gcat.social.ZulipStream; import org.gcube.gcat.utils.URIResolver; +import org.gcube.gcat.zulip.ZulipStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -647,14 +647,6 @@ public class CKANPackage extends CKAN { return cmItemStatus; } - protected boolean isModerationEnabled() { - boolean moderationEnabled = ckanInstance.isModerationEnabled(); - if(moderationEnabled && zulipStream==null) { - zulipStream = new ZulipStream("user@zulip.com", "apikey"); - } - return moderationEnabled; - } - @Override public String read() { try { @@ -965,7 +957,16 @@ public class CKANPackage extends CKAN { * ---------------------------------------------------------------------------------------- * */ - private void createNewStream() { + + protected boolean isModerationEnabled() { + boolean moderationEnabled = ckanInstance.isModerationEnabled(); + if(moderationEnabled && zulipStream==null) { + zulipStream = new ZulipStream("user@zulip.com", "apikey"); + } + return moderationEnabled; + } + + private void createNewStream() throws Exception { String itemName = result.get(name).asText(); zulipStream.setItemCoordinates(itemID, itemName); zulipStream.setCKANUser(ckanUser);