Sonar Fixes, Formatting

[aaf/authz.git] / misc / rosetta / src / main / java / org / onap / aaf / misc / rosetta / OutJson.java

diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java
index 6c86837..e2f45d1 100644 (file)
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.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.
@@ -39,18 +39,18 @@ public class OutJson extends Out {
         } else {
             ipw = null;
         }
-        
+
         // If it's a fragment, print first Object Name.  If root Object, skip first name
         Stack<LevelStack> jsonLevel = new Stack<LevelStack>();
         jsonLevel.push(new LevelStack(options.length>1 && options[1]));
         boolean print = true, hadData=false;
         char afterName=0, beforeName=0, maybe = 0, prev=0;
-        
+
         int count = 0;
         while ((p = prs.parse(in,p.reuse())).valid()) {
             ++count;
             switch(p.event) {
-                case 1: 
+                case 1:
                     continue;
                 case 2:
                     if (count==2) { // it's empty, write open/close on it's own
@@ -64,7 +64,7 @@ public class OutJson extends Out {
                     if (jsonLevel.peek().printObjectName) {
                         print = true;
                     } else { // don't print names on first
-                        print=false; 
+                        print=false;
                     }
                     maybe=jsonLevel.peek().listItem();
                     jsonLevel.push(new LevelStack(true));
@@ -72,9 +72,9 @@ public class OutJson extends Out {
                 case '}':
                     if (p.hasData()) { // if we have data, we print that, so may need to prepend a comma.
                         maybe = jsonLevel.peek().listItem();
-                    } else { // No data means just print, 
+                    } else { // No data means just print,
                         p.name = ""; // XML tags come through with names, but no data
-                    } 
+                    }
                     print = true;
                     jsonLevel.pop();
                     afterName = p.event;
@@ -94,7 +94,7 @@ public class OutJson extends Out {
                         else maybe = jsonLevel.peek().listItem();
                     } else {
                         p.name = ""; // XML tags come through with names, but no data
-                    } 
+                    }
                     jsonLevel.pop();
 
                     print = true;
@@ -112,25 +112,27 @@ public class OutJson extends Out {
                 default:
                     print = true;
             }
-        
+
             if (maybe!=0) {
-                if (ipw==null)writer.append(maybe); 
+                if (ipw==null)writer.append(maybe);
                 else ipw.println(maybe);
                 maybe = 0;
             }
-            
-            if (beforeName!=0) {
-                if (ipw==null)writer.append(beforeName);
-                else ipw.println(beforeName);
-                beforeName = 0;
-            }
+
+            // commented out unreachable code (as it is, beforeName is never
+            // assigned any value except 0
+            //if (beforeName!=0) {
+            //    if (ipw==null)writer.append(beforeName);
+            //    else ipw.println(beforeName);
+            //    beforeName = 0;
+            //}
             if (print) {
                 if (p.hasName()) {
                     writer.append('"');
                     if (p.event==3)writer.append("__");
                     writer.append(p.name);
                     writer.append("\":");
-                } 
+                }
                 if (p.hasData()) {
                     if (p.isString) {
                         writer.append('"');
@@ -169,7 +171,7 @@ public class OutJson extends Out {
                 }
                 afterName = 0;
             }
-            
+
             if (ipw!=null) {
                 switch(p.event) {
                     case '[':
@@ -204,7 +206,7 @@ public class OutJson extends Out {
             }
         }
 
-        
+
     }
 
     @Override
@@ -215,11 +217,11 @@ public class OutJson extends Out {
     private static class LevelStack {
         public boolean printObjectName=false;
         private boolean first_n_List=true;
-        
+
         public LevelStack(boolean printObjectName) {
             this.printObjectName = printObjectName;
         }
-        
+
         public char listItem() {
             if (first_n_List) {
                 first_n_List=false;