Improve code coverage for aaf cadi modules

Issue-ID: AAF-79
Change-Id: Ib01236cc4548a172d6455c59cd03a46b9743b09d
Signed-off-by: sg481n <sg481n@att.com>

1 files changed, 0 insertions, 147 deletions

diff --git a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
deleted file mode 100644
index 8a63680..0000000
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
+++ /dev/null
@@ -1,147 +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 com.att.cadi.aaf.v2_0;

-

-import java.io.IOException;

-import java.net.HttpURLConnection;

-import java.net.URI;

-import java.security.GeneralSecurityException;

-import java.security.Principal;

-

-import com.att.cadi.Access;

-import com.att.cadi.CadiException;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.client.AbsTransferSS;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfo;

-import com.att.cadi.http.HBasicAuthSS;

-import com.att.cadi.http.HMangr;

-import com.att.cadi.http.HRcli;

-import com.att.cadi.http.HTransferSS;

-import com.att.cadi.http.HX509SS;

-import com.att.cadi.principal.BasicPrincipal;

-import com.att.inno.env.APIException;

-

-public class AAFConHttp extends AAFCon<HttpURLConnection> {

-	private final HMangr hman;

-

-	public AAFConHttp(Access access) throws CadiException, GeneralSecurityException, IOException {

-		super(access,Config.AAF_URL,new SecurityInfo<HttpURLConnection>(access));

-		hman = new HMangr(access,Config.loadLocator(access, access.getProperty(Config.AAF_URL,null)));

-	}

-

-	public AAFConHttp(Access access, String tag) throws CadiException, GeneralSecurityException, IOException {

-		super(access,tag,new SecurityInfo<HttpURLConnection>(access));

-		hman = new HMangr(access,Config.loadLocator(access, access.getProperty(tag,null)));

-	}

-

-	public AAFConHttp(Access access, String urlTag, SecurityInfo<HttpURLConnection> si) throws CadiException {

-		super(access,urlTag,si);

-		hman = new HMangr(access,Config.loadLocator(access, access.getProperty(urlTag,null)));

-	}

-

-	public AAFConHttp(Access access, Locator locator) throws CadiException, GeneralSecurityException, IOException {

-		super(access,Config.AAF_URL,new SecurityInfo<HttpURLConnection>(access));

-		hman = new HMangr(access,locator);

-	}

-

-	public AAFConHttp(Access access, Locator locator, SecurityInfo<HttpURLConnection> si) throws CadiException {

-		super(access,Config.AAF_URL,si);

-		hman = new HMangr(access,locator);

-	}

-

-	public AAFConHttp(Access access, Locator locator, SecurityInfo<HttpURLConnection> si, String tag) throws CadiException {

-		super(access,tag,si);

-		hman = new HMangr(access, locator);

-	}

-

-	/* (non-Javadoc)

-	 * @see com.att.cadi.aaf.v2_0.AAFCon#basicAuth(java.lang.String, java.lang.String)

-	 */

-	@Override

-	public SecuritySetter<HttpURLConnection> basicAuth(String user, String password) throws CadiException {

-		if(password.startsWith("enc:???")) {

-			try {

-				password = access.decrypt(password, true);

-			} catch (IOException e) {

-				throw new CadiException("Error decrypting password",e);

-			}

-		}

-		try {

-			return set(new HBasicAuthSS(user,password,si));

-		} catch (IOException e) {

-			throw new CadiException("Error creating HBasicAuthSS",e);

-		}

-	}

-

-	public SecuritySetter<HttpURLConnection> x509Alias(String alias) throws APIException, CadiException {

-		try {

-			return set(new HX509SS(alias,si));

-		} catch (Exception e) {

-			throw new CadiException("Error creating X509SS",e);

-		}

-	}

-

-	/* (non-Javadoc)

-	 * @see com.att.cadi.aaf.v2_0.AAFCon#rclient(java.net.URI, com.att.cadi.SecuritySetter)

-	 */

-	@Override

-	protected Rcli<HttpURLConnection> rclient(URI ignoredURI, SecuritySetter<HttpURLConnection> ss) throws CadiException {

-		try {

-			return new HRcli(hman, hman.loc.best() ,ss);

-		} catch (Exception e) {

-			throw new CadiException(e);

-		}

-	}

-

-	@Override

-	public AbsTransferSS<HttpURLConnection> transferSS(Principal principal) throws CadiException {

-		return new HTransferSS(principal, app,si);

-	}

-	

-	/* (non-Javadoc)

-	 * @see com.att.cadi.aaf.v2_0.AAFCon#basicAuthSS(java.security.Principal)

-	 */

-	@Override

-	public SecuritySetter<HttpURLConnection> basicAuthSS(BasicPrincipal principal) throws CadiException {

-		try {

-			return new HBasicAuthSS(principal,si);

-		} catch (IOException e) {

-			throw new CadiException("Error creating HBasicAuthSS",e);

-		}

-	}

-

-	public HMangr hman() {

-		return hman;

-	}

-

-	@Override

-	public <RET> RET best(Retryable<RET> retryable) throws LocatorException, CadiException, APIException {

-		return hman.best(ss, (Retryable<RET>)retryable);

-	}

-	

-}