From eb9165705a614af7b98ee6b643f871eab1284976 Mon Sep 17 00:00:00 2001 From: Pawel Date: Fri, 23 Nov 2018 05:23:01 -0500 Subject: refactor in AuthzCassServiceImpl.java Change-Id: Icb04ac81ee11dbc8da1970a59fa03d5af75335aa Issue-ID: AAF-643 Signed-off-by: Pawel --- .../main/java/org/onap/aaf/auth/cmd/user/List.java | 21 ++---- .../aaf/auth/service/AuthzCassServiceImpl.java | 82 +++++++--------------- 2 files changed, 33 insertions(+), 70 deletions(-) diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java index 3074ab86..6733989e 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java @@ -50,14 +50,11 @@ public class List extends BaseCmd { reportHead(str); int idx = 0; java.util.List sorted = users.getUser(); - Collections.sort(sorted, new Comparator() { - @Override - public int compare(aaf.v2_0.Users.User u1, aaf.v2_0.Users.User u2) { - if (u1==null || u2 == null) { - return -1; - } - return u1.getId().compareTo(u2.getId()); + Collections.sort(sorted, (Comparator) (u1, u2) -> { + if (u1==null || u2 == null) { + return -1; } + return u1.getId().compareTo(u2.getId()); }); String format = reportColHead("%-40s %-10s %-30s\n","User","Type","Expires"); String date = "XXXX-XX-XX"; @@ -77,13 +74,9 @@ public class List extends BaseCmd { reportHead(title,id); String format = reportColHead(" %-20s %-20s %-11s %-6s %12s\n","User","Approver","Type","Status","Updated"); java.util.List lapp = approvals.getApprovals(); - Collections.sort(lapp, new Comparator() { - @Override - public int compare(Approval a1, Approval a2) { - return a1.getTicket().compareTo(a2.getTicket()); - } - } ); - String ticket = null, prev = null; + Collections.sort(lapp, (Comparator) (a1, a2) -> a1.getTicket().compareTo(a2.getTicket())); + String ticket = null; + String prev = null; for (Approval app : lapp ) { ticket = app.getTicket(); if (!ticket.equals(prev)) { diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java index 789a2e65..67bf3b50 100644 --- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java +++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java @@ -2137,13 +2137,8 @@ public class AuthzCassServiceImpl fd = mapper.future(trans,RoleDAO.TABLE,from,role,false, - new Mapper.Memo() { - @Override - public String get() { - return "Delete Role [" + role.fullName() + ']' - + " and all attached user roles"; - } - }, + () -> "Delete Role [" + role.fullName() + ']' + + " and all attached user roles", new MayChange() { private Result nsd; @Override @@ -2753,12 +2748,7 @@ public class AuthzCassServiceImpl value) { // ensure credentials are sorted so we can fully automate Cred regression test - Collections.sort(value, new Comparator() { - @Override - public int compare(CredDAO.Data cred1, CredDAO.Data cred2) { - return cred1.expires.compareTo(cred2.expires); - } - }); + Collections.sort(value, (cred1, cred2) -> cred1.expires.compareTo(cred2.expires)); String [] vars = new String[value.size()+1]; vars[0]="Choice"; for (int i = 0; i < value.size(); i++) { @@ -2864,15 +2854,10 @@ public class AuthzCassServiceImpl fd = mapper.future(trans,CredDAO.TABLE,from,cred.value,false, - new Mapper.Memo() { - @Override - public String get() { - return "Delete Credential [" + - cred.value.id + - ']'; - } - }, + Result fd = mapper.future(trans,CredDAO.TABLE,from,cred.value,false, + () -> "Delete Credential [" + + cred.value.id + + ']', mc); Result> nsr = ques.nsDAO.read(trans, cred.value.ns); @@ -3033,14 +3018,9 @@ public class AuthzCassServiceImpl fd = mapper.future(trans,UserRoleDAO.TABLE,from,urr.value,true, // may request Approvals - new Mapper.Memo() { - @Override - public String get() { - return "Add User [" + userRole.user + "] to Role [" + - userRole.role + - ']'; - } - }, + () -> "Add User [" + userRole.user + "] to Role [" + + userRole.role + + ']', new MayChange() { private Result nsd; @Override @@ -3837,27 +3817,21 @@ public class AuthzCassServiceImpl fd = mapper.future(trans,DelegateDAO.TABLE,base, dd, false, - new Mapper.Memo() { - @Override - public String get() { - StringBuilder sb = new StringBuilder(); - sb.append(access.name()); - sb.setCharAt(0, Character.toUpperCase(sb.charAt(0))); - sb.append("Delegate "); - sb.append(access==Access.create?"[":"to ["); - sb.append(rd.value.delegate); - sb.append("] for ["); - sb.append(rd.value.user); - sb.append(']'); - return sb.toString(); - } + Result fd = mapper.future(trans,DelegateDAO.TABLE,base, dd, false, + () -> { + StringBuilder sb = new StringBuilder(); + sb.append(access.name()); + sb.setCharAt(0, Character.toUpperCase(sb.charAt(0))); + sb.append("Delegate "); + sb.append(access==Access.create?"[":"to ["); + sb.append(rd.value.delegate); + sb.append("] for ["); + sb.append(rd.value.user); + sb.append(']'); + return sb.toString(); }, - new MayChange() { - @Override - public Result mayChange() { - return Result.ok(); // Validate in code above - } + () -> { + return Result.ok(); // Validate in code above }); switch(fd.status) { @@ -4009,12 +3983,8 @@ public class AuthzCassServiceImpl add = curr.value; - apprByTicket = new Lookup>() { // Store a Pre-Lookup - @Override - public List get(AuthzTrans trans, Object ... noop) { - return add; - } - }; + // Store a Pre-Lookup + apprByTicket = (trans1, noop) -> add; } } else if (updt.id!=null) { curr = ques.approvalDAO.read(trans, updt); -- cgit 1.2.3-korg