From 32eadfff7bde777b5c4af45a668fb710b516fbdc Mon Sep 17 00:00:00 2001 From: Alessandro Pieve Date: Fri, 17 Feb 2017 15:32:17 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/resource-management/quota-manager@142704 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../quota/manager/util/DiscoveryListUser.java | 2 -- .../quota/manager/util/SendNotification.java | 14 +++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/gcube/resource/management/quota/manager/util/DiscoveryListUser.java b/src/main/java/org/gcube/resource/management/quota/manager/util/DiscoveryListUser.java index 0f32ab7..6525172 100644 --- a/src/main/java/org/gcube/resource/management/quota/manager/util/DiscoveryListUser.java +++ b/src/main/java/org/gcube/resource/management/quota/manager/util/DiscoveryListUser.java @@ -23,8 +23,6 @@ import com.google.gson.Gson; public class DiscoveryListUser { private static Logger log = LoggerFactory.getLogger(DiscoveryListUser.class); - //private final static String NAME_SERVICE_ALL_USERNAMES = "2/users/get-all-usernames?gcube-token"; - private final static String NAME_SERVICE_ALL_USERNAMES = "2/users/get-all-fullnames-and-usernames?gcube-token"; diff --git a/src/main/java/org/gcube/resource/management/quota/manager/util/SendNotification.java b/src/main/java/org/gcube/resource/management/quota/manager/util/SendNotification.java index c1554d3..4e5435d 100644 --- a/src/main/java/org/gcube/resource/management/quota/manager/util/SendNotification.java +++ b/src/main/java/org/gcube/resource/management/quota/manager/util/SendNotification.java @@ -34,7 +34,7 @@ public class SendNotification { private DiscoveryConfiguration discoveryCheck; private final static String WRITE_MESSAGE = "2/messages/write-message"; - //private final static String NAME_USERNAME_GLOBAL_ROLE = "2/users/get-usernames-by-global-role?role-name=Administrator&gcube-token"; + private final static String NAME_USERNAME_GLOBAL_ROLE = "2/users/get-usernames-by-global-role";//?role-name=Administrator&gcube-token"; private static Logger log = LoggerFactory.getLogger(QuotaUsage.class); public SendNotification(DiscoveryConfiguration discoveryCheck){ @@ -79,8 +79,7 @@ public class SendNotification { String token = SecurityTokenProvider.instance.get(); JSONObject urlParameters = new JSONObject(); List user=new ArrayList(); - user.add("alessandro.pieve"); - //user.add(identifier); + user.add(identifier); urlParameters.put("recipients", user); urlParameters.put("body", body); urlParameters.put("subject", subject); @@ -114,7 +113,7 @@ public class SendNotification { String context = ScopeProvider.instance.get(); DiscoveryService discoveryList= new DiscoveryService(context); - //List sendersList=sendersList(discoveryList.getBasePath()+NAME_USERNAME_GLOBAL_ROLE,token,discoveryCheck.getRoleNotifier()); + List sendersList=sendersList(discoveryList.getBasePath()+NAME_USERNAME_GLOBAL_ROLE,token,discoveryCheck.getRoleNotifier()); configure(identifier, quotaAssigned, quotaUsage, percent); String text=CleanNotification(discoveryCheck.getTextQuotaAdminExceed()); @@ -132,16 +131,9 @@ public class SendNotification { JSONObject urlParameters = new JSONObject(); List user=new ArrayList(); - //identifier="alessandro.pieve"; - - List sendersList =new ArrayList(); - sendersList.add("alessandro.pieve"); - //sendersList.add("scarponi"); for (String cc :sendersList){ user.add(cc); } - - //user.add(identifier); urlParameters.put("recipients", user); urlParameters.put("body", text); urlParameters.put("subject", discoveryCheck.getTextQuotaAdminExceedSubject());