Merge "Moved null ref check to line before dereferencing"

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / aaf / v2_0 / AAFAuthn.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
index edacdfd..ec0875c 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
@@ -30,7 +30,6 @@ import org.onap.aaf.cadi.User;
 import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
-import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.lur.ConfigPrincipal;
 
 public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
@@ -95,8 +94,8 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
         byte[] bytes = password.getBytes();
         User<AAFPermission> usr = getUser(user,bytes);
 
-        if(usr != null && !usr.permExpired()) {
-            if(usr.principal==null) {
+        if (usr != null && !usr.permExpired()) {
+            if (usr.principal==null) {
                 return "User already denied";
             } else {
                 return null; // good
@@ -108,7 +107,7 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
         // Statement
         switch(cp.revalidate(state)) {
             case REVALIDATED:
-                if(usr!=null) {
+                if (usr!=null) {
                     usr.principal = cp;
                 } else {
                     addUser(new User<AAFPermission>(cp,con.timeout));
@@ -118,7 +117,7 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
                 return "AAF Inaccessible";
             case UNVALIDATED:
                 addUser(new User<AAFPermission>(user,bytes,con.timeout));
-                return "User/Pass combo invalid for " + user;
+                return "user/pass combo invalid for " + user;
             case DENIED:
                 return "AAF denies API for " + user;
             default: 
@@ -139,13 +138,13 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
         public Resp revalidate(Object state) {
             try {
                 Miss missed = missed(getName(),getCred());
-                if(missed==null || missed.mayContinue()) {
-                    Rcli<CLIENT> client = con.client(Config.AAF_DEFAULT_VERSION).forUser(con.basicAuth(getName(), new String(getCred())));
+                if (missed==null || missed.mayContinue()) {
+                    Rcli<CLIENT> client = con.client().forUser(con.basicAuth(getName(), new String(getCred())));
                     Future<String> fp = client.read(
                             "/authn/basicAuth",
                             "text/plain"
                             );
-                    if(fp.get(con.timeout)) {
+                    if (fp.get(con.timeout)) {
                         expires = System.currentTimeMillis() + timeToLive;
                         addUser(new User<AAFPermission>(this, expires));
                         return Resp.REVALIDATED;