X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fclient%2FErrMessage.java;h=2d03e6ac1d1cecb8684e99e4d92d54dadce29fbc;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=5542126227f4f9a7a266637d1ad4962b395e5d3d;hpb=7e966914050e66219689001ff4ab601a49eef0ac;p=aaf%2Fauthz.git 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 55421262..2d03e6ac 100644 --- 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. @@ -34,16 +34,16 @@ import aaf.v2_0.Error; public class ErrMessage { private RosettaDF 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. - * + * + * This code will create a meaningful string from this format. + * * @param ps * @param df * @param r @@ -54,12 +54,12 @@ public class ErrMessage { 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. - * + * + * This code will create a meaningful string from this format. + * * @param sb * @param df * @param r @@ -68,11 +68,11 @@ public class ErrMessage { 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()); @@ -88,9 +88,13 @@ public class ErrMessage { public StringBuilder toMsg(StringBuilder sb, Error err) { sb.append(err.getMessageId()); sb.append(' '); - String[] vars = new String[err.getVariables().size()]; + Object[] 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(); + } }