X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Factions%2FPermModify.java;h=a3d4bb6d92395e0d712e35ac77a99d513d8b210c;hb=refs%2Fchanges%2F87%2F65287%2F1;hp=bc6f70ca75b884f06acadaeecc29d1d6aae25c96;hpb=ead32f193586e39b59bb366bddf70e665173a52d;p=aaf%2Fauthz.git diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java index bc6f70ca..a3d4bb6d 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java @@ -48,35 +48,35 @@ public class PermModify extends ActionDAO { @Override public Result exec(AuthzTrans trans, final Perm p, final Modify modify) { Result> rr = q.permDAO.read(trans, p.ns,p.type,p.instance,p.action); - if(dryRun) { - if(rr.isOKhasData()) { + if (dryRun) { + if (rr.isOKhasData()) { return Result.ok(rr.value.get(0)); } else { return Result.err(Result.ERR_NotFound, "Data not Found " + p.toString()); } } else { Result rv = null; - if(rr.isOKhasData()) { - for(final Data d : rr.value) { + if (rr.isOKhasData()) { + for (final Data d : rr.value) { modify.change(d); - if(d.ns.equals(p.ns) && d.type.equals(p.type) && d.instance.equals(p.instance) && d.action.equals(p.action)) { + if (d.ns.equals(p.ns) && d.type.equals(p.type) && d.instance.equals(p.instance) && d.action.equals(p.action)) { // update for fields // In either case, adjust Permissions - for(String r : d.roles) { - if(!p.roles.contains(r)) { + for (String r : d.roles) { + if (!p.roles.contains(r)) { q.permDAO.dao().addRole(trans, d, r); } } - for(String r : p.roles) { - if(!d.roles.contains(r)) { + for (String r : p.roles) { + if (!d.roles.contains(r)) { q.permDAO.dao().delRole(trans, d, r); } } rv = Result.ok(d); } else { - for(String r : d.roles) { + for (String r : d.roles) { Role role = Role.keys.get(r); - if(role.perms.contains(p.encode())) { + if (role.perms.contains(p.encode())) { modify.roleModify().exec(trans, role, new RoleModify.Modify() { @Override public PermModify permModify() { @@ -93,7 +93,7 @@ public class PermModify extends ActionDAO { } rv = q.permDAO.create(trans, d); - if(rv.isOK()) { + if (rv.isOK()) { PermDAO.Data pdd = new PermDAO.Data(); pdd.ns = p.ns; pdd.type = p.type; @@ -112,7 +112,7 @@ public class PermModify extends ActionDAO { } else { rv = Result.err(rr); } - if(rv==null) { + if (rv==null) { rv = Result.err(Status.ERR_General,"Never get to this code"); } @@ -126,7 +126,7 @@ public class PermModify extends ActionDAO { } public Result delete(AuthzTrans trans, Perm p) { - if(dryRun) { + if (dryRun) { return Result.ok(); } else { PermDAO.Data data = new PermDAO.Data();