Merge "Analyze.java-Merge this if statement with the enclosing one"

[aaf/authz.git] / auth / auth-locate / src / main / java / org / onap / aaf / auth / locate / service / LocateServiceImpl.java

diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
index 829335c..1ace384 100644 (file)
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
@@ -47,7 +47,7 @@ public class LocateServiceImpl<IN,OUT,ERROR>
         private ConfigDAO configDAO;
         private boolean permToRegister;
     
-        public LocateServiceImpl(AuthzTrans trans, AAF_Locate locate, Mapper<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> mapper) throws APIException {
+        public LocateServiceImpl(AuthzTrans trans, AAF_Locate locate, Mapper<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> mapper){
             this.mapper = mapper;
             this.locateDAO = locate.locateDAO;
             this.configDAO = locate.configDAO;
@@ -77,10 +77,10 @@ public class LocateServiceImpl<IN,OUT,ERROR>
                     int dot = me.getName().lastIndexOf('.'); // Note: Validator checks for NS for getName()
                     AAFPermission p = new AAFPermission(me.getName().substring(0,dot),"locator",me.getHostname(),"write"); 
                     if (!trans.fish(p)) {
-                       if(denied==null) {
-                               denied = new StringBuilder("May not register service(s):");
-                       }
-                       
+                        if(denied==null) {
+                            denied = new StringBuilder("May not register service(s):");
+                        }
+                        
                         denied.append("\n\t");
                         denied.append(p.getKey());
                         denied.append(')');
@@ -95,7 +95,7 @@ public class LocateServiceImpl<IN,OUT,ERROR>
                 return Result.ok();
             } else {
                 return denied==null?Result.err(Result.ERR_NotFound, "No endpoints found")
-                               :Result.err(Result.ERR_Security,denied.toString());
+                        :Result.err(Result.ERR_Security,denied.toString());
             }
         }
 
@@ -111,14 +111,14 @@ public class LocateServiceImpl<IN,OUT,ERROR>
             int count = 0;
             StringBuilder denied = null;
             for (MgmtEndpoint me : meps.getMgmtEndpoint()) {
-                if (permToRegister) { 
+                 if (permToRegister) { 
                      int dot = me.getName().lastIndexOf('.'); // Note: Validator checks for NS for getName()
                      AAFPermission p = new AAFPermission(me.getName().substring(0,dot),"locator",me.getHostname(),"write"); 
                      if (!trans.fish(p)) {
-                       if(denied==null) {
-                               denied = new StringBuilder("May not deregister service(s):");
-                       }
-                       
+                         if(denied==null) {
+                             denied = new StringBuilder("May not deregister service(s):");
+                         }
+                         
                          denied.append("\n\t");
                          denied.append(p.getKey());
                          denied.append(')');
@@ -133,7 +133,7 @@ public class LocateServiceImpl<IN,OUT,ERROR>
                 return Result.ok();
             } else {
                 return denied==null?Result.err(Result.ERR_NotFound, "No endpoints found")
-                               :Result.err(Result.ERR_Security,denied.toString());
+                        :Result.err(Result.ERR_Security,denied.toString());
             }
         }