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

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

diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java
index 97f68da..006e813 100644 (file)
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.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.
@@ -48,7 +48,7 @@ public class RosettaData<T> implements Data<T>{
     private boolean options[] = new boolean[] {false, false};
     // Temp Storage of XML.  Only when we must use JAXB to read in Objects
     private String xml,json;
-    
+
     // package on purpose
     RosettaData(Env env, RosettaDF<T> rosettaDF) {
         df = rosettaDF;
@@ -58,12 +58,17 @@ public class RosettaData<T> implements Data<T>{
         outType = df.getOutType(); // take defaults
     }
 
+    //Added for junits
+    void setSaved(Saved saved) {
+        this.saved = saved;
+    }
+
 //    // @Override
     public RosettaData<T> in(TYPE rosettaType) {
         inType = rosettaType;
         return this;
     }
-    
+
 //    // @Override
     public RosettaData<T> out(TYPE rosettaType) {
         outType = rosettaType;
@@ -84,7 +89,7 @@ public class RosettaData<T> implements Data<T>{
         }
         return this;
     }
-    
+
     // @Override
     public RosettaData<T> load(InputStream is) throws APIException {
         Parse<Reader,?> in = df.getIn(inType);
@@ -114,7 +119,7 @@ public class RosettaData<T> implements Data<T>{
                     json = str;
                     break;
                 default:
-                    
+
                 }
         } catch (Exception e) {
             throw new APIException(e);
@@ -129,7 +134,7 @@ public class RosettaData<T> implements Data<T>{
         Parse<?,?> in = df.getIn(inType);
         TimeTaken tt = in.start(trans);
         try {
-            if(df.marshal==null) { // Unknown marshaller... do working XML marshal/extraction
+            if (df.marshal==null) { // Unknown marshaller... do working XML marshal/extraction
                 StringWriter sw = new StringWriter();
                 df.jaxMar.marshal(trans.debug(), t, sw, options);
                 saved.extract(new StringReader(xml = sw.toString()), (Writer)null, df.inXML);
@@ -147,7 +152,7 @@ public class RosettaData<T> implements Data<T>{
     public Saved getEvents() {
         return saved;
     }
-    
+
     // @Override
     public T asObject() throws APIException {
         Out out = df.getOut(TYPE.XML);
@@ -169,15 +174,15 @@ public class RosettaData<T> implements Data<T>{
         Out out = df.getOut(outType);
         TimeTaken tt = trans.start(out.logName(),df.logType(outType)); // determine from Out.. without dependency on Env?
         try {
-            if(outType==TYPE.XML) {
-                if(xml==null) {
+            if (outType==TYPE.XML) {
+                if (xml==null) {
                     StringWriter sw = new StringWriter();
                     out.extract(null, sw, saved, options);
                     xml = sw.toString();
                 }
                 return xml;
             } else {  // is JSON
-                if(json==null) {
+                if (json==null) {
                     StringWriter sw = new StringWriter();
                     out.extract(null, sw, saved, options);
                     json = sw.toString();
@@ -197,11 +202,11 @@ public class RosettaData<T> implements Data<T>{
         Out out = df.getOut(outType);
         TimeTaken tt = trans.start(out.logName(),df.logType(outType)); // determine from Out.. without dependency on Env?
         try {
-            if(outType==TYPE.XML && xml!=null) {
+            if (outType==TYPE.XML && xml!=null) {
                 os.write(xml.getBytes());
-            } else if(outType==TYPE.JSON && json!=null) {
+            } else if (outType==TYPE.JSON && json!=null) {
                 os.write(json.getBytes());
-            } else { 
+            } else {
                 out.extract(null, os, saved, options);
             }
         } catch (Exception e) {
@@ -217,11 +222,11 @@ public class RosettaData<T> implements Data<T>{
         Out out = df.getOut(outType);
         TimeTaken tt = trans.start(out.logName(),df.logType(outType)); // determine from Out.. without dependency on Env?
         try {
-            if(outType==TYPE.XML && xml!=null) {
+            if (outType==TYPE.XML && xml!=null) {
                 writer.append(xml);
-            } else if(outType==TYPE.JSON && json!=null) {
+            } else if (outType==TYPE.JSON && json!=null) {
                 writer.append(json);
-            } else { 
+            } else {
                 out.extract(null, writer, saved, options);
             }
         } catch (Exception e) {
@@ -231,18 +236,18 @@ public class RosettaData<T> implements Data<T>{
         }
         return this;
     }
-    
+
     // @Override
     public Class<T> getTypeClass() {
         return df.getTypeClass();
     }
 
     private static final boolean[] emptyOption = new boolean[0];
-    
+
     public void direct(InputStream is, OutputStream os) throws APIException, IOException {
         direct(is,os,emptyOption);
     }
-    
+
     public void direct(Reader reader, Writer writer, boolean ... options) throws APIException, IOException {
         Parse<Reader,?> in = df.getIn(inType);
         Out out = df.getOut(outType);
@@ -260,7 +265,7 @@ public class RosettaData<T> implements Data<T>{
         Out out = df.getOut(outType);
         TimeTaken tt = trans.start(out.logName(),df.logType(outType)); // determine from Out.. without dependency on Env?
         try {
-            if(df.marshal==null) { // Unknown marshaller... do working XML marshal/extraction
+            if (df.marshal==null) { // Unknown marshaller... do working XML marshal/extraction
                 StringWriter sw = new StringWriter();
                 df.jaxMar.marshal(trans.debug(), t, sw, options);
                 out.extract(new StringReader(xml = sw.toString()), writer, df.inXML,options);
@@ -278,8 +283,8 @@ public class RosettaData<T> implements Data<T>{
         Out out = df.getOut(outType);
         TimeTaken tt = trans.start(out.logName(),df.logType(outType)); // determine from Out.. without dependency on Env?
         try {
-            if(df.marshal==null) { // Unknown marshaller... do working XML marshal/extraction
-                if(outType.equals(TYPE.XML)) {
+            if (df.marshal==null) { // Unknown marshaller... do working XML marshal/extraction
+                if (outType.equals(TYPE.XML)) {
                     df.jaxMar.marshal(trans.debug(), t, os, options);
                 } else {
                     StringWriter sw = new StringWriter();
@@ -297,7 +302,7 @@ public class RosettaData<T> implements Data<T>{
         }
     }
 
-    
+
     public void direct(InputStream is, OutputStream os, boolean ... options) throws APIException, IOException {
         direct(new InputStreamReader(is),new OutputStreamWriter(os), options);
     }