diff --git a/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java b/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java index e66881e..fd3eddd 100644 --- a/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java +++ b/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java @@ -1,18 +1,18 @@ package org.gcube.gcat.moderation.thread; -import java.util.HashMap; -import java.util.Map; +//import java.util.HashMap; +//import java.util.Map; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; -import org.gcube.common.authorization.utils.manager.SecretManager; -import org.gcube.common.authorization.utils.manager.SecretManagerProvider; -import org.gcube.gcat.api.configuration.CatalogueConfiguration; +//import org.gcube.common.authorization.utils.manager.SecretManager; +//import org.gcube.common.authorization.utils.manager.SecretManagerProvider; +//import org.gcube.gcat.api.configuration.CatalogueConfiguration; import org.gcube.gcat.api.moderation.CMItemStatus; import org.gcube.gcat.moderation.thread.social.notifications.SocialNotificationModerationThread; import org.gcube.gcat.persistence.ckan.CKANUser; -import org.gcube.portlets.user.uriresolvermanager.UriResolverManager; -import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryString.MODERATION_OP; -import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryStringBuilder; +//import org.gcube.portlets.user.uriresolvermanager.UriResolverManager; +//import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryString.MODERATION_OP; +//import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryStringBuilder; /** * @author Luca Frosini (ISTI - CNR) @@ -62,29 +62,30 @@ public abstract class ModerationThread { } public String getModerationURL() { - if(moderationURL==null) { - try { - SecretManager secretManager = SecretManagerProvider.instance.get(); - String context = secretManager.getContext(); - UriResolverManager resolver = new UriResolverManager("CTLG"); - Map params = new HashMap(); - params.put("gcube_scope", context); //e.g. /gcube/devsec/devVRE - params.put("entity_context", "organization"); - params.put("entity_name", CatalogueConfiguration.getOrganizationName(context)); //e.g. devvre - - CatalogueResolverQueryStringBuilder builder = new CatalogueResolverQueryStringBuilder(itemName); //item name under moderation - builder.itemStatus(cmItemStatus.name()). //e.g. pending, approved, rejected - moderation(MODERATION_OP.show); - - String queryString = builder.buildQueryParametersToQueryString(); - params.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString); - - moderationURL = resolver.getLink(params, true); - }catch (Exception e) { - return itemURL; - } - } - return moderationURL; +// if(moderationURL==null) { +// try { +// SecretManager secretManager = SecretManagerProvider.instance.get(); +// String context = secretManager.getContext(); +// UriResolverManager resolver = new UriResolverManager("CTLG"); +// Map params = new HashMap(); +// params.put("gcube_scope", context); //e.g. /gcube/devsec/devVRE +// params.put("entity_context", "organization"); +// params.put("entity_name", CatalogueConfiguration.getOrganizationName(context)); //e.g. devvre +// +// CatalogueResolverQueryStringBuilder builder = new CatalogueResolverQueryStringBuilder(itemName); //item name under moderation +// builder.itemStatus(cmItemStatus.name()). //e.g. pending, approved, rejected +// moderation(MODERATION_OP.show); +// +// String queryString = builder.buildQueryParametersToQueryString(); +// params.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString); +// +// moderationURL = resolver.getLink(params, true); +// }catch (Exception e) { +// return itemURL; +// } +// } +// return moderationURL; + return itemURL; } /**