Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / config / UsersDump.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
index de25cb7..4f7db1a 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.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.
@@ -41,7 +41,7 @@ public class UsersDump {
      */
     public static boolean write(OutputStream os, AbsUserCache<?> lur) {
         PrintStream ps;
-        if(os instanceof PrintStream) {
+        if (os instanceof PrintStream) {
             ps = (PrintStream)os;
         } else {
             ps = new PrintStream(os);
@@ -56,17 +56,17 @@ public class UsersDump {
 
             // We loop through Users, but want to write Groups first... therefore, save off print
             StringBuilder sb = new StringBuilder();
-            
+
             // Obtain all unique role names
             HashSet<String> groups = new HashSet<>();
-            for(AbsUserCache<?>.DumpInfo di : lur.dumpInfo()) {
+            for (AbsUserCache<?>.DumpInfo di : lur.dumpInfo()) {
                 sb.append("\n  <user username=\"");
                 sb.append(di.user);
                 sb.append("\" roles=\"");
                 boolean first = true;
-                for(String role : di.perms) {
+                for (String role : di.perms) {
                     groups.add(role);
-                    if(first)first = false;
+                    if (first)first = false;
                     else sb.append(',');
                     sb.append(role);
                 }
@@ -75,12 +75,12 @@ public class UsersDump {
             }
 
             // Print roles
-            for(String group : groups) {
+            for (String group : groups) {
                 ps.print("  <role rolename=\"");
                 ps.print(group);
                 ps.println("\"/>");
             }
-    
+
             ps.println(sb);
 
             ps.println("</tomcat-users>");
@@ -91,28 +91,28 @@ public class UsersDump {
         }
         return true;
     }
-    
+
     /**
-     * 
+     *
      * Note: This method returns a String if there's an error, or null if ok.
-     * This unusual style is necessitated by the fact that any Exceptions thrown are likely to 
+     * This unusual style is necessitated by the fact that any Exceptions thrown are likely to
      * be unlogged and hidden from view, making debugging almost impossible.
-     * 
+     *
      * @param writeto
      * @param up
      * @return
      */
     public static String updateUsers(String writeto, LocalLur up) {
         // Dump a Tomcat-user.xml lookalike (anywhere)
-        if(writeto!=null) {
+        if (writeto!=null) {
             // First read content
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            if(UsersDump.write(baos, up)) {
+            if (UsersDump.write(baos, up)) {
                 byte[] postulate = baos.toByteArray();
                 // now get contents of file
                 File file = new File(writeto);
                 boolean writeIt;
-                if(file.exists()) {
+                if (file.exists()) {
                     try {
                         FileInputStream fis = new FileInputStream(file);
                         byte[] orig = new byte[(int)file.length()];
@@ -122,17 +122,17 @@ public class UsersDump {
                         } finally {
                             fis.close();
                         }
-                        if(read<=0) {
+                        if (read<=0) {
                             writeIt = false;
                         } else {
                             // Starting at third "<" (<tomcat-users> line)
                             int startA=0, startB=0;
-                            for(int i=0;startA<orig.length && i<3;++startA) if(orig[startA]=='<')++i;
-                            for(int i=0;startB<orig.length && i<3;++startB) if(postulate[startB]=='<')++i;
-                            
+                            for (int i=0;startA<orig.length && i<3;++startA) if (orig[startA]=='<')++i;
+                            for (int i=0;startB<orig.length && i<3;++startB) if (postulate[startB]=='<')++i;
+
                             writeIt=orig.length-startA!=postulate.length-startB; // first, check if remaining length is the same
-                            while(!writeIt && startA<orig.length && startB<postulate.length) {
-                                if(orig[startA++]!=postulate[startB++])writeIt = true;
+                            while (!writeIt && startA<orig.length && startB<postulate.length) {
+                                if (orig[startA++]!=postulate[startB++])writeIt = true;
                             }
                         }
                     } catch (Exception e) {
@@ -141,8 +141,8 @@ public class UsersDump {
                 } else {
                     writeIt = true;
                 }
-                
-                if(writeIt) {
+
+                if (writeIt) {
                     try {
                         FileOutputStream fos = new FileOutputStream(file);
                         try {