X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2Ffacade%2FAuthzFacadeImpl.java;h=4b4fee71b132a8b4e7464fe51168cb130ebe085e;hb=9dab8be3addc9b1bcf650b35d3834f99200cb957;hp=e77e09088e8264a5475c48b53c50406dfcaf6b33;hpb=4c709df6500a95057a92ec3ea5c739738764388d;p=aaf%2Fauthz.git

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/facade/AuthzFacadeImpl.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/facade/AuthzFacadeImpl.java
index e77e0908..4b4fee71 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/facade/AuthzFacadeImpl.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/facade/AuthzFacadeImpl.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,9 @@ import static org.onap.aaf.auth.layer.Result.OK;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -66,9 +68,9 @@ import org.onap.aaf.auth.service.mapper.Mapper.API;
 import org.onap.aaf.cadi.aaf.client.Examples;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Data;
+import org.onap.aaf.misc.env.Data.TYPE;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
-import org.onap.aaf.misc.env.Data.TYPE;
 import org.onap.aaf.misc.env.util.Chrono;
 import org.onap.aaf.misc.rosetta.Marshal;
 import org.onap.aaf.misc.rosetta.env.RosettaDF;
@@ -78,7 +80,7 @@ import aaf.v2_0.Api;
 
 /**
  * AuthzFacade
- * 
+ *
  * This Service Facade encapsulates the essence of the API Service can do, and provides
  * a single created object for elements such as RosettaDF.
  *
@@ -89,14 +91,14 @@ import aaf.v2_0.Api;
  *         a) In the future, we may support multiple Response Formats, aka JSON or XML, based on User Request.
  * 4) Log Service info, warnings and exceptions as necessary
  * 5) When asked by the API layer, this will create and write Error content to the OutputStream
- * 
- * Note: This Class does NOT set the HTTP Status Code.  That is up to the API layer, so that it can be 
+ *
+ * Note: This Class does NOT set the HTTP Status Code.  That is up to the API layer, so that it can be
  * clearly coordinated with the API Documentation
- * 
+ *
  * @author Pavani & Jonathan
  *
  */
-public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERTS,KEYS,REQUEST,HISTORY,ERR,APPROVALS> extends FacadeImpl implements AuthzFacade 
+public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERTS,KEYS,REQUEST,HISTORY,ERR,APPROVALS> extends FacadeImpl implements AuthzFacade
     {
     private static final String FORBIDDEN = "Forbidden";
     private static final String NOT_FOUND = "Not Found";
@@ -133,14 +135,13 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         (nssDF                 = env.newDataFactory(service.mapper().getClass(API.NSS))).in(dataType).out(dataType);
         (permRequestDF         = env.newDataFactory(service.mapper().getClass(API.PERM_REQ))).in(dataType).out(dataType);
         (permsDF             = env.newDataFactory(service.mapper().getClass(API.PERMS))).in(dataType).out(dataType);
-//        (permKeyDF            = env.newDataFactory(service.mapper().getClass(API.PERM_KEY))).in(dataType).out(dataType);
+
         (roleDF             = env.newDataFactory(service.mapper().getClass(API.ROLES))).in(dataType).out(dataType);
         (roleRequestDF         = env.newDataFactory(service.mapper().getClass(API.ROLE_REQ))).in(dataType).out(dataType);
         (usersDF             = env.newDataFactory(service.mapper().getClass(API.USERS))).in(dataType).out(dataType);
         (userrolesDF             = env.newDataFactory(service.mapper().getClass(API.USER_ROLES))).in(dataType).out(dataType);
         (certsDF             = env.newDataFactory(service.mapper().getClass(API.CERTS))).in(dataType).out(dataType)
             .rootMarshal((Marshal<CERTS>) service.mapper().getMarshal(API.CERTS));
-        ;
         (userRoleRequestDF     = env.newDataFactory(service.mapper().getClass(API.USER_ROLE_REQ))).in(dataType).out(dataType);
         (rolePermRequestDF     = env.newDataFactory(service.mapper().getClass(API.ROLE_PERM_REQ))).in(dataType).out(dataType);
         (nsRequestDF         = env.newDataFactory(service.mapper().getClass(API.NS_REQ))).in(dataType).out(dataType);
@@ -153,14 +154,14 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         (errDF                 = env.newDataFactory(service.mapper().getClass(API.ERROR))).in(dataType).out(dataType);
         (apiDF                = env.newDataFactory(Api.class)).in(dataType).out(dataType);
     }
-    
+
     public Mapper<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERTS,KEYS,REQUEST,HISTORY,ERR,APPROVALS> mapper() {
         return service.mapper();
     }
-    
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#error(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, int)
-     * 
+     *
      * Note: Conforms to AT&T TSS RESTful Error Structure
      */
     @Override
@@ -169,15 +170,20 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         String msgId;
         String[] detail;
         boolean hidemsg = false;
-        if (result.variables==null) {
+        if (result.variables==null || result.variables.length<1) {
             detail = new String[1];
         } else {
-            int l = result.variables.length;
-            detail=new String[l+1];
-            System.arraycopy(result.variables, 0, detail, 1, l);
+            List<String> dlist = new ArrayList<>();
+            dlist.add(null);
+            String os;
+            for(Object s : result.variables) {
+                if(s!=null && (os=s.toString()).length()>0) {
+                    dlist.add(os);
+                }
+            }
+            detail = new String[dlist.size()];
+            dlist.toArray(detail);
         }
-        //int httpstatus;
-        
         switch(result.status) {
             case ERR_ActionNotCompleted:
                 msgId = "SVC1202";
@@ -207,7 +213,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 detail[0] = msg;
                 response.setStatus(/*httpstatus=*/403);
                 break;
-                
+
             case ERR_NsNotFound:
                 msgId = "SVC2404";
                 detail[0] = NOT_FOUND;
@@ -254,25 +260,25 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 detail[0] = NOT_ACCEPTABLE;
                 response.setStatus(/*httpstatus=*/406);
                 break;
-                
+
             case ERR_ConflictAlreadyExists:
                 msgId = "SVC1409";
                 detail[0] = "Conflict Already Exists";
                 response.setStatus(/*httpstatus=*/409);
                 break;
-            
+
             case ERR_DependencyExists:
                 msgId = "SVC1424";
                 detail[0] = "Failed Dependency";
                 response.setStatus(/*httpstatus=*/424);
                 break;
-            
+
             case ERR_NotImplemented:
                 msgId = "SVC1501";
-                detail[0] = "Not Implemented"; 
+                detail[0] = "Not Implemented";
                 response.setStatus(/*httpstatus=*/501);
                 break;
-                
+
             case Status.ACC_Future:
                 msgId = "SVC1202";
                 detail[0] = "Accepted for Future, pending Approvals";
@@ -280,20 +286,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 break;
             case ERR_ChoiceNeeded:
                 msgId = "SVC1300";
-                detail = new String[result.variables.length];
-                for(int i=0; i<result.variables.length;++i) {
-                	detail[i]=result.variables[i].toString();
-                }
+                detail[0] = "Choice Needed";
                 response.setStatus(/*httpstatus=*/300);
                 break;
-            case ERR_Backend: 
+            case ERR_Backend:
                 msgId = "SVC2500";
                 detail[0] = GENERAL_SERVICE_ERROR;
                 response.setStatus(/*httpstatus=*/500);
                 hidemsg = true;
                 break;
 
-            default: 
+            default:
                 msgId = "SVC1500";
                 detail[0] = GENERAL_SERVICE_ERROR;
                 response.setStatus(/*httpstatus=*/500);
@@ -305,7 +308,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             StringBuilder holder = new StringBuilder();
             ERR em = service.mapper().errorFromMessage(holder,msgId,msg,detail);
             trans.checkpoint(
-                    "ErrResp [" + 
+                    "ErrResp [" +
                     msgId +
                     "] " +
                     holder.toString(),
@@ -319,7 +322,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             trans.error().log(e,"unable to send response for",msg);
         }
     }
-    
+
     ///////////////////////////
     // Namespace
     ///////////////////////////
@@ -335,7 +338,8 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public static final String GET_NS_CHILDREN = "getNamespaceChildren";
     public static final String UPDATE_NS_DESC = "updateNamespaceDescription";
     public static final String DELETE_NS = "deleteNamespace";
-    
+    public static final String INVALID_INPUT = "Invalid Input";
+
 
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#createNS(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
@@ -352,17 +356,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 request = rd.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,CREATE_NS);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,CREATE_NS);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
-            
+
             Result<Void> rp = service.createNS(trans,request,type);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,nsRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+
+            if(rp.status == OK) {
+                setContentType(resp,nsRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,CREATE_NS);
@@ -380,14 +384,13 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(ADD_NS_ADMIN + ' ' + ns + ' ' + id, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.addAdminNS(trans,ns,id);
-            switch(rp.status) {
-                case OK: 
-                    //TODO Perms??
-                    setContentType(resp,nsRequestDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                //TODO Perms??
+                setContentType(resp,nsRequestDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,ADD_NS_ADMIN);
@@ -405,12 +408,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_NS_ADMIN + ' ' + ns + ' ' + id, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.delAdminNS(trans, ns, id);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,nsRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,nsRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_NS_ADMIN);
@@ -428,13 +430,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(ADD_NS_RESPONSIBLE + ' ' + ns + ' ' + id, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.addResponsibleNS(trans,ns,id);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,nsRequestDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,nsRequestDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,ADD_NS_RESPONSIBLE);
@@ -452,13 +453,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_NS_RESPONSIBLE + ' ' + ns + ' ' + id, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.delResponsibleNS(trans, ns, id);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,nsRequestDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,nsRequestDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_NS_RESPONSIBLE);
@@ -472,21 +472,20 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
      * @see com.att.authz.facade.AuthzFacade#getNSsByName(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
     @Override
-    public Result<Void> getNSsByName(AuthzTrans trans, HttpServletResponse resp, String ns) {
+    public Result<Void> getNSsByName(AuthzTrans trans, HttpServletResponse resp, String ns, boolean full) {
         TimeTaken tt = trans.start(GET_NS_BY_NAME + ' ' + ns, Env.SUB|Env.ALWAYS);
         try {
-            Result<NSS> rp = service.getNSbyName(trans, ns);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,nssDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            Result<NSS> rp = service.getNSbyName(trans, ns, full );
+            if(rp.status == OK) {
+                RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,nssDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_NS_BY_NAME);
@@ -495,7 +494,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
 //    TODO: uncomment when on cassandra 2.1.2 for MyNamespace GUI page
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getNSsByAdmin(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
@@ -505,17 +504,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_NS_BY_ADMIN + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<NSS> rp = service.getNSbyAdmin(trans, user, full);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,nssDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,nssDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_NS_BY_ADMIN);
@@ -524,7 +522,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
 //    TODO: uncomment when on cassandra 2.1.2 for MyNamespace GUI page
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getNSsByResponsible(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
@@ -534,18 +532,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_NS_BY_RESPONSIBLE + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<NSS> rp = service.getNSbyResponsible(trans, user, full);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
+            if(rp.status == OK){
+                RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
 
-                    setContentType(resp,nssDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                setContentType(resp,nssDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_NS_BY_RESPONSIBLE);
@@ -563,19 +560,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_NS_BY_EITHER + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<NSS> rp = service.getNSbyEither(trans, user, full);
-            
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
+            if(rp.status == OK) {
+                RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
 
-                    setContentType(resp,nssDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                setContentType(resp,nssDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_NS_BY_EITHER);
@@ -593,17 +588,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_NS_CHILDREN + ' ' + parent, Env.SUB|Env.ALWAYS);
         try {
             Result<NSS> rp = service.getNSsChildren(trans, parent);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,nssDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<NSS> data = nssDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,nssDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_NS_CHILDREN);
@@ -625,17 +619,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,UPDATE_NS_DESC);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,UPDATE_NS_DESC);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
             Result<Void> rp = service.updateNsDescription(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,nsRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,nsRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,UPDATE_NS_DESC);
@@ -644,7 +637,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     /*
      * (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#requestNS(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
@@ -654,12 +647,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_NS + ' ' + ns, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.deleteNS(trans,ns);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,nsRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,nsRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_NS);
@@ -669,11 +661,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         }
     }
 
-    private final static String NS_CREATE_ATTRIB = "nsCreateAttrib";
-    private final static String NS_UPDATE_ATTRIB = "nsUpdateAttrib";
-    private final static String READ_NS_BY_ATTRIB = "readNsByAttrib";
-    private final static String NS_DELETE_ATTRIB = "nsDeleteAttrib";
-    
+    private static final  String NS_CREATE_ATTRIB = "nsCreateAttrib";
+    private static final  String NS_UPDATE_ATTRIB = "nsUpdateAttrib";
+    private static final  String READ_NS_BY_ATTRIB = "readNsByAttrib";
+    private static final  String NS_DELETE_ATTRIB = "nsDeleteAttrib";
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#createAttribForNS(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String, java.lang.String, java.lang.String)
      */
@@ -682,13 +674,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(NS_CREATE_ATTRIB + ' ' + ns + ':'+key+':'+value, Env.SUB|Env.ALWAYS);
         try {
             Result<?> rp = service.createNsAttrib(trans,ns,key,value);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp, keysDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp, keysDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,NS_CREATE_ATTRIB);
@@ -706,17 +697,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(READ_NS_BY_ATTRIB + ' ' + key, Env.SUB|Env.ALWAYS);
         try {
             Result<KEYS> rp = service.readNsByAttrib(trans, key);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<KEYS> data = keysDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,keysDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<KEYS> data = keysDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,keysDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,READ_NS_BY_ATTRIB);
@@ -734,13 +724,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(NS_UPDATE_ATTRIB + ' ' + ns + ':'+key+':'+value, Env.SUB|Env.ALWAYS);
         try {
             Result<?> rp = service.updateNsAttrib(trans,ns,key,value);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp, keysDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp, keysDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,NS_UPDATE_ATTRIB);
@@ -759,13 +748,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(NS_DELETE_ATTRIB + ' ' + ns + ':'+key, Env.SUB|Env.ALWAYS);
         try {
             Result<?> rp = service.deleteNsAttrib(trans,ns,key);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp, keysDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp, keysDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,NS_DELETE_ATTRIB);
@@ -790,14 +778,14 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public static final String UPDATE_PERM_DESC = "updatePermissionDescription";
     public static final String SET_PERMISSION_ROLES_TO = "setPermissionRolesTo";
     public static final String DELETE_PERMISSION = "deletePermission";
-    
+
     /*
      * (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#createOrUpdatePerm(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, boolean, java.lang.String, java.lang.String, java.lang.String)
      */
     @Override
     public Result<Void> createPerm(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
-        TimeTaken tt = trans.start( CREATE_PERMISSION, Env.SUB|Env.ALWAYS);    
+        TimeTaken tt = trans.start( CREATE_PERMISSION, Env.SUB|Env.ALWAYS);
         try {
             REQUEST rreq;
             try {
@@ -805,19 +793,18 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 if (Question.willSpecialLog(trans, trans.user())) {
                     Question.logEncryptTrace(trans,data.asString());
                 }
-                rreq = data.asObject();            
+                rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,CREATE_PERMISSION);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,CREATE_PERMISSION);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
-            
+
             Result<Void> rp = service.createPerm(trans,rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,CREATE_PERMISSION);
@@ -826,7 +813,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getChildPerms(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
@@ -834,20 +821,19 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public Result<Void> getPermsByType(AuthzTrans trans, HttpServletResponse resp, String perm) {
         TimeTaken tt = trans.start(GET_PERMS_BY_TYPE + ' ' + perm, Env.SUB|Env.ALWAYS);
         try {
-            
+
             Result<PERMS> rp = service.getPermsByType(trans, perm);
-            switch(rp.status) {
-                case OK:
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMS_BY_TYPE);
@@ -856,28 +842,27 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
-    public Result<Void> getPermsByName(AuthzTrans trans, HttpServletResponse resp, 
+    public Result<Void> getPermsByName(AuthzTrans trans, HttpServletResponse resp,
             String type, String instance, String action) {
-        
+
         TimeTaken tt = trans.start(GET_PERMS_BY_NAME + ' ' + type
                 + '|' + instance + '|' + action, Env.SUB|Env.ALWAYS);
         try {
-            
+
             Result<PERMS> rp = service.getPermsByName(trans, type, instance, action);
-            switch(rp.status) {
-                case OK:
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMS_BY_TYPE);
@@ -895,18 +880,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_PERMISSIONS_BY_USER + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<PERMS> rp = service.getPermsByUser(trans, user);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMISSIONS_BY_USER, user);
@@ -915,7 +899,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getPermissionByUser(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
@@ -924,18 +908,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_PERMISSIONS_BY_USER_SCOPE + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<PERMS> rp = service.getPermsByUserScope(trans, user, scopes);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMISSIONS_BY_USER_SCOPE, user);
@@ -946,7 +929,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     }
 
 
-    
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getPermissionByUser(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
@@ -960,25 +943,24 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 if (Question.willSpecialLog(trans, trans.user())) {
                     Question.logEncryptTrace(trans,data.asString());
                 }
-                perms = data.asObject();            
+                perms = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,GET_PERMISSIONS_BY_USER_WITH_QUERY);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,GET_PERMISSIONS_BY_USER_WITH_QUERY);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
 
             Result<PERMS> rp = service.getPermsByUser(trans, perms, user);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMISSIONS_BY_USER_WITH_QUERY , user);
@@ -988,7 +970,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         }
     }
 
-    
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getPermissionsForRole(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
@@ -997,18 +979,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_PERMISSIONS_BY_ROLE + ' ' + roleName, Env.SUB|Env.ALWAYS);
         try {
             Result<PERMS> rp = service.getPermsByRole(trans, roleName);
-            switch(rp.status) {
-                case OK:
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMISSIONS_BY_ROLE);
@@ -1017,24 +998,23 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> getPermsByNS(AuthzTrans trans,HttpServletResponse resp,String ns) {
         TimeTaken tt = trans.start(GET_PERMISSIONS_BY_NS + ' ' + ns, Env.SUB|Env.ALWAYS);
         try {
             Result<PERMS> rp = service.getPermsByNS(trans, ns);
-            switch(rp.status) {
-                case OK:
-                    RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<PERMS> data = permsDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_PERMISSIONS_BY_NS);
@@ -1052,7 +1032,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public Result<Void> renamePerm(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp,
             String origType, String origInstance, String origAction) {
         String cmdDescription = UPDATE_PERMISSION;
-        TimeTaken tt = trans.start( cmdDescription    + ' ' + origType + ' ' + origInstance + ' ' + origAction, Env.SUB|Env.ALWAYS);    
+        TimeTaken tt = trans.start( cmdDescription    + ' ' + origType + ' ' + origInstance + ' ' + origAction, Env.SUB|Env.ALWAYS);
         try {
             REQUEST rreq;
             try {
@@ -1060,19 +1040,18 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 if (Question.willSpecialLog(trans, trans.user())) {
                     Question.logEncryptTrace(trans,data.asString());
                 }
-                rreq = data.asObject();            
+                rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,cmdDescription);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,cmdDescription);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
-            
+
             Result<Void> rp = service.renamePerm(trans,rreq, origType, origInstance, origAction);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,cmdDescription);
@@ -1081,7 +1060,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> updatePermDescription(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(UPDATE_PERM_DESC, Env.SUB|Env.ALWAYS);
@@ -1094,17 +1073,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,UPDATE_PERM_DESC);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,UPDATE_PERM_DESC);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
             Result<Void> rp = service.updatePermDescription(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,UPDATE_PERM_DESC);
@@ -1113,8 +1091,8 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
-    
+
+
     @Override
     public Result<Void> resetPermRoles(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(SET_PERMISSION_ROLES_TO, Env.SUB|Env.ALWAYS);
@@ -1127,18 +1105,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN, SET_PERMISSION_ROLES_TO);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN, SET_PERMISSION_ROLES_TO);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
-            
+
             Result<Void> rp = service.resetPermRoles(trans, rreq);
-            
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,SET_PERMISSION_ROLES_TO);
@@ -1147,7 +1123,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> deletePerm(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(DELETE_PERMISSION, Env.SUB|Env.ALWAYS);
@@ -1160,18 +1136,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,DELETE_PERMISSION);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,DELETE_PERMISSION);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
 
             Result<Void> rp = service.deletePerm(trans,rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_PERMISSION);
@@ -1186,12 +1161,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_PERMISSION + type + ' ' + instance + ' ' + action, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.deletePerm(trans,type,instance,action);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_PERMISSION);
@@ -1207,7 +1181,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public static final String GET_ROLES_BY_NAME_ONLY = "getRolesByNameOnly";
     public static final String GET_ROLES_BY_NAME = "getRolesByName";
     public static final String GET_ROLES_BY_PERM = "getRolesByPerm";
-    public static final String UPDATE_ROLE_DESC = "updateRoleDescription"; 
+    public static final String UPDATE_ROLE_DESC = "updateRoleDescription";
     public static final String ADD_PERM_TO_ROLE = "addPermissionToRole";
     public static final String DELETE_PERM_FROM_ROLE = "deletePermissionFromRole";
     public static final String UPDATE_MGTPERM_ROLE = "updateMgtPermRole";
@@ -1226,17 +1200,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,CREATE_ROLE);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,CREATE_ROLE);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
             Result<Void> rp = service.createRole(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,roleRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,roleRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,CREATE_ROLE);
@@ -1254,18 +1227,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_ROLES_BY_NAME + ' ' + role, Env.SUB|Env.ALWAYS);
         try {
             Result<ROLES> rp = service.getRolesByName(trans, role);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,roleDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,roleDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_ROLES_BY_NAME);
@@ -1283,18 +1255,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_ROLES_BY_USER + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<ROLES> rp = service.getRolesByUser(trans, user);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,roleDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,roleDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_ROLES_BY_USER, user);
@@ -1312,22 +1283,21 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_ROLES_BY_NS + ' ' + ns, Env.SUB|Env.ALWAYS);
         try {
             Result<ROLES> rp = service.getRolesByNS(trans, ns);
-            switch(rp.status) {
-                case OK: 
-                    if (!rp.isEmpty()) {
-                        RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
-                        if (Question.willSpecialLog(trans, trans.user())) {
-                            Question.logEncryptTrace(trans,data.asString());
-                        }
-                        data.to(resp.getOutputStream());
-                    } else {
-                        Question.logEncryptTrace(trans, NO_DATA);
+            if(rp.status == OK) {
+                if (!rp.isEmpty()) {
+                    RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
+                    if (Question.willSpecialLog(trans, trans.user())) {
+                        Question.logEncryptTrace(trans,data.asString());
                     }
-                    setContentType(resp,roleDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                    data.to(resp.getOutputStream());
+                } else {
+                    Question.logEncryptTrace(trans, NO_DATA);
+                }
+                setContentType(resp,roleDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_ROLES_BY_NS);
@@ -1346,23 +1316,23 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_ROLES_BY_NAME_ONLY + ' ' + nameOnly, Env.SUB|Env.ALWAYS);
         try {
             Result<ROLES> rp = service.getRolesByNameOnly(trans, nameOnly);
-            switch(rp.status) {
-                case OK: 
-                    if (!rp.isEmpty()) {
-                        RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
-                        if (Question.willSpecialLog(trans, trans.user())) {
-                            Question.logEncryptTrace(trans,data.asString());
-                        }
-                        data.to(resp.getOutputStream());
-                    } else {
-                        Question.logEncryptTrace(trans, NO_DATA);
+            if(rp.status == OK) {
+                if (!rp.isEmpty()) {
+                    RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
+                    if (Question.willSpecialLog(trans, trans.user())) {
+                        Question.logEncryptTrace(trans,data.asString());
                     }
-                    setContentType(resp,roleDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                    data.to(resp.getOutputStream());
+                } else {
+                    Question.logEncryptTrace(trans, NO_DATA);
+                }
+                setContentType(resp,roleDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
+
         } catch (Exception e) {
             trans.error().log(e,IN,GET_ROLES_BY_NAME_ONLY);
             return Result.err(e);
@@ -1379,18 +1349,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_ROLES_BY_PERM + type +' '+instance+' '+action, Env.SUB|Env.ALWAYS);
         try {
             Result<ROLES> rp = service.getRolesByPerm(trans, type,instance,action);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,roleDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<ROLES> data = roleDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,roleDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_ROLES_BY_PERM);
@@ -1416,17 +1385,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,UPDATE_ROLE_DESC);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,UPDATE_ROLE_DESC);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
             Result<Void> rp = service.updateRoleDescription(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,roleRequestDF.getOutType());
-                    return Result.ok();
-                default:
-                    return rp;
+            if(rp.status == OK) {
+                setContentType(resp,roleRequestDF.getOutType());
+                return Result.ok();
+            }else{
+                return rp;
             }
         } catch (Exception e) {
             trans.error().log(e,IN,UPDATE_ROLE_DESC);
@@ -1448,18 +1416,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,ADD_PERM_TO_ROLE);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,ADD_PERM_TO_ROLE);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
             Result<Void> rp = service.addPermToRole(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,ADD_PERM_TO_ROLE);
@@ -1481,18 +1448,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,DELETE_PERM_FROM_ROLE);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,DELETE_PERM_FROM_ROLE);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
 
             }
             Result<Void> rp = service.delPermFromRole(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_PERM_FROM_ROLE);
@@ -1511,13 +1477,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_PERM_FROM_ROLE, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.delPermFromRole(trans, role, type, instance, action);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    resp.getOutputStream().println();
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                resp.getOutputStream().println();
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_PERM_FROM_ROLE);
@@ -1532,12 +1497,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_ROLE + ' ' + role, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.deleteRole(trans, role);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_ROLE);
@@ -1559,17 +1523,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 }
                 rreq = data.asObject();
             } catch (APIException e) {
-                trans.error().log("Invalid Input",IN,CREATE_ROLE);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                trans.error().log(INVALID_INPUT,IN,CREATE_ROLE);
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
 
             Result<Void> rp = service.deleteRole(trans, rreq);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_ROLE);
@@ -1587,13 +1550,14 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public static final String DELETE_CRED = "deleteUserCred";
     public static final String DOES_CRED_MATCH = "doesCredMatch";
     public static final String VALIDATE_BASIC_AUTH = "validateBasicAuth";
+    public static final String BAD_INPUT_DATA = "Bad Input data";
 
 
 
     @Override
     /**
      * Create Credential
-     * 
+     *
      */
     public Result<Void> createUserCred(AuthzTrans trans, HttpServletRequest req) {
         TimeTaken tt = trans.start(CREATE_CRED, Env.SUB|Env.ALWAYS);
@@ -1604,8 +1568,8 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             }
             return service.createUserCred(trans, data.asObject());
         } catch (APIException e) {
-            trans.error().log(e,"Bad Input data");
-            return Result.err(Status.ERR_BadData, e.getLocalizedMessage());
+            trans.error().log(e,BAD_INPUT_DATA);
+            return Result.err(Result.ERR_BadData, e.getLocalizedMessage());
         } catch (Exception e) {
             trans.error().log(e,IN,CREATE_CRED);
             return Result.err(e);
@@ -1623,10 +1587,10 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 Question.logEncryptTrace(trans,data.asString());
             }
 
-            return service.changeUserCred(trans, data.asObject());
+            return service.resetUserCred(trans, data.asObject());
         } catch (APIException e) {
-            trans.error().log(e,"Bad Input data");
-            return Result.err(Status.ERR_BadData, e.getLocalizedMessage());
+            trans.error().log(e,BAD_INPUT_DATA);
+            return Result.err(Result.ERR_BadData, e.getLocalizedMessage());
         } catch (Exception e) {
             trans.error().log(e,IN,UPDATE_CRED);
             return Result.err(e);
@@ -1649,8 +1613,8 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
 
             return service.extendUserCred(trans, data.asObject(), days);
         } catch (APIException e) {
-            trans.error().log(e,"Bad Input data");
-            return Result.err(Status.ERR_BadData, e.getLocalizedMessage());
+            trans.error().log(e,BAD_INPUT_DATA);
+            return Result.err(Result.ERR_BadData, e.getLocalizedMessage());
         } catch (Exception e) {
             trans.error().log(e,IN,EXTEND_CRED);
             return Result.err(e);
@@ -1662,20 +1626,19 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     @Override
     public Result<Void> getCredsByNS(AuthzTrans trans, HttpServletResponse resp, String ns) {
         TimeTaken tt = trans.start(GET_CREDS_BY_NS + ' ' + ns, Env.SUB|Env.ALWAYS);
-        
+
         try {
             Result<USERS> ru = service.getCredsByNS(trans,ns);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans,trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
+            if(ru.status == OK) {
+                RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
+                if (Question.willSpecialLog(trans,trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_CREDS_BY_NS);
@@ -1683,30 +1646,29 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         } finally {
             tt.done();
         }
-        
+
     }
-    
-    
+
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getCredsByID(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
     @Override
     public Result<Void> getCredsByID(AuthzTrans trans, HttpServletResponse resp, String id) {
         TimeTaken tt = trans.start(GET_CREDS_BY_ID + ' ' + id, Env.SUB|Env.ALWAYS);
-        
+
         try {
             Result<USERS> ru = service.getCredsByID(trans,id);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
+            if(ru.status == OK) {
+                RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_CREDS_BY_ID);
@@ -1714,7 +1676,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         } finally {
             tt.done();
         }
-        
+
     }
 
     @Override
@@ -1728,17 +1690,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
 
             return service.deleteUserCred(trans, data.asObject());
         } catch (APIException e) {
-            trans.error().log(e,"Bad Input data");
-            return Result.err(Status.ERR_BadData, e.getLocalizedMessage());
+            trans.error().log(e,BAD_INPUT_DATA);
+            return Result.err(Result.ERR_BadData, e.getLocalizedMessage());
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_CRED);
             return Result.err(e);
         } finally {
             tt.done();
-        }    
+        }
     }
-    
-    
+
+
     @Override
     public Result<Date> doesCredentialMatch(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(DOES_CRED_MATCH, Env.SUB|Env.ALWAYS);
@@ -1750,14 +1712,14 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
 
             return service.doesCredentialMatch(trans, data.asObject());
         } catch (APIException e) {
-            trans.error().log(e,"Bad Input data");
-            return Result.err(Status.ERR_BadData, e.getLocalizedMessage());
+            trans.error().log(e,BAD_INPUT_DATA);
+            return Result.err(Result.ERR_BadData, e.getLocalizedMessage());
         } catch (IOException e) {
             trans.error().log(e,IN,DOES_CRED_MATCH);
             return Result.err(e);
         } finally {
             tt.done();
-        }    
+        }
     }
 
 
@@ -1766,10 +1728,9 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(VALIDATE_BASIC_AUTH, Env.SUB|Env.ALWAYS);
         try {
             Result<Date> result = service.validateBasicAuth(trans,basicAuth);
-            switch(result.status){
-                case OK:
-                    resp.getOutputStream().write(Chrono.utcStamp(result.value).getBytes());
-                    return Result.ok();
+            if(result.status == OK) {
+                resp.getOutputStream().write(Chrono.utcStamp(result.value).getBytes());
+                return Result.ok();
             }
             return Result.err(result);
         } catch (Exception e) {
@@ -1786,22 +1747,21 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     @Override
     public Result<Void> getCertInfoByID(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp, String id) {
         TimeTaken tt = trans.start(GET_CERT_BY_ID, Env.SUB|Env.ALWAYS);
-        try {    
+        try {
             Result<CERTS> rci = service.getCertInfoByID(trans,req,id);
-            
-            switch(rci.status) {
-                case OK: 
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        RosettaData<CERTS> data = certsDF.newData(trans).load(rci.value);
-                        Question.logEncryptTrace(trans,data.asString());
-                        data.to(resp.getOutputStream());
-                    } else {
-                        certsDF.direct(trans, rci.value, resp.getOutputStream());
-                    }
-                    setContentType(resp,certsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rci);
+
+            if(rci.status == OK) {
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    RosettaData<CERTS> data = certsDF.newData(trans).load(rci.value);
+                    Question.logEncryptTrace(trans,data.asString());
+                    data.to(resp.getOutputStream());
+                } else {
+                    certsDF.direct(trans, rci.value, resp.getOutputStream());
+                }
+                setContentType(resp,certsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rci);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_CERT_BY_ID);
@@ -1816,11 +1776,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public static final String DELETE_DELEGATE = "deleteDelegate";
     public static final String GET_DELEGATE_USER = "getDelegatesByUser";
     public static final String GET_DELEGATE_DELG = "getDelegatesByDelegate";
-    
+
     @Override
     public Result<Void> createDelegate(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(CREATE_DELEGATE, Env.SUB|Env.ALWAYS);
-        try {    
+        try {
             Data<REQUEST> data = delgRequestDF.newData().load(req.getInputStream());
             if (Question.willSpecialLog(trans, trans.user())) {
                 Question.logEncryptTrace(trans,data.asString());
@@ -1834,11 +1794,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> updateDelegate(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(UPDATE_DELEGATE, Env.SUB|Env.ALWAYS);
-        try {    
+        try {
             Data<REQUEST> data = delgRequestDF.newData().load(req.getInputStream());
             if (Question.willSpecialLog(trans, trans.user())) {
                 Question.logEncryptTrace(trans,data.asString());
@@ -1852,7 +1812,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> deleteDelegate(AuthzTrans trans,  HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(DELETE_DELEGATE, Env.SUB|Env.ALWAYS);
@@ -1870,7 +1830,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> deleteDelegate(AuthzTrans trans, String userName) {
         TimeTaken tt = trans.start(DELETE_DELEGATE + ' ' + userName, Env.SUB|Env.ALWAYS);
@@ -1883,24 +1843,23 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> getDelegatesByUser(AuthzTrans trans, String user, HttpServletResponse resp) {
         TimeTaken tt = trans.start(GET_DELEGATE_USER, Env.SUB|Env.ALWAYS);
         try {
             Result<DELGS> rd = service.getDelegatesByUser(trans, user);
-            
-            switch(rd.status) {
-                case OK: 
-                    RosettaData<DELGS> data = delgDF.newData(trans).load(rd.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,delgDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rd);
+
+            if(rd.status == OK) {
+                RosettaData<DELGS> data = delgDF.newData(trans).load(rd.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,delgDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rd);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_DELEGATE_USER);
@@ -1915,17 +1874,16 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_DELEGATE_DELG, Env.SUB|Env.ALWAYS);
         try {
             Result<DELGS> rd = service.getDelegatesByDelegate(trans, delegate);
-            switch(rd.status) {
-                case OK: 
-                    RosettaData<DELGS> data = delgDF.newData(trans).load(rd.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,delgDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rd);
+            if(rd.status == OK) {
+                RosettaData<DELGS> data = delgDF.newData(trans).load(rd.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+                setContentType(resp,delgDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rd);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_DELEGATE_DELG);
@@ -1939,8 +1897,6 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     private static final String GET_USERROLES = "getUserRoles";
     private static final String GET_USERROLES_BY_ROLE = "getUserRolesByRole";
     private static final String GET_USERROLES_BY_USER = "getUserRolesByUser";
-    private static final String SET_ROLES_FOR_USER = "setRolesForUser";
-    private static final String SET_USERS_FOR_ROLE = "setUsersForRole";
     private static final String EXTEND_USER_ROLE = "extendUserRole";
     private static final String DELETE_USER_ROLE = "deleteUserRole";
     @Override
@@ -1956,16 +1912,15 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
 
                 request = data.asObject();
             } catch (APIException e) {
-                return Result.err(Status.ERR_BadData,"Invalid Input");
+                return Result.err(Result.ERR_BadData,INVALID_INPUT);
             }
-            
+
             Result<Void> rp = service.createUserRole(trans,request);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,REQUEST_USER_ROLE);
@@ -1974,25 +1929,24 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> getUserInRole(AuthzTrans trans, HttpServletResponse resp, String user, String role) {
         TimeTaken tt = trans.start(GET_USERROLES + ' ' + user + '|' + role, Env.SUB|Env.ALWAYS);
         try {
             Result<USERS> ru = service.getUserInRole(trans,user,role);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(ru.status == OK) {
+                RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_USERROLES);
@@ -2008,19 +1962,18 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_USERROLES_BY_USER + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<USERROLES> ru = service.getUserRolesByUser(trans,user);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERROLES> data = userrolesDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(ru.status == OK) {
+                RosettaData<USERROLES> data = userrolesDF.newData(trans).load(ru.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_USERROLES_BY_USER);
@@ -2030,105 +1983,35 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         }
 
     }
-    
+
     @Override
     public Result<Void> getUserRolesByRole(AuthzTrans trans, HttpServletResponse resp, String role) {
         TimeTaken tt = trans.start(GET_USERROLES_BY_ROLE + ' ' + role, Env.SUB|Env.ALWAYS);
         try {
             Result<USERROLES> ru = service.getUserRolesByRole(trans,role);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERROLES> data = userrolesDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    setCacheControlOff(resp);
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
-            }
-        } catch (Exception e) {
-            trans.error().log(e,IN,GET_USERROLES_BY_ROLE);
-            return Result.err(e);
-        } finally {
-            tt.done();
-        }
-
-    }
-    
-
-    @Override
-    public Result<Void> resetUsersForRole(AuthzTrans trans, HttpServletResponse resp, HttpServletRequest req) {
-        TimeTaken tt = trans.start(SET_USERS_FOR_ROLE, Env.SUB|Env.ALWAYS);
-        try {
-            REQUEST rreq;
-            try {
-                RosettaData<REQUEST> data = userRoleRequestDF.newData().load(req.getInputStream());
-                if (Question.willSpecialLog(trans, trans.user())) {
-                    Question.logEncryptTrace(trans,data.asString());
-                }
-                rreq = data.asObject();
-            } catch (APIException e) {
-                trans.error().log("Invalid Input",IN, SET_USERS_FOR_ROLE);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
-            }
-            
-            Result<Void> rp = service.resetUsersForRole(trans, rreq);
-            
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
-            }
-        } catch (Exception e) {
-            trans.error().log(e,IN,SET_USERS_FOR_ROLE);
-            return Result.err(e);
-        } finally {
-            tt.done();
-        }
-        
-    }
-
-    @Override
-    public Result<Void> resetRolesForUser(AuthzTrans trans, HttpServletResponse resp, HttpServletRequest req) {
-        TimeTaken tt = trans.start(SET_ROLES_FOR_USER, Env.SUB|Env.ALWAYS);
-        try {
-            REQUEST rreq;
-            try {
-                RosettaData<REQUEST> data = userRoleRequestDF.newData().load(req.getInputStream());
+            if(ru.status == OK) {
+                RosettaData<USERROLES> data = userrolesDF.newData(trans).load(ru.value);
                 if (Question.willSpecialLog(trans, trans.user())) {
                     Question.logEncryptTrace(trans,data.asString());
                 }
 
-                rreq = data.asObject();
-            } catch (APIException e) {
-                trans.error().log("Invalid Input",IN, SET_ROLES_FOR_USER);
-                return Result.err(Status.ERR_BadData,"Invalid Input");
-            }
-            
-            Result<Void> rp = service.resetRolesForUser(trans, rreq);
-            
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                setCacheControlOff(resp);
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
-            trans.error().log(e,IN,SET_ROLES_FOR_USER);
+            trans.error().log(e,IN,GET_USERROLES_BY_ROLE);
             return Result.err(e);
         } finally {
             tt.done();
         }
-        
+
     }
 
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#extendUserRoleExpiration(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String, java.lang.String)
      */
@@ -2150,12 +2033,11 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(DELETE_USER_ROLE + ' ' + user + ' ' + role, Env.SUB|Env.ALWAYS);
         try {
             Result<Void> rp = service.deleteUserRole(trans,user,role);
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,DELETE_USER_ROLE);
@@ -2169,7 +2051,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     private static final String GET_APPROVALS_BY_USER = "getApprovalsByUser.";
     private static final String GET_APPROVALS_BY_TICKET = "getApprovalsByTicket.";
     private static final String GET_APPROVALS_BY_APPROVER = "getApprovalsByApprover.";
-    
+
     @Override
     public Result<Void> updateApproval(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) {
         TimeTaken tt = trans.start(UPDATE_APPROVAL, Env.SUB|Env.ALWAYS);
@@ -2180,13 +2062,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             }
 
             Result<Void> rp = service.updateApproval(trans, data.asObject());
-            
-            switch(rp.status) {
-                case OK: 
-                    setContentType(resp,approvalDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+
+            if(rp.status == OK) {
+                setContentType(resp,approvalDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,UPDATE_APPROVAL);
@@ -2195,24 +2076,23 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
+
     @Override
     public Result<Void> getApprovalsByUser(AuthzTrans trans, HttpServletResponse resp, String user) {
         TimeTaken tt = trans.start(GET_APPROVALS_BY_USER + ' ' + user, Env.SUB|Env.ALWAYS);
         try {
             Result<APPROVALS> rp = service.getApprovalsByUser(trans, user);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<APPROVALS> data = approvalDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
-                    data.to(resp.getOutputStream());
-                    
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+            if(rp.status == OK) {
+                RosettaData<APPROVALS> data = approvalDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+                data.to(resp.getOutputStream());
+
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_APPROVALS_BY_USER, user);
@@ -2227,18 +2107,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_APPROVALS_BY_APPROVER + ' ' + approver, Env.SUB|Env.ALWAYS);
         try {
             Result<APPROVALS> rp = service.getApprovalsByApprover(trans, approver);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<APPROVALS> data = approvalDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(rp.status == OK) {
+                RosettaData<APPROVALS> data = approvalDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_APPROVALS_BY_APPROVER,approver);
@@ -2253,18 +2132,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_APPROVALS_BY_TICKET, Env.SUB|Env.ALWAYS);
         try {
             Result<APPROVALS> rp = service.getApprovalsByTicket(trans, ticket);
-            switch(rp.status) {
-                case OK: 
-                    RosettaData<APPROVALS> data = approvalDF.newData(trans).load(rp.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(rp.status == OK) {
+                RosettaData<APPROVALS> data = approvalDF.newData(trans).load(rp.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,permsDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rp);
+                data.to(resp.getOutputStream());
+                setContentType(resp,permsDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rp);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_APPROVALS_BY_TICKET);
@@ -2275,7 +2153,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     }
 
 
-    
+
     public static final String GET_USERS_PERMISSION = "getUsersByPermission";
     public static final String GET_USERS_ROLE = "getUsersByRole";
 
@@ -2287,18 +2165,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(GET_USERS_ROLE + ' ' + role, Env.SUB|Env.ALWAYS);
         try {
             Result<USERS> ru = service.getUsersByRole(trans,role);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(ru.status == OK) {
+                RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_USERS_ROLE);
@@ -2312,23 +2189,22 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
      * @see com.att.authz.facade.AuthzFacade#getUsersByPermission(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String, java.lang.String, java.lang.String)
      */
     @Override
-    public Result<Void> getUsersByPermission(AuthzTrans trans, HttpServletResponse resp, 
+    public Result<Void> getUsersByPermission(AuthzTrans trans, HttpServletResponse resp,
             String type, String instance, String action) {
         TimeTaken tt = trans.start(GET_USERS_PERMISSION + ' ' + type + ' ' + instance + ' ' +action, Env.SUB|Env.ALWAYS);
         try {
             Result<USERS> ru = service.getUsersByPermission(trans,type,instance,action);
-            switch(ru.status) {
-                case OK: 
-                    RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(ru.status == OK) {
+                RosettaData<USERS> data = usersDF.newData(trans).load(ru.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,usersDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(ru);
+                data.to(resp.getOutputStream());
+                setContentType(resp,usersDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(ru);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_USERS_PERMISSION);
@@ -2338,11 +2214,12 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         }
     }
 
-    
+
     public static final String GET_HISTORY_USER = "getHistoryByUser";
     public static final String GET_HISTORY_ROLE = "getHistoryByRole";
     public static final String GET_HISTORY_PERM = "getHistoryByPerm";
     public static final String GET_HISTORY_NS = "getHistoryByNS";
+    public static final String GET_HISTORY_SUBJECT = "getHistoryBySubject";
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getHistoryByUser(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
      */
@@ -2366,18 +2243,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
 
         try {
             Result<HISTORY> rh = service.getHistoryByUser(trans,user,yyyymm,sort);
-            switch(rh.status) {
-                case OK: 
-                    RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(rh.status == OK) {
+                RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,historyDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rh);
+                data.to(resp.getOutputStream());
+                setContentType(resp,historyDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rh);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_HISTORY_USER);
@@ -2409,18 +2285,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(sb.toString(), Env.SUB|Env.ALWAYS);
         try {
             Result<HISTORY> rh = service.getHistoryByRole(trans,role,yyyymm,sort);
-            switch(rh.status) {
-                case OK: 
-                    RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(rh.status == OK) {
+                RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,historyDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rh);
+                data.to(resp.getOutputStream());
+                setContentType(resp,historyDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rh);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_HISTORY_ROLE);
@@ -2452,18 +2327,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(sb.toString(), Env.SUB|Env.ALWAYS);
         try {
             Result<HISTORY> rh = service.getHistoryByNS(trans,ns,yyyymm,sort);
-            switch(rh.status) {
-                case OK: 
-                    RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(rh.status == OK) {
+                RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,historyDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rh);
+                data.to(resp.getOutputStream());
+                setContentType(resp,historyDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rh);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_HISTORY_NS);
@@ -2495,18 +2369,17 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(sb.toString(), Env.SUB|Env.ALWAYS);
         try {
             Result<HISTORY> rh = service.getHistoryByPerm(trans,perm,yyyymm,sort);
-            switch(rh.status) {
-                case OK: 
-                    RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
-                    if (Question.willSpecialLog(trans, trans.user())) {
-                        Question.logEncryptTrace(trans,data.asString());
-                    }
+            if(rh.status == OK) {
+                RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
 
-                    data.to(resp.getOutputStream());
-                    setContentType(resp,historyDF.getOutType());
-                    return Result.ok();
-                default:
-                    return Result.err(rh);
+                data.to(resp.getOutputStream());
+                setContentType(resp,historyDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rh);
             }
         } catch (Exception e) {
             trans.error().log(e,IN,GET_HISTORY_PERM);
@@ -2516,9 +2389,52 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         }
     }
 
-    public final static String CACHE_CLEAR = "cacheClear "; 
-//    public final static String CACHE_VALIDATE = "validateCache";
-    
+    /* (non-Javadoc)
+     * @see com.att.authz.facade.AuthzFacade#getHistoryByUser(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    @Override
+    public Result<Void> getHistoryBySubject(AuthzTrans trans, HttpServletResponse resp, String subject, String target, int[] yyyymm, final int sort) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(GET_HISTORY_SUBJECT);
+        sb.append(' ');
+        sb.append(subject);
+        sb.append(" for ");
+        boolean first = true;
+        for (int i : yyyymm) {
+            if (first) {
+                first = false;
+            } else {
+                sb.append(',');
+            }
+            sb.append(i);
+        }
+        TimeTaken tt = trans.start(sb.toString(), Env.SUB|Env.ALWAYS);
+
+        try {
+            Result<HISTORY> rh = service.getHistoryBySubject(trans,subject,target,yyyymm,sort);
+            if(rh.status == OK) {
+                RosettaData<HISTORY> data = historyDF.newData(trans).load(rh.value);
+                if (Question.willSpecialLog(trans, trans.user())) {
+                    Question.logEncryptTrace(trans,data.asString());
+                }
+
+                data.to(resp.getOutputStream());
+                setContentType(resp,historyDF.getOutType());
+                return Result.ok();
+            }else{
+                return Result.err(rh);
+            }
+        } catch (Exception e) {
+            trans.error().log(e,IN,GET_HISTORY_USER);
+            return Result.err(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+    public static final  String CACHE_CLEAR = "cacheClear ";
+
+
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#cacheClear(org.onap.aaf.auth.env.test.AuthzTrans, java.lang.String)
      */
@@ -2543,7 +2459,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         TimeTaken tt = trans.start(CACHE_CLEAR + cname + ", segments[" + segments + ']', Env.SUB|Env.ALWAYS);
         try {
             String[] segs = segments.split("\\s*,\\s*");
-            int isegs[] = new int[segs.length];
+            int[] isegs = new int[segs.length];
             for (int i=0;i<segs.length;++i) {
                 try {
                     isegs[i] = Integer.parseInt(segs[i]);
@@ -2571,7 +2487,7 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getAPI(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse)
      */
-    public final static String API_REPORT = "apiReport";
+    public static final  String API_REPORT = "apiReport";
     @Override
     public Result<Void> getAPI(AuthzTrans trans, HttpServletResponse resp, RServlet<AuthzTrans> rservlet) {
         TimeTaken tt = trans.start(API_REPORT, Env.SUB);
@@ -2619,9 +2535,9 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             tt.done();
         }
     }
-    
 
-    public final static String API_EXAMPLE = "apiExample";
+
+    public static final  String API_EXAMPLE = "apiExample";
 
     /* (non-Javadoc)
      * @see com.att.authz.facade.AuthzFacade#getAPIExample(org.onap.aaf.auth.env.test.AuthzTrans, javax.servlet.http.HttpServletResponse, java.lang.String)
@@ -2630,13 +2546,13 @@ public abstract class AuthzFacadeImpl<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
     public Result<Void> getAPIExample(AuthzTrans trans, HttpServletResponse resp, String nameOrContentType, boolean optional) {
         TimeTaken tt = trans.start(API_EXAMPLE, Env.SUB);
         try {
-            String content =Examples.print(apiDF.getEnv(), nameOrContentType, optional); 
+            String content =Examples.print(apiDF.getEnv(), nameOrContentType, optional);
             resp.getOutputStream().print(content);
             setContentType(resp,content.contains("<?xml")?TYPE.XML:TYPE.JSON);
             return Result.ok();
         } catch (Exception e) {
             trans.error().log(e,IN,API_EXAMPLE);
-            return Result.err(Status.ERR_NotImplemented,e.getMessage());
+            return Result.err(Result.ERR_NotImplemented,e.getMessage());
         } finally {
             tt.done();
         }