From 6bcc6db77344de8b80564d657c667968a3b4f3e7 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 27 Jun 2016 09:41:05 +0000 Subject: [PATCH] Fixed code on Ckan Logout git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@129456 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../GcubeCkanDataCatalogServiceImpl.java | 36 +++++-------------- 1 file changed, 8 insertions(+), 28 deletions(-) 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 2bd14a4..e62a95f 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 @@ -32,6 +32,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; + +import eu.trentorise.opendata.jackan.internal.org.apache.http.HttpStatus; /** * The server side implementation of the RPC service. * @@ -398,38 +400,16 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem httpCon.setRequestProperty("Content-Type", "application/x-www-form-urlencoded" ); httpCon.setRequestMethod("DELETE"); httpCon.connect(); - logger.debug("Logout Completed"); + + if(httpCon.getResponseCode()==HttpStatus.SC_OK){ + logger.debug("Logout Completed, response code: "+HttpStatus.SC_OK); + }else{ + logger.warn("An error occurred during perfoming CKAN logout, Response status is: "+httpCon.getResponseCode()); + } } catch (IOException e) { logger.error("An error occured during performing Logout from CKAN for: "+username +" by token: "+ckanAP.getGcubeTokenValue(), e); } } - - public static void main(String[] args) { - - try { - URL url; - - String deleteURI = "https://ckan-d-d4s.d4science.org:443/ckan-connector/gcube/service/disconnect?gcube-token=4620e6d0-2313-4f48-9d54-eb3efd01a810"; - logger.debug("Perfoming HTTP delete to URI: "+deleteURI); - url = new URL(deleteURI); - HttpURLConnection httpCon = (HttpURLConnection) url.openConnection(); - httpCon.setDoOutput(true); - httpCon.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - httpCon.setRequestMethod("DELETE"); - httpCon.connect(); - - if(httpCon.getResponseCode()==200){ - logger.debug("Logout Completed"); - }else{ - logger.warn("An error occurred during perfoming CKAN logout, Response status is: "+httpCon.getResponseCode()); - } - } - catch (IOException e) { - logger.error("An error occured during performing Logout from CKAN", e); - e.printStackTrace(); - } - - } }