diff --git a/.classpath b/.classpath
index 5162b9a..1a8c6f1 100644
--- a/.classpath
+++ b/.classpath
@@ -12,7 +12,7 @@
-
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index ec4300d..e52a276 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
diff --git a/src/main/java/org/gcube/accounting/insert/storage/utils/DiscoveryListUser.java b/src/main/java/org/gcube/accounting/insert/storage/utils/DiscoveryListUser.java
index 2a5bc18..fbf3554 100644
--- a/src/main/java/org/gcube/accounting/insert/storage/utils/DiscoveryListUser.java
+++ b/src/main/java/org/gcube/accounting/insert/storage/utils/DiscoveryListUser.java
@@ -1,11 +1,11 @@
package org.gcube.accounting.insert.storage.utils;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.List;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
@@ -15,40 +15,41 @@ import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
/**
- * Retrieves the list user form the base url of the social-networking service in the scope provided
- * @author Alessandro Pieve at ISTI-CNR
- * (alessandro.pieve@isti.cnr.it)
+ * Retrieves the list user form the base url of the social-networking service in
+ * the scope provided
+ *
+ * @author Alessandro Pieve at ISTI-CNR (alessandro.pieve@isti.cnr.it)
*/
public class DiscoveryListUser {
private static Logger log = LoggerFactory.getLogger(DiscoveryListUser.class);
private List listUser = null;
- public DiscoveryListUser(String context,String urlService) {
+ public DiscoveryListUser(String context, String urlService) {
- try{
- String token =SecurityTokenProvider.instance.get();
- DiscoveryServiceListUser discoveryList= new DiscoveryServiceListUser(context);
- if (urlService==null){
- urlService=discoveryList.getBasePath()+"="+token;
+ try {
+ String token = SecurityTokenProvider.instance.get();
+ DiscoveryServiceListUser discoveryList = new DiscoveryServiceListUser(context);
+ if (urlService == null) {
+ urlService = discoveryList.getBasePath() + "=" + token;
}
- log.debug("service DiscoveryServiceListUser:"+urlService);
- log.debug("scope:{} ,tokend:{}",context,token);
+ log.debug("service DiscoveryServiceListUser:" + urlService);
+ log.debug("scope:{} ,tokend:{}", context, token);
String data = getJSON(urlService);
- log.debug("data read:{}",data);
+ log.debug("data read:{}", data);
ListUser msg = new Gson().fromJson(data, ListUser.class);
- //TODO for debug limit a list user:
- listUser=msg.getResult();
- }
- catch (Exception ex) {
- log.error("DiscoveryListUserException:{}",ex);
- throw ex ;
+ // TODO for debug limit a list user:
+ listUser = msg.getResult();
+ } catch (Exception ex) {
+ log.error("DiscoveryListUserException:{}", ex);
+ throw ex;
}
}
/**
* Get the base path of the social networking service
+ *
* @return
*/
public List getListUser() {
@@ -67,40 +68,39 @@ public class DiscoveryListUser {
c = (HttpURLConnection) u.openConnection();
c.setRequestMethod("GET");
c.setRequestProperty("Content-length", "0");
- c.setFollowRedirects(true);
+ HttpURLConnection.setFollowRedirects(true);
c.setUseCaches(false);
- c.setAllowUserInteraction(false);
+ c.setAllowUserInteraction(false);
c.connect();
int status = c.getResponseCode();
- log.debug("status:{}",status);
+ log.debug("status:{}", status);
switch (status) {
case 200:
- case 201:
+ case 201:
BufferedReader br = new BufferedReader(new InputStreamReader(c.getInputStream()));
StringBuilder sb = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
- sb.append(line+"\n");
+ sb.append(line + "\n");
}
br.close();
return sb.toString();
}
} catch (MalformedURLException ex) {
- log.error("MalformedURLException:{}",ex);
+ log.error("MalformedURLException:{}", ex);
} catch (IOException ex) {
- log.error("IOException:{}",ex);
+ log.error("IOException:{}", ex);
} finally {
if (c != null) {
try {
c.disconnect();
} catch (Exception ex) {
- log.error("Exception:{}",ex);
+ log.error("Exception:{}", ex);
}
}
}
return null;
}
}
-