Merge "Function.java-sonar fix"

diff --combined auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
index 89643c4,e1ac77c..0d5c487
--- 1/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
--- 2/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 +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,8 -297,7 +297,8 @@@
          }
  
          // 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);
          }