Merge "Function.java-sonar fix"

[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / hl / Function.java

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
index d809618..0d5c487 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
@@ -96,10 +96,10 @@ public class Function {
         E("Executed"),D("Denied"),P("Pending"),L("Lapsed");
 
         private String desc;
-        public final static Result<OP_STATUS> RE = Result.ok(OP_STATUS.E);
-        public final static Result<OP_STATUS> RD = Result.ok(OP_STATUS.D);
-        public final static Result<OP_STATUS> RP = Result.ok(OP_STATUS.P);
-        public final static Result<OP_STATUS> RL = Result.ok(OP_STATUS.L);
+        public static final Result<OP_STATUS> RE = Result.ok(OP_STATUS.E);
+        public static final Result<OP_STATUS> RD = Result.ok(OP_STATUS.D);
+        public static final Result<OP_STATUS> RP = Result.ok(OP_STATUS.P);
+        public static final Result<OP_STATUS> RL = Result.ok(OP_STATUS.L);
 
         private OP_STATUS(String desc) {
             this.desc = desc;
@@ -297,7 +297,8 @@ public class Function {
         }
 
         // VALIDATIONS done... Add NS
-        if ((rq = q.nsDAO().create(trans, namespace.data())).notOK()) {
+        rq = q.nsDAO().create(trans, namespace.data());
+        if (rq.notOK()) {
             return Result.err(rq);
         }