Sonar Fixes, Formatting

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

diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java
index 31e214b..3f5d373 100644 (file)
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.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,23 +41,23 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
     // Note: Not Using List or ArrayList, because there is no "Peek" concept in their iterator.
     private Marshal<T>[] pml;
     private int end=0;
-    
+
     /**
      * @param pm
      */
     @SuppressWarnings("unchecked")
     protected void add(Marshal<T> pm) {
-        if(pml==null) {
-            pml = new Marshal[Ladder.DEFAULT_INIT_SIZE]; 
-        } else if(end>pml.length) {
-            Object temp[] = pml; 
+        if (pml==null) {
+            pml = new Marshal[Ladder.DEFAULT_INIT_SIZE];
+        } else if (end>pml.length) {
+            Object temp[] = pml;
             pml = new Marshal[pml.length+Ladder.DEFAULT_INIT_SIZE];
             System.arraycopy(temp, 0, pml, 0, pml.length);
         }
         pml[end]=pm;
         ++end;
     }
-    
+
     /* (non-Javadoc)
      * @see org.onap.aaf.misc.rosetta.Parse#parse(java.lang.Object, org.onap.aaf.misc.rosetta.Parsed)
      */
@@ -66,8 +66,8 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
     public Parsed<State> parse(T in, Parsed<State> parsed) throws ParseException {
         Ladder<Iterator<?>> ladder = parsed.state.ladder;
         Iterator<Marshal<T>> iter = (Iterator<Marshal<T>>)ladder.peek();
-        if(iter==null) {
-            if(pml.length>0) {
+        if (iter==null) {
+            if (pml.length>0) {
                 ladder.push(new FieldsIterator());
                 parsed.event = START_OBJ;
             } else {
@@ -78,22 +78,22 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
             ladder.ascend(); // look at field info
             Iterator<?> currFieldIter = ladder.peek();
             Marshal<T> marshal;
-            if(currFieldIter==null) {
+            if (currFieldIter==null) {
                 marshal=fields.next();
-            } else if(!DONE_ITERATOR.equals(currFieldIter)) {
+            } else if (!DONE_ITERATOR.equals(currFieldIter)) {
                 marshal=fields.peek();
-                if(marshal==null && fields.hasNext())marshal=fields.next();
-            } else if(fields.hasNext()) {
+                if (marshal==null && fields.hasNext())marshal=fields.next();
+            } else if (fields.hasNext()) {
                 marshal=fields.next();
                 ladder.push(null);
             } else {
                 marshal=null;
             }
 
-            if(marshal!=null)
+            if (marshal!=null)
                 parsed = marshal.parse(in, parsed);
             ladder.descend();
-            if(marshal==null || parsed.event==NONE) {
+            if (marshal==null || parsed.event==NONE) {
                 parsed.event = END_OBJ;
                 ladder.push(DONE_ITERATOR);
             }
@@ -111,7 +111,7 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
 
         @Override
         public Marshal<T> next() {
-            if(!hasNext()) {
+            if (!hasNext()) {
                 throw new NoSuchElementException();
             }
             return pml[++idx];
@@ -120,12 +120,12 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
         public Marshal<T> peek() {
             return idx<0?null:pml[idx];
         }
-        
+
         @Override
         public void remove() {
             pml[idx]=null;
         }
-        
+
     }
 
 }