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

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / aaf / client / ErrMessage.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
index 0fb4d60..2d03e6a 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.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.
@@ -33,64 +33,68 @@ import org.onap.aaf.misc.rosetta.env.RosettaEnv;
 import aaf.v2_0.Error;
 
 public class ErrMessage {
-       private RosettaDF<Error> errDF;
-       
-       public ErrMessage(RosettaEnv env) throws APIException {
-               errDF = env.newDataFactory(Error.class);
-       }
+    private RosettaDF<Error> errDF;
+
+    public ErrMessage(RosettaEnv env) throws APIException {
+        errDF = env.newDataFactory(Error.class);
+    }
+
+    /**
+     * AT&T Requires a specific Error Format for RESTful Services, which AAF complies with.
+     *
+     * This code will create a meaningful string from this format.
+     *
+     * @param ps
+     * @param df
+     * @param r
+     * @throws APIException
+     */
+    public void printErr(PrintStream ps,  String attErrJson) throws APIException {
+        StringBuilder sb = new StringBuilder();
+        Error err = errDF.newData().in(TYPE.JSON).load(attErrJson).asObject();
+        ps.println(toMsg(sb,err));
+    }
+
+    /**
+     * AT&T Requires a specific Error Format for RESTful Services, which AAF complies with.
+     *
+     * This code will create a meaningful string from this format.
+     *
+     * @param sb
+     * @param df
+     * @param r
+     * @throws APIException
+     */
+    public StringBuilder toMsg(StringBuilder sb,  String attErrJson) throws APIException {
+        return toMsg(sb,errDF.newData().in(TYPE.JSON).load(attErrJson).asObject());
+    }
+
+    public StringBuilder toMsg(Future<?> future) {
+        return toMsg(new StringBuilder(),future);
+    }
+
+    public StringBuilder toMsg(StringBuilder sb, Future<?> future) {
+        try {
+            toMsg(sb,errDF.newData().in(TYPE.JSON).load(future.body()).asObject());
+        } catch (Exception e) {
+            //just print what we can
+            sb.append(future.code());
+            sb.append(": ");
+            sb.append(future.body());
+        }
+        return sb;
+    }
 
-       /**
-        * AT&T Requires a specific Error Format for RESTful Services, which AAF complies with.
-        * 
-        * This code will create a meaningful string from this format. 
-        * 
-        * @param ps
-        * @param df
-        * @param r
-        * @throws APIException
-        */
-       public void printErr(PrintStream ps,  String attErrJson) throws APIException {
-               StringBuilder sb = new StringBuilder();
-               Error err = errDF.newData().in(TYPE.JSON).load(attErrJson).asObject();
-               ps.println(toMsg(sb,err));
-       }
-       
-       /**
-        * AT&T Requires a specific Error Format for RESTful Services, which AAF complies with.
-        * 
-        * This code will create a meaningful string from this format. 
-        * 
-        * @param sb
-        * @param df
-        * @param r
-        * @throws APIException
-        */
-       public StringBuilder toMsg(StringBuilder sb,  String attErrJson) throws APIException {
-               return toMsg(sb,errDF.newData().in(TYPE.JSON).load(attErrJson).asObject());
-       }
-       
-       public StringBuilder toMsg(Future<?> future) {
-               return toMsg(new StringBuilder(),future);
-       }
-       
-       public StringBuilder toMsg(StringBuilder sb, Future<?> future) {
-               try {
-                       toMsg(sb,errDF.newData().in(TYPE.JSON).load(future.body()).asObject());
-               } catch(Exception e) {
-                       //just print what we can
-                       sb.append(future.code());
-                       sb.append(": ");
-                       sb.append(future.body());
-               }
-               return sb;
-       }
+    public StringBuilder toMsg(StringBuilder sb, Error err) {
+        sb.append(err.getMessageId());
+        sb.append(' ');
+        Object[] vars = new String[err.getVariables().size()];
+        err.getVariables().toArray(vars);
+        Vars.convert(sb, err.getText(),vars);
+        return sb;
+    }
 
-       public StringBuilder toMsg(StringBuilder sb, Error err) {
-               sb.append(err.getMessageId());
-               sb.append(' ');
-               String[] vars = new String[err.getVariables().size()];
-               err.getVariables().toArray(vars);
-               Vars.convert(sb, err.getText(),vars);
-               return sb;
-       }
+    public Error getError(Future<?> future) throws APIException {
+        return errDF.newData().in(TYPE.JSON).load(future.body()).asObject();
+    }
 }