From 6d469611d86642bc0b74ce51af72cc36d2af962d Mon Sep 17 00:00:00 2001
From: Instrumental <jcgmisc@stl.gathman.org>
Date: Mon, 26 Mar 2018 12:04:27 -0700
Subject: Remove Code from cadi, it is now in authz

Issue-ID: AAF-193
Change-Id: Ib7abdb15ba8a7445a3875cf8c6bb48b7d563f424
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
---
 .../org/onap/aaf/cadi/aaf/client/ErrMessage.java   | 98 ----------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java

(limited to 'aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java')

diff --git a/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
deleted file mode 100644
index c49113d..0000000
--- a/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START====================================================
- * * org.onap.aaf
- * * ===========================================================================
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * ===========================================================================
- * * 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.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- * * ============LICENSE_END====================================================
- * *
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * *
- ******************************************************************************/
-package org.onap.aaf.cadi.aaf.client;
-
-import java.io.PrintStream;
-
-import org.onap.aaf.cadi.client.Future;
-import org.onap.aaf.cadi.util.Vars;
-
-import aaf.v2_0.Error;
-
-import org.onap.aaf.inno.env.APIException;
-import org.onap.aaf.inno.env.Data.TYPE;
-import org.onap.aaf.rosetta.env.RosettaDF;
-import org.onap.aaf.rosetta.env.RosettaEnv;
-
-public class ErrMessage {
-	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;
-	}
-
-	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;
-	}
-}
-- 
cgit 1.2.3-korg