git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/resource-management/quota-manager@142704 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
45e3a42c37
commit
32eadfff7b
|
@ -23,8 +23,6 @@ import com.google.gson.Gson;
|
||||||
public class DiscoveryListUser {
|
public class DiscoveryListUser {
|
||||||
|
|
||||||
private static Logger log = LoggerFactory.getLogger(DiscoveryListUser.class);
|
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";
|
private final static String NAME_SERVICE_ALL_USERNAMES = "2/users/get-all-fullnames-and-usernames?gcube-token";
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class SendNotification {
|
||||||
|
|
||||||
private DiscoveryConfiguration discoveryCheck;
|
private DiscoveryConfiguration discoveryCheck;
|
||||||
private final static String WRITE_MESSAGE = "2/messages/write-message";
|
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);
|
private static Logger log = LoggerFactory.getLogger(QuotaUsage.class);
|
||||||
|
|
||||||
public SendNotification(DiscoveryConfiguration discoveryCheck){
|
public SendNotification(DiscoveryConfiguration discoveryCheck){
|
||||||
|
@ -79,8 +79,7 @@ public class SendNotification {
|
||||||
String token = SecurityTokenProvider.instance.get();
|
String token = SecurityTokenProvider.instance.get();
|
||||||
JSONObject urlParameters = new JSONObject();
|
JSONObject urlParameters = new JSONObject();
|
||||||
List<String> user=new ArrayList<String>();
|
List<String> user=new ArrayList<String>();
|
||||||
user.add("alessandro.pieve");
|
user.add(identifier);
|
||||||
//user.add(identifier);
|
|
||||||
urlParameters.put("recipients", user);
|
urlParameters.put("recipients", user);
|
||||||
urlParameters.put("body", body);
|
urlParameters.put("body", body);
|
||||||
urlParameters.put("subject", subject);
|
urlParameters.put("subject", subject);
|
||||||
|
@ -114,7 +113,7 @@ public class SendNotification {
|
||||||
String context = ScopeProvider.instance.get();
|
String context = ScopeProvider.instance.get();
|
||||||
|
|
||||||
DiscoveryService discoveryList= new DiscoveryService(context);
|
DiscoveryService discoveryList= new DiscoveryService(context);
|
||||||
//List<String> sendersList=sendersList(discoveryList.getBasePath()+NAME_USERNAME_GLOBAL_ROLE,token,discoveryCheck.getRoleNotifier());
|
List<String> sendersList=sendersList(discoveryList.getBasePath()+NAME_USERNAME_GLOBAL_ROLE,token,discoveryCheck.getRoleNotifier());
|
||||||
configure(identifier, quotaAssigned, quotaUsage, percent);
|
configure(identifier, quotaAssigned, quotaUsage, percent);
|
||||||
|
|
||||||
String text=CleanNotification(discoveryCheck.getTextQuotaAdminExceed());
|
String text=CleanNotification(discoveryCheck.getTextQuotaAdminExceed());
|
||||||
|
@ -132,16 +131,9 @@ public class SendNotification {
|
||||||
|
|
||||||
JSONObject urlParameters = new JSONObject();
|
JSONObject urlParameters = new JSONObject();
|
||||||
List<String> user=new ArrayList<String>();
|
List<String> user=new ArrayList<String>();
|
||||||
//identifier="alessandro.pieve";
|
|
||||||
|
|
||||||
List<String> sendersList =new ArrayList<String>();
|
|
||||||
sendersList.add("alessandro.pieve");
|
|
||||||
//sendersList.add("scarponi");
|
|
||||||
for (String cc :sendersList){
|
for (String cc :sendersList){
|
||||||
user.add(cc);
|
user.add(cc);
|
||||||
}
|
}
|
||||||
|
|
||||||
//user.add(identifier);
|
|
||||||
urlParameters.put("recipients", user);
|
urlParameters.put("recipients", user);
|
||||||
urlParameters.put("body", text);
|
urlParameters.put("body", text);
|
||||||
urlParameters.put("subject", discoveryCheck.getTextQuotaAdminExceedSubject());
|
urlParameters.put("subject", discoveryCheck.getTextQuotaAdminExceedSubject());
|
||||||
|
|
Loading…
Reference in New Issue