X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2Fmapper%2FMapper_2_0.java;h=26216c65f9870f03cc888bd1afbae7c28a5e1610;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=44ad7fcb65769ec74b51482b2bb92ed0990beed6;hpb=078325f8ef05a6216292f5331ef0805a5bdd9ef1;p=aaf%2Fauthz.git

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java
index 44ad7fcb..26216c65 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java
@@ -367,30 +367,30 @@ public class Mapper_2_0 implements Mapper<Nss, Perms, Pkey, Roles, Users, UserRo
         PermRequest from = (PermRequest)req;
         String type = from.getType();
         if(type==null) {
-        	return Result.err(Result.ERR_BadData, "Invalid Perm Type");
+            return Result.err(Result.ERR_BadData, "Invalid Perm Type");
         }
         PermDAO.Data pd = new PermDAO.Data();
         if(type.contains("@")) {
-        	String[] split = Split.splitTrim(':', type);
-        	pd.ns = split[0];
-        	pd.type=split.length>1?split[1]:"";
-        	pd.instance = from.getInstance();
-        	pd.action = from.getAction();
-        	pd.description = from.getDescription();
-        	return Result.ok(pd);
+            String[] split = Split.splitTrim(':', type);
+            pd.ns = split[0];
+            pd.type=split.length>1?split[1]:"";
+            pd.instance = from.getInstance();
+            pd.action = from.getAction();
+            pd.description = from.getDescription();
+            return Result.ok(pd);
         }  else {
-	        Result<NsSplit> nss = q.deriveNsSplit(trans, from.getType());
-	        if (nss.isOK()) { 
-	            pd.ns=nss.value.ns;
-	            pd.type = nss.value.name;
-	            pd.instance = from.getInstance();
-	            pd.action = from.getAction();
-	            pd.description = from.getDescription();
-	            trans.checkpoint(pd.fullPerm(), Env.ALWAYS);
-	            return Result.ok(pd);
-	        } else {
-	            return Result.err(nss);
-	        }
+            Result<NsSplit> nss = q.deriveNsSplit(trans, from.getType());
+            if (nss.isOK()) { 
+                pd.ns=nss.value.ns;
+                pd.type = nss.value.name;
+                pd.instance = from.getInstance();
+                pd.action = from.getAction();
+                pd.description = from.getDescription();
+                trans.checkpoint(pd.fullPerm(), Env.ALWAYS);
+                return Result.ok(pd);
+            } else {
+                return Result.err(nss);
+            }
         }
     }
     
@@ -526,25 +526,23 @@ public class Mapper_2_0 implements Mapper<Nss, Perms, Pkey, Roles, Users, UserRo
         to.ns = Question.domain2ns(to.id);
         to.type = from.getType();
         if(to.type!=null && to.type==CredDAO.FQI) {
-        	to.cred = null;
+            to.cred = null;
         } else {
-        	String passwd = from.getPassword();
-	        if (requiresPass) {
-	            String ok = trans.org().isValidPassword(trans, to.id,passwd);
-	            if (ok.length()>0) {
-	                return Result.err(Status.ERR_BadData,ok);
-	            }
-	        } else {
-	            to.type=0;
-	        }
-	        if (passwd != null) {
-	            to.cred = ByteBuffer.wrap(passwd.getBytes());
-	            to.type = CredDAO.RAW; 
-	        } else {
-	            to.type = CredDAO.FQI;
-	        }
-        }
-	        
+            String passwd = from.getPassword();
+            if (requiresPass) {
+                String ok = trans.org().isValidPassword(trans, to.id,passwd);
+                if (ok.length()>0) {
+                    return Result.err(Status.ERR_BadData,ok);
+                }
+            }
+            if (passwd != null) {
+                to.cred = ByteBuffer.wrap(passwd.getBytes());
+                to.type = CredDAO.RAW; 
+            } else {
+                to.type = CredDAO.NONE;
+            }
+        }
+            
         // Note: Ensure requested EndDate created will match Organization Password Rules
         //  P.S. Do not apply TempPassword rule here. Do that when you know you are doing a Create/Reset (see Service)
         to.expires = getExpires(trans.org(),Expiration.Password,base,from.getId());