diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcoreEndpointReader.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcoreEndpointReader.java index a2ee964..a2e1f9d 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcoreEndpointReader.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcoreEndpointReader.java @@ -12,8 +12,9 @@ import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; /** @@ -27,7 +28,8 @@ public class GcoreEndpointReader { private static final String serviceName = "CkanConnector"; private static final String serviceClass = "DataAccess"; - private static Logger logger = LoggerFactory.getLogger(GcoreEndpointReader.class); + private static final Log logger = LogFactoryUtil.getLog(GcoreEndpointReader.class); + //private static Logger logger = LoggerFactory.getLogger(GcoreEndpointReader.class); private String ckanResourceEntyName; /** diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java index c0eb6ae..d9edbba 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java @@ -24,16 +24,14 @@ import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.CkanRole; import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.GRSFStatus; import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.ManageProductBean; import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.ex.NoGRSFRecordException; -import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.GroupBean; -import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayRoleManager; import org.gcube.vomanagement.usermanagement.model.GCubeRole; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import eu.trentorise.opendata.jackan.model.CkanDataset; import eu.trentorise.opendata.jackan.model.CkanGroup; @@ -57,7 +55,8 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem public static String CKANCONNECTORLOGOUT = "CkanConnectorLogout"; public static final String GRSF_UPDATER_SERVICE = "GRSFUpdaterEndPoint"; private static final String GRSF_ADMIN_ROLE = "GRSF-Admin"; - private static Logger logger = LoggerFactory.getLogger(GcubeCkanDataCatalogServiceImpl.class); + //private static Logger logger = LoggerFactory.getLogger(GcubeCkanDataCatalogServiceImpl.class); + private static final Log logger = LogFactoryUtil.getLog(GcubeCkanDataCatalogServiceImpl.class); /** * Instanciate the ckan util library. @@ -523,16 +522,27 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem return false; } else{ - PortalContext pContext = PortalContext.getConfiguration(); - List userRoles = new LiferayRoleManager().listRolesByUserAndGroup(pContext.getCurrentUser(getThreadLocalRequest()).getUserId(), pContext.getCurrentGroupId(getThreadLocalRequest())); - boolean isGRSFAdminRoleSet = false; - for (GCubeRole gCubeRole : userRoles) { - if(gCubeRole.getRoleName().equals(GRSF_ADMIN_ROLE)){ - isGRSFAdminRoleSet = true; - break; + try{ + PortalContext pContext = PortalContext.getConfiguration(); + List userRoles = new LiferayRoleManager().listRolesByUserAndGroup( + pContext.getCurrentUser(getThreadLocalRequest()).getUserId(), + pContext.getCurrentGroupId(getThreadLocalRequest())); + boolean isGRSFAdminRoleSet = false; + for (GCubeRole gCubeRole : userRoles) { + if(gCubeRole.getRoleName().equals(GRSF_ADMIN_ROLE)){ + isGRSFAdminRoleSet = true; + break; + } } + + logger.debug("IsmanageProductEnabled equals to " + catalogue.isManageProductEnabled()); + logger.debug("isGRSFAdminRoleSet equals to " + isGRSFAdminRoleSet); + + return catalogue.isManageProductEnabled() & isGRSFAdminRoleSet; + }catch(Exception e){ + logger.error("Unable to determine if the manage product needs to be shown or not", e); + return false; } - return catalogue.isManageProductEnabled() & isGRSFAdminRoleSet; } } diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/SessionUtil.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/SessionUtil.java index 9fff3be..55228c0 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/SessionUtil.java @@ -19,6 +19,8 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.service.UserLocalServiceUtil; @@ -33,7 +35,8 @@ public class SessionUtil { public static final String CKAN_END_POINT = "CKAN_END_POINT"; public static final String CKAN_ACCESS_POINT = "CKAN_ACCESS_POINT"; public static final String GCUBE_REQUEST_URL = "gcube-request-url"; - private static Logger logger = LoggerFactory.getLogger(SessionUtil.class); + //private static Logger logger = LoggerFactory.getLogger(SessionUtil.class); + private static final Log logger = LogFactoryUtil.getLog(SessionUtil.class); /** * Gets the ckan end point. diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java index 6d4522a..2aa96a3 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java @@ -9,7 +9,6 @@ import java.util.List; import org.gcube.datacatalogue.ckanutillibrary.DataCatalogue; import org.gcube.datacatalogue.ckanutillibrary.models.RolesCkanGroupOrOrg; import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.CkanRole; -import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.RoleManager; import org.gcube.vomanagement.usermanagement.UserManager; @@ -23,8 +22,9 @@ import org.gcube.vomanagement.usermanagement.model.GCubeGroup; import org.gcube.vomanagement.usermanagement.model.GCubeRole; import org.gcube.vomanagement.usermanagement.model.GCubeUser; import org.gcube.vomanagement.usermanagement.model.GatewayRolesNames; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import eu.trentorise.opendata.jackan.model.CkanOrganization; @@ -37,7 +37,8 @@ import eu.trentorise.opendata.jackan.model.CkanOrganization; */ public class UserUtil { - private static Logger logger = LoggerFactory.getLogger(UserUtil.class); + //private static Logger logger = LoggerFactory.getLogger(UserUtil.class); + private static final Log logger = LogFactoryUtil.getLog(UserUtil.class); private static final String SOBIGDATA_VO_CONTEXT = "/d4science.research-infrastructures.eu/SoBigData"; /** diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/manage/GRSFNotificationService.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/manage/GRSFNotificationService.java index 406cb09..ba5d969 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/manage/GRSFNotificationService.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/manage/GRSFNotificationService.java @@ -12,6 +12,7 @@ import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.datacatalogue.ckanutillibrary.DataCatalogue; +import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.SessionUtil; import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.ManageProductBean; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; @@ -22,6 +23,9 @@ import org.json.simple.parser.JSONParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; + import eu.trentorise.opendata.jackan.internal.org.apache.http.HttpResponse; import eu.trentorise.opendata.jackan.internal.org.apache.http.client.methods.HttpPost; import eu.trentorise.opendata.jackan.internal.org.apache.http.entity.StringEntity; @@ -39,7 +43,8 @@ import eu.trentorise.opendata.jackan.model.CkanTag; */ public class GRSFNotificationService { - private static Logger logger = LoggerFactory.getLogger(GRSFNotificationService.class); + //private static Logger logger = LoggerFactory.getLogger(GRSFNotificationService.class); + private static final Log logger = LogFactoryUtil.getLog(GRSFNotificationService.class); private static final String SERVICE_POST_METHOD = "/service/updater/post"; private static final String ANNOTATION_KEY = "Annotation on update"; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");