X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Frosetta%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Frosetta%2Fmarshal%2FObjArray.java;h=f6685234aeacd107c2dfcb53addad9a8419097ea;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=fa95dee55c434a55311e5bfdb068c56af8fd9f2a;hpb=ceda6e8bc270202bcb24340b86617110289c902e;p=aaf%2Fauthz.git

diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjArray.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjArray.java
index fa95dee5..f6685234 100644
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjArray.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjArray.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.
@@ -31,59 +31,59 @@ import org.onap.aaf.misc.rosetta.Parsed;
 
 
 public abstract class ObjArray<T,S> extends Marshal<T> {
-	private String name;
-	private Marshal<S> subMarshaller;
+    private String name;
+    private Marshal<S> subMarshaller;
 
-	public ObjArray(String name, Marshal<S> subMarshaller) {
-		this.name = name;
-		this.subMarshaller = subMarshaller;
-	}
+    public ObjArray(String name, Marshal<S> subMarshaller) {
+        this.name = name;
+        this.subMarshaller = subMarshaller;
+    }
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Parsed<State> parse(T t, Parsed<State> parsed) throws ParseException {
-		Ladder<Iterator<?>> ladder = parsed.state.ladder;
-		Iterator<?> iter = ladder.peek();
-		if(iter==null) {
-			List<S> list = data(t);
-			if(list.isEmpty() && parsed.state.smallest) {
-				ladder.push(DONE_ITERATOR);
-			} else {
-				ladder.push(new ListIterator<S>(list));
-				parsed.event = START_ARRAY;
-				parsed.name = name;
-			}
-		} else if (!DONE_ITERATOR.equals(iter)) {
-			ladder.ascend(); // look at field info
-			Iterator<?> memIter = ladder.peek();
-			ListIterator<S> mems = (ListIterator<S>)iter;
-			S mem;
-			if(memIter==null) {
-				mem=mems.next();
-			} else if(!DONE_ITERATOR.equals(memIter)) {
-				mem=mems.peek();
-			} else if(iter.hasNext()) {
-				mem=null;
-				ladder.push(null);
-			} else {
-				mem=null;
-			}
+    @SuppressWarnings("unchecked")
+    @Override
+    public Parsed<State> parse(T t, Parsed<State> parsed) throws ParseException {
+        Ladder<Iterator<?>> ladder = parsed.state.ladder;
+        Iterator<?> iter = ladder.peek();
+        if (iter==null) {
+            List<S> list = data(t);
+            if (list.isEmpty() && parsed.state.smallest) {
+                ladder.push(DONE_ITERATOR);
+            } else {
+                ladder.push(new ListIterator<S>(list));
+                parsed.event = START_ARRAY;
+                parsed.name = name;
+            }
+        } else if (!DONE_ITERATOR.equals(iter)) {
+            ladder.ascend(); // look at field info
+            Iterator<?> memIter = ladder.peek();
+            ListIterator<S> mems = (ListIterator<S>)iter;
+            S mem;
+            if (memIter==null) {
+                mem=mems.next();
+            } else if (!DONE_ITERATOR.equals(memIter)) {
+                mem=mems.peek();
+            } else if (iter.hasNext()) {
+                mem=null;
+                ladder.push(null);
+            } else {
+                mem=null;
+            }
 
-			if(mem!=null)
-				parsed = subMarshaller.parse(mem, parsed);
-			ladder.descend();
-			if(mem==null) {
-				if(iter.hasNext()) {
-					parsed.event = NEXT;
-				} else {
-					parsed.event = END_ARRAY;
-					ladder.push(DONE_ITERATOR);
-				}
-			}
-		}
-		return parsed; // if unchanged, then it will end process
-	}
+            if (mem!=null)
+                parsed = subMarshaller.parse(mem, parsed);
+            ladder.descend();
+            if (mem==null) {
+                if (iter.hasNext()) {
+                    parsed.event = NEXT;
+                } else {
+                    parsed.event = END_ARRAY;
+                    ladder.push(DONE_ITERATOR);
+                }
+            }
+        }
+        return parsed; // if unchanged, then it will end process
+    }
 
-	protected abstract List<S> data(T t);
+    protected abstract List<S> data(T t);
 
 }