gCubeSystem
/
workspace-tree-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed url shortener request 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@77452 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2013-07-02 08:30:40 +00:00
parent 18aeda5198
commit e74a74eb4f
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -50,7 +50,7 @@ import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService;
import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItem; import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItem;
import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer; import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer;
import org.gcube.portlets.user.workspace.server.notifications.NotificationsUtil; import org.gcube.portlets.user.workspace.server.notifications.NotificationsUtil;
import org.gcube.portlets.user.workspace.server.shortner.UrlShortener; import org.gcube.portlets.user.workspace.server.shortener.UrlShortener;
import org.gcube.portlets.user.workspace.server.util.UserUtil; import org.gcube.portlets.user.workspace.server.util.UserUtil;
import org.gcube.portlets.user.workspace.server.util.WsUtil; import org.gcube.portlets.user.workspace.server.util.WsUtil;
import org.gcube.portlets.user.workspace.server.util.scope.ScopeUtilFilter; import org.gcube.portlets.user.workspace.server.util.scope.ScopeUtilFilter;

2
src/main/java/org/gcube/portlets/user/workspace/server/shortner/HttpCallerUtil.java → src/main/java/org/gcube/portlets/user/workspace/server/shortener/HttpCallerUtil.java
View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package org.gcube.portlets.user.workspace.server.shortner; package org.gcube.portlets.user.workspace.server.shortener;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

2
src/main/java/org/gcube/portlets/user/workspace/server/shortner/UrlEncoderUtil.java → src/main/java/org/gcube/portlets/user/workspace/server/shortener/UrlEncoderUtil.java
View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package org.gcube.portlets.user.workspace.server.shortner; package org.gcube.portlets.user.workspace.server.shortener;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;

31
src/main/java/org/gcube/portlets/user/workspace/server/shortner/UrlShortener.java → src/main/java/org/gcube/portlets/user/workspace/server/shortener/UrlShortener.java
View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package org.gcube.portlets.user.workspace.server.shortner; package org.gcube.portlets.user.workspace.server.shortener;
/** /**
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
@ -89,10 +89,22 @@ public final class UrlShortener {
paramKeyValue = endpoints.get(0).propertyMap()!=null?endpoints.get(0).propertyMap().get(KEY).value():""; paramKeyValue = endpoints.get(0).propertyMap()!=null?endpoints.get(0).propertyMap().get(KEY).value():"";
} }
uriRequest = shortnerServerUrl+"?"+KEY+"="+paramKeyValue; String getParam = "";
//ACTIVE THIS AFTER RELEASE
if(paramKeyValue!=null && !paramKeyValue.isEmpty()){
// getParam = "?"+KEY +"="+paramKeyValue;
getParam = "?"+KEY +"=AIzaSyDfMO0VY3o8GjRUqnTfqScjm_EsFEuBa3g";
}
uriRequest = shortnerServerUrl+getParam;
logger.trace("HTTP-URL-Shortener found, uriRequest: "+uriRequest); logger.trace("HTTP-URL-Shortener found, uriRequest: "+uriRequest);
//DEBUG
System.out.println("HTTP-URL-Shortener found, uriRequest: "+uriRequest);
isAvailable = true; isAvailable = true;
}catch (Exception e) { }catch (Exception e) {
@ -119,7 +131,9 @@ public final class UrlShortener {
try { try {
URL url = new URL(shortnerServerUrl); logger.trace("shorten longUrl: "+longUrl);
URL url = new URL(uriRequest);
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setDoOutput(true); connection.setDoOutput(true);
@ -130,9 +144,12 @@ public final class UrlShortener {
jsonObj.put(LONG_URL, longUrl); jsonObj.put(LONG_URL, longUrl);
//ACTIVE THIS AFTER RELEASE // //ACTIVE THIS AFTER RELEASE
if(paramKeyValue!=null && !paramKeyValue.isEmpty()) // if(paramKeyValue!=null && !paramKeyValue.isEmpty()){
jsonObj.put(KEY, paramKeyValue); // jsonObj.put(KEY, paramKeyValue);
// }
logger.trace("request json : "+jsonObj.toJSONString());
OutputStreamWriter wr = new OutputStreamWriter(connection.getOutputStream()); OutputStreamWriter wr = new OutputStreamWriter(connection.getOutputStream());
wr.write(jsonObj.toJSONString()); wr.write(jsonObj.toJSONString());
@ -185,7 +202,7 @@ public final class UrlShortener {
UrlShortener urlSh = new UrlShortener(); UrlShortener urlSh = new UrlShortener();
System.out.println("UrlShortener: "+urlSh); System.out.println("UrlShortener: "+urlSh);
shorten = urlSh.shorten("https://dev.d4science.org/group/data-e-infrastructure-gateway/workspace?itemid=062c558c-c7ce-4de3-a4c7-e1411816cc12&operation=gotofolder"); shorten = urlSh.shorten("https://dev.d4science.org/group/data-e-infrastructure-gateway/workspace?itemid=056648-c7ce-4de3-a4c7-e1411816cc12&operation=gotofolder");
System.out.println("Shorted: "+shorten); System.out.println("Shorted: "+shorten);
} catch (Exception e) { } catch (Exception e) {

2
src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java
View File

@ -20,7 +20,7 @@ import org.gcube.portlets.user.homelibrary.home.workspace.Workspace;
import org.gcube.portlets.user.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException; import org.gcube.portlets.user.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException;
import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder;
import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer; import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer;
import org.gcube.portlets.user.workspace.server.shortner.UrlShortener; import org.gcube.portlets.user.workspace.server.shortener.UrlShortener;
import org.gcube.portlets.user.workspace.server.util.scope.ScopeUtilFilter; import org.gcube.portlets.user.workspace.server.util.scope.ScopeUtilFilter;