JAXBData.java-Extract the assignment out of expression

[aaf/authz.git] / misc / env / src / main / java / org / onap / aaf / misc / env / jaxb / JAXBData.java

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java
index 38977a3..a5f10e0 100644 (file)
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java
@@ -114,10 +114,11 @@ public final class JAXBData<T> implements Data<T>{
      * @throws APIException\r
      */\r
     public String asString(EnvJAXB env) throws APIException {\r
-        if(dataAsString!=null) {\r
+        if (dataAsString!=null) {\r
             return dataAsString;\r
         } else {\r
-            return dataAsString = stringifier.stringify(env, dataAsObject);\r
+               dataAsString = stringifier.stringify(env, dataAsObject);\r
+            return dataAsString;\r
         }\r
     }\r
 \r
@@ -131,15 +132,16 @@ public final class JAXBData<T> implements Data<T>{
      */\r
     // @Override\r
     public String asString() throws APIException {\r
-        if(dataAsString!=null) {\r
+        if (dataAsString!=null) {\r
             return dataAsString;\r
         } else {\r
-            return dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);\r
+            dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);\r
+            return dataAsString;\r
         }\r
     }\r
     \r
     public Data<T> to(OutputStream os) throws APIException, IOException {\r
-        if(dataAsString!=null) {\r
+        if (dataAsString!=null) {\r
             os.write(dataAsString.getBytes());\r
         } else if (stringifier instanceof IOStringifier){\r
             ((IOStringifier<T>)stringifier).stringify(creatingEnv, dataAsObject, os, options);\r
@@ -153,7 +155,7 @@ public final class JAXBData<T> implements Data<T>{
 \r
     // @Override\r
     public JAXBData<T> to(Writer writer) throws APIException, IOException {\r
-        if(dataAsString!=null) {\r
+        if (dataAsString!=null) {\r
             writer.write(dataAsString);\r
         } else if (stringifier instanceof IOStringifier){\r
             ((IOStringifier<T>)stringifier).stringify(creatingEnv, dataAsObject, writer, options);\r
@@ -166,7 +168,7 @@ public final class JAXBData<T> implements Data<T>{
 \r
 \r
     public InputStream getInputStream() throws APIException {\r
-        if(dataAsString==null) {\r
+        if (dataAsString==null) {\r
             dataAsString = stringifier.stringify(creatingEnv,dataAsObject,options);\r
         }\r
         return new ByteArrayInputStream(dataAsString.getBytes());\r
@@ -184,7 +186,7 @@ public final class JAXBData<T> implements Data<T>{
      */\r
 \r
     public T asObject(EnvJAXB env) throws APIException {\r
-        if(dataAsObject !=null) {\r
+        if (dataAsObject !=null) {\r
             return dataAsObject;\r
         } else {\r
             // Some Java compilers need two statements here\r
@@ -204,7 +206,7 @@ public final class JAXBData<T> implements Data<T>{
      */\r
     // @Override\r
     public T asObject() throws APIException {\r
-        if(dataAsObject !=null) {\r
+        if (dataAsObject !=null) {\r
             return dataAsObject;\r
         } else {\r
             // Some Java compilers need two statements here\r
@@ -239,11 +241,12 @@ public final class JAXBData<T> implements Data<T>{
      */\r
     // @Override\r
     public String toString() {\r
-        if(dataAsString!=null) {\r
+        if (dataAsString!=null) {\r
             return dataAsString;\r
         } else {\r
             try {\r
-                return dataAsString = stringifier.stringify(creatingEnv, dataAsObject);\r
+                dataAsString = stringifier.stringify(creatingEnv, dataAsObject);\r
+                return dataAsString;\r
             } catch (APIException e) {\r
                 return "ERROR - Can't Stringify from Object " + e.getLocalizedMessage();\r
             }\r
@@ -292,8 +295,8 @@ public final class JAXBData<T> implements Data<T>{
         int count;\r
         do {\r
             count = input.read(b);\r
-            if(count>0)output.write(b, 0, count);\r
-        } while(count>=0);\r
+            if (count>0)output.write(b, 0, count);\r
+        } while (count>=0);\r
     }\r
 \r
 \r