textual cleanup for M4

Issue-ID: AAF-509
Change-Id: Ib109ba404f158bbffb6dc60c96850fd7e56871fd
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java
index 43a88aa..18b57d8 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java
@@ -393,12 +393,12 @@ public class Question {
                     return Result.ok(nsd);
                 } else {
                     int dot = str.lastIndexOf('.');
-                       
-                       if (dot < 0) {
-                           return Result.err(Status.ERR_NsNotFound, "No Namespace for [%s]", str);
-                       } else {
-                           return deriveFirstNsForType(trans, str.substring(0, dot),type);
-                       }
+                    
+                    if (dot < 0) {
+                        return Result.err(Status.ERR_NsNotFound, "No Namespace for [%s]", str);
+                    } else {
+                        return deriveFirstNsForType(trans, str.substring(0, dot),type);
+                    }
                 }
             } else {
                 return Result.err(Status.ERR_NsNotFound,"There is no valid Company Namespace for %s",str);

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Deny.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Deny.java
index 47e5b45..bc7f91f 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Deny.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Deny.java
@@ -74,10 +74,10 @@ public class Deny extends BaseCmd<Mgmt> {
                         Future<Void> fp;
                         String resp;
                         if(option == 0) {
-                               fp = client.create(path, Void.class);
+                            fp = client.create(path, Void.class);
                             resp = " added";
                         } else {
-                               fp = client.delete(path, Void.class);
+                            fp = client.delete(path, Void.class);
                             resp = " deleted";
                         }
                         if (fp.get(AAFcli.timeout())) {
@@ -85,7 +85,7 @@ public class Deny extends BaseCmd<Mgmt> {
                             rv=fp.code();
                         } else {
                             if (rv==409) { 
-                               rv = fp.code();
+                                rv = fp.code();
                             };
                             error(fp);
                         }

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java
index 237e3c9..6289032 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java
@@ -84,7 +84,7 @@ public class Log extends BaseCmd<Mgmt> {
                             rv=200;
                         } else {
                             if (rv==409) {
-                               rv = fp.code();
+                                rv = fp.code();
                             };
                             error(fp);
                         }

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/SessClear.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/SessClear.java
index 72e3753..9ca01a3 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/SessClear.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/SessClear.java
@@ -61,7 +61,7 @@ public class SessClear extends Cmd {
                     rv=200;
                 } else {
                     if (rv==409) { 
-                       rv = fp.code();
+                        rv = fp.code();
                     };
                     error(fp);
                 }

diff --git a/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java b/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java
index b9f3122..09cc709 100644 (file)
--- a/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java
+++ b/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java
@@ -96,7 +96,7 @@ import aaf.v2_0.UserRoles;
 
 @RunWith(MockitoJUnitRunner.class)
 public class JU_Mapper_2_0 {
-       private static final String USER = "John";
+    private static final String USER = "John";
 
     private Mapper_2_0 mapper;
     @Mock
@@ -650,13 +650,13 @@ public class JU_Mapper_2_0 {
      *
      */
     public static class ImmutableMap {
-       public static <T,U> Map<T,U> of(Object ... tag_value) {
-               Map<T,U> rv = new HashMap<>();
-               for(int i=0;i<tag_value.length-1;i+=2) {
-                       rv.put((T)tag_value[i],(U)tag_value[i+1]);
-               }
-               return rv;
-       }
+        public static <T,U> Map<T,U> of(Object ... tag_value) {
+            Map<T,U> rv = new HashMap<>();
+            for(int i=0;i<tag_value.length-1;i+=2) {
+                rv.put((T)tag_value[i],(U)tag_value[i+1]);
+            }
+            return rv;
+        }
 
     }
 
@@ -666,13 +666,13 @@ public class JU_Mapper_2_0 {
      *
      */
     public static class Iterables {
-       public static <T> T getOnlyElement(List<T> lt) {
-               if(lt.isEmpty()) {
-                       return null;
-               } else {
-                       return lt.get(0);
-               }
-       }
+        public static <T> T getOnlyElement(List<T> lt) {
+            if(lt.isEmpty()) {
+                return null;
+            } else {
+                return lt.get(0);
+            }
+        }
     }
 
     /**
@@ -681,25 +681,25 @@ public class JU_Mapper_2_0 {
      *
      */
     public static class Lists {
-       @SuppressWarnings("unchecked")
-       public static <T> List<T> newArrayList(Collection<T> ... init ) {
-               List<T> rv = new ArrayList<>();
-               for(Collection<T> o : init) {
-                               for(T t : o) {
-                                       rv.add(t);
-                               }
-               }
-               return rv;
-       }
-
-       @SuppressWarnings("unchecked")
-       public static <T> List<T> newArrayList(Object ... init ) {
-               List<T> rv = new ArrayList<>();
-               for(Object o : init) {
-                               rv.add((T)o);
-               }
-               return rv;
-       }
+        @SuppressWarnings("unchecked")
+        public static <T> List<T> newArrayList(Collection<T> ... init ) {
+            List<T> rv = new ArrayList<>();
+            for(Collection<T> o : init) {
+                for(T t : o) {
+                    rv.add(t);
+                }
+            }
+            return rv;
+        }
+
+        @SuppressWarnings("unchecked")
+        public static <T> List<T> newArrayList(Object ... init ) {
+            List<T> rv = new ArrayList<>();
+            for(Object o : init) {
+                   rv.add((T)o);
+            }
+            return rv;
+        }
 
     }
 
@@ -709,13 +709,13 @@ public class JU_Mapper_2_0 {
      *
      */
     public static class Sets {
-       @SuppressWarnings("unchecked")
-       public static <T> Set<T> newHashSet(Object ... init ) {
-               Set<T> rv = new HashSet<>();
-               for(Object o : init) {
-                       rv.add((T)o);
-               }
-               return rv;
-       }
+        @SuppressWarnings("unchecked")
+        public static <T> Set<T> newHashSet(Object ... init ) {
+            Set<T> rv = new HashSet<>();
+            for(Object o : init) {
+                rv.add((T)o);
+            }
+            return rv;
+        }
     }
 }

diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/JU_PermEval.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/JU_PermEval.java
index 297292d..a6c0f91 100644 (file)
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/JU_PermEval.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/JU_PermEval.java
@@ -195,14 +195,14 @@ public class JU_PermEval {
         // CPFSF-431 Group needed help with Wild Card
         // They tried
         assertTrue(PermEval.evalInstance(
-                ":topic.com.att.ecomp_test.crm.pre*",
-                ":topic.com.att.ecomp_test.crm.predemo100"
+                ":topic.org.onap.sample_test.crm.pre*",
+                ":topic.org.onap.sample_test.crm.predemo100"
                 ));
 
         // Also can be
         assertTrue(PermEval.evalInstance(
-                ":!topic.com.att.ecomp_test.crm.pre.*",
-                ":topic.com.att.ecomp_test.crm.predemo100"
+                ":!topic.org.onap.sample_test.crm.pre.*",
+                ":topic.org.onap.sample_test.crm.predemo100"
                 ));
 
         // coverage

diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java
index 3f3517f..68d0f20 100644 (file)
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java
@@ -33,7 +33,7 @@ import org.onap.aaf.misc.env.APIException;
 /**
  * This class will pick out the best default SS for Clients per Client type
  * 
- * @author jg1555
+ * @author Instrumental
  *
  */
 public class HSecurityInfoInit implements SecurityInfoInit<HttpURLConnection> {

diff --git a/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java b/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java
index f98c76f..c2deb45 100644 (file)
--- a/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java
+++ b/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java
@@ -101,7 +101,7 @@ public class SimpleRESTClient {
     
     /**
      * Single Threaded Class for building up content
-     * @author jg1555
+     * @author Instrumental
      *
      */
     public static class Input {