[KAFKA] Adding new client code

Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Change-Id: I38b930b1b5f4233f961d51bbab4b1828d034e67a
Issue-ID: DMAAP-1847

9 files changed, 0 insertions, 650 deletions

diff --git a/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/AuthorizationProviderFactoryTest.java b/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/AuthorizationProviderFactoryTest.java
deleted file mode 100644
index bf7890e..0000000
--- a/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/AuthorizationProviderFactoryTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  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=========================================================
- *  
- *  
- *******************************************************************************/
-package org.onap.dmaap.commonauth.kafka.base.authorization;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.net.ssl.*", "javax.security.auth.*", "jdk.internal.reflect.*", "javax.crypto.*"})
-public class AuthorizationProviderFactoryTest {
-
-	@Test
-	public void testFactory() {
-		assertNotNull(AuthorizationProviderFactory.getProviderFactory().getProvider());
-	}
-
-}
diff --git a/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java b/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java
deleted file mode 100644
index 4f9de3d..0000000
--- a/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- *  Modification copyright (C) 2021 Nordix Foundation.
- *  ================================================================================
- *  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=========================================================
- *  
- *  
- *******************************************************************************/
-package org.onap.dmaap.commonauth.kafka.base.authorization;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.net.ssl.*", "javax.security.auth.*", "jdk.internal.reflect.*"})
-public class Cadi3AAFProviderTest {
-
-	public Cadi3AAFProvider cadi3AAFProvider;
-
-	@Mock
-	private static AAFAuthn<?> aafAuthn;
-
-	static {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		System.setProperty("enableCadi", "true");
-	}
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		cadi3AAFProvider = new Cadi3AAFProvider();
-	}
-
-	@Test
-	public void testHasPermission() {
-		assertFalse(cadi3AAFProvider.hasPermission("userID", "permission", "instance", "action"));
-	}
-
-	@Test
-	public void testHasAdminPermission() {
-		assertTrue(cadi3AAFProvider.hasPermission("admin", "permission", "instance", "action"));
-	}
-	
-	public void tesAuthenticate() throws Exception {
-		when(aafAuthn.validate("userId", "password")).thenReturn("valid");
-		assertEquals("valid", cadi3AAFProvider.authenticate("userId", "password"));
-	}
-
-	@Test
-	public void tesAuthenticateAdmin() throws Exception {
-		assertNull(cadi3AAFProvider.authenticate("kafkaUsername", "apiKey"));
-	}
-	
-	@Test
-	public void tesAuthenticateAdminwtWrongCred() throws Exception {
-		assertNotNull(cadi3AAFProvider.authenticate("kafkaUsername", "api"));
-	}
-}
diff --git a/src/test/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizerTest.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizerTest.java
deleted file mode 100644
index e2e85af..0000000
--- a/src/test/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizerTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- *  Modification copyright (C) 2021 Nordix Foundation.
- *  ================================================================================
- *  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=========================================================
- *  
- *  
- *******************************************************************************/
-package org.onap.dmaap.kafkaAuthorize;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.kafka.common.acl.AclOperation;
-import org.apache.kafka.common.security.auth.KafkaPrincipal;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProvider;
-import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProviderFactory;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import kafka.network.RequestChannel.Session;
-import kafka.security.auth.Operation;
-import kafka.security.auth.Resource;
-import kafka.security.auth.ResourceType;
-
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.net.ssl.*", "javax.security.auth.*", "jdk.internal.reflect.*", "javax.crypto.*"})
-@PrepareForTest({ AuthorizationProviderFactory.class })
-public class KafkaCustomAuthorizerTest {
-	@Mock
-	Session arg0;
-	@Mock
-	Operation arg1;
-	@Mock
-	Resource arg2;
-	@Mock
-	KafkaPrincipal principal;
-	@Mock
-	ResourceType resourceType;
-	@Mock
-	AuthorizationProviderFactory factory;
-	@Mock
-	AuthorizationProvider provider;
-
-	KafkaCustomAuthorizer authorizer;
-
-	static {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		System.setProperty("enableCadi", "true");
-	}
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		PowerMockito.when(principal.getName()).thenReturn("fullName");
-		PowerMockito.when(arg0.principal()).thenReturn(principal);
-		PowerMockito.when(arg1.name()).thenReturn("Write");
-		PowerMockito.when(resourceType.name()).thenReturn("Topic");
-		PowerMockito.when(arg2.resourceType()).thenReturn(resourceType);
-		PowerMockito.when(arg2.name()).thenReturn("namespace.Topic");
-		PowerMockito.mockStatic(AuthorizationProviderFactory.class);
-		PowerMockito.when(AuthorizationProviderFactory.getProviderFactory()).thenReturn(factory);
-		PowerMockito.when(factory.getProvider()).thenReturn(provider);
-
-	}
-
-	@Test
-	public void testAuthorizerSuccess() {
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(true);
-		authorizer = new KafkaCustomAuthorizer();
-		assertTrue(authorizer.authorize(arg0, arg1, arg2));
-	}
-
-	@Test
-	public void testAuthorizerFailure() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.CREATE);
-		System.setProperty("msgRtr.topicfactory.aaf", "org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:");
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	
-	@Test
-	public void testAuthorizerFailure1() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(resourceType.name()).thenReturn("Cluster");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.CREATE);
-		System.setProperty("msgRtr.topicfactory.aaf", "org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:");
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	
-	@Test
-	public void testAuthorizerFailure2() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(resourceType.name()).thenReturn("Topic");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.WRITE);
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	
-	@Test
-	public void testAuthorizerFailure3() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(resourceType.name()).thenReturn("Topic");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.DESCRIBE);
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	@Test
-	public void testAuthorizerFailure4() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(resourceType.name()).thenReturn("Topic");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.READ);
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	
-	@Test
-	public void testAuthorizerFailure5() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(resourceType.name()).thenReturn("Cluster");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.IDEMPOTENT_WRITE);
-		System.setProperty("msgRtr.topicfactory.aaf", "org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:");
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	
-	@Test
-	public void testAuthorizerFailure6() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		PowerMockito.when(arg2.name()).thenReturn("org.onap.dmaap.mr.testtopic");
-		PowerMockito.when(arg1.toJava()).thenReturn(AclOperation.DELETE);
-		System.setProperty("msgRtr.topicfactory.aaf", "org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:");
-		PowerMockito.when(provider.hasPermission("fullName", "namespace.topic", ":topic.namespace.Topic", "pub"))
-				.thenReturn(false);
-		authorizer = new KafkaCustomAuthorizer();
-		try {
-			authorizer.authorize(arg0, arg1, arg2);
-		} catch (Exception e) {
-			assertTrue(true);
-		}
-
-	}
-	
-
-}
diff --git a/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1Test.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1Test.java
deleted file mode 100644
index 9383539..0000000
--- a/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1Test.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- *  Modification copyright (C) 2021 Nordix Foundation.
- *  ================================================================================
- *  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=========================================================
- *  
- *  
- *******************************************************************************/
-package org.onap.dmaap.kafkaAuthorize;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-
-@PowerMockIgnore({"jdk.internal.reflect.*"})
-@PrepareForTest({ PlainLoginModule1.class })
-public class PlainLoginModule1Test {
-
-	static PlainLoginModule1 pLogin = new PlainLoginModule1();
-	static Subject subject;
-	@Mock
-	static CallbackHandler callbackHandler;
-
-	@Mock
-	static Map<String, String> mymap1;
-
-	@Mock
-	static Map<String, ?> mymap2;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		PowerMockito.when(mymap1.get("username")).thenReturn("user1");
-		PowerMockito.when(mymap1.get("password")).thenReturn("pass1");
-		pLogin.initialize(subject, callbackHandler, mymap1, mymap2);
-	}
-
-	@Test
-	public void testLogin() {
-		assertTrue(pLogin.login());
-	}
-	
-	@Test
-	public void testLogout() {
-		assertTrue(pLogin.logout());
-	}
-	
-	@Test
-	public void testCommit() {
-		assertTrue(pLogin.commit());
-	}
-	
-	@Test
-	public void testAbort() {
-		assertFalse(pLogin.abort());
-	}
-}
diff --git a/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
deleted file mode 100644
index 5d18bbd..0000000
--- a/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  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=========================================================
- *  
- *  
- *******************************************************************************/
-package org.onap.dmaap.kafkaAuthorize;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslException;
-import org.apache.kafka.common.errors.SaslAuthenticationException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProvider;
-import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProviderFactory;
-import org.onap.dmaap.kafkaAuthorize.PlainSaslServer1.PlainSaslServerFactory1;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.security.auth.*", "jdk.internal.reflect.*", "javax.crypto.*"})
-@PrepareForTest({ AuthorizationProviderFactory.class })
-public class PlainSaslServer1Test {
-
-	PlainSaslServer1 sslServer = new PlainSaslServer1();
-
-	@Mock
-	AuthorizationProviderFactory factory;
-	@Mock
-	AuthorizationProvider provider;
-	@Mock
-	CallbackHandler callbackHandler;
-	@Mock
-	static Map<String, String> props;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		PowerMockito.mockStatic(AuthorizationProviderFactory.class);
-		PowerMockito.when(AuthorizationProviderFactory.getProviderFactory()).thenReturn(factory);
-		PowerMockito.when(factory.getProvider()).thenReturn(provider);
-	}
-
-	public void testAuthentication() throws Exception {
-		String response = "authorizationID\u0000username\u0000password";
-		PowerMockito.when(provider.authenticate("username", "password")).thenReturn(null);
-		assertNotNull(sslServer.evaluateResponse(response.getBytes()));
-
-	}
-
-	@Test
-	public void testAuthenticationEmptyAuth() throws Exception {
-		String response = "\u0000username\u0000password";
-		PowerMockito.when(provider.authenticate("username", "password")).thenReturn(null);
-		assertNotNull(sslServer.evaluateResponse(response.getBytes()));
-	}
-
-	@Test
-	public void testAuthenticationEmptyUser() throws Exception {
-		String response = "authorizationID\u0000\u0000password";
-		PowerMockito.when(provider.authenticate("username", "password")).thenReturn(null);
-		try {
-			sslServer.evaluateResponse(response.getBytes());
-		}
-		catch (SaslAuthenticationException e) {
-			assertNotNull(e);
-		}
-	}
-
-	@Test
-	public void testAuthenticationEmptyPassword() throws Exception {
-		String response = "authorizationID\u0000username\u0000";
-		PowerMockito.when(provider.authenticate("username", "password")).thenReturn(null);
-		try {
-			sslServer.evaluateResponse(response.getBytes());
-		}
-		catch (SaslAuthenticationException e) {
-			assertNotNull(e);
-		}
-	}
-	
-	@Test
-	public void testGetAuthorizationIdWithException() {
-		try {
-		sslServer.getAuthorizationID();
-		}
-		catch (IllegalStateException ise) {
-			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		}
-	}
-
-	@Test
-	public void testGetNegotiatedPropertyWithException() {
-		try {
-		sslServer.getNegotiatedProperty("test");
-		}
-		catch (IllegalStateException ise) {
-			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		}
-	}
-	
-	@Test
-	public void testIsComplete() {
-		try {
-		sslServer.getNegotiatedProperty("test");
-		}
-		catch (IllegalStateException ise) {
-			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		}
-		assert(true);
-	}	
-
-	@Test
-	public void testUnwrap() {
-		try {
-		sslServer.unwrap(new byte[1], 0, 0);
-		}
-		catch (IllegalStateException ise) {
-			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		} catch (SaslAuthenticationException e) {
-			e.printStackTrace();
-		}
-		assert(true);
-	}	
-	
-	@Test
-	public void testWrap() {
-		try {
-		sslServer.wrap(new byte[1], 0, 0);
-		}
-		catch (IllegalStateException ise) {
-			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		} catch (SaslAuthenticationException e) {
-			e.printStackTrace();
-		}
-		assert(true);
-	}
-
-	@Test
-	public void testGetMech() {
-		assertEquals("PLAIN", sslServer.getMechanismName());
-	}
-
-	@Test
-	public void testIsCompleteBool() {
-		assertFalse(sslServer.isComplete());
-	}
-
-	@Test
-	public void testPlainSaslServer1() throws SaslException {
-		PlainSaslServerFactory1 plainSaslServerFactory1 = new PlainSaslServerFactory1();
-		PlainSaslServer1 saslServer1 = (PlainSaslServer1) plainSaslServerFactory1.createSaslServer(PlainSaslServer1.PLAIN_MECHANISM, "https", "mySaslServer", props, callbackHandler);
-		assertNotNull(saslServer1);
-		Mockito.when(props.get(Sasl.POLICY_NOPLAINTEXT)).thenReturn("javax.security.sasl.policy.noplaintext");
-		assertEquals(new String[]{"PLAIN"}, plainSaslServerFactory1.getMechanismNames(props));
-	}
-}
diff --git a/src/test/resources/cadi.properties b/src/test/resources/cadi.properties
deleted file mode 100644
index fc14bf1..0000000
--- a/src/test/resources/cadi.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-aaf_locate_url=https://aaf-locate.onap:8095
-aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
-aaf_env=DEV
-aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm
-
-cadi_truststore=src/test/resources/org.onap.dmaap.mr.trust.jks
-cadi_truststore_password=@MP:Wc^8}%n6tG1kr]MI{:#V
-
-cadi_keyfile=src/test/resources/org.onap.dmaap.mr.keyfile
-
-cadi_alias=dmaapmr@mr.dmaap.onap.org
-cadi_keystore=src/test/resources/org.onap.dmaap.mr.p12
-cadi_keystore_password=iAHma{haRm)lJ^ah5Au{nZ;$
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
-
-cadi_loglevel=INFO
-cadi_protocols=TLSv1.1,TLSv1.2
-cadi_latitude=37.78187
-cadi_longitude=-122.26147
diff --git a/src/test/resources/org.onap.dmaap.mr.keyfile b/src/test/resources/org.onap.dmaap.mr.keyfile
deleted file mode 100644
index 977f63a..0000000
--- a/src/test/resources/org.onap.dmaap.mr.keyfile
+++ /dev/null
@@ -1,27 +0,0 @@
-TbnInQ-QMCbTM2Kl9R8DfsTKhwt0nv8PTHooRfzyuHDQD3bHVmU4vjGXeQaFbj1Rq_DcOz6shg8k
-mYL0F5L0a-ZxO8id4sbkKqs_BAcRMf4PLJB0X0kBEvAq7Cqt_Hafgq4tz3c_OmutLJlGsWU4AtDe
-b68ISK2TG_P1CJGO-Y4xmRC4WW3YxnrL7pWq3r1VJ59KLlCAkL796EGy253lP2Uxl3788uUHZo-Q
-h74Yq3sxyyBn2shlH6vhRFOY8PVXO2-ljmBHrQj_NpL62ensYb1cxuGD5mivayGo2g98S3pX2ec2
-jhBB1uXsRSOJ-g1oScB9mDJYkib5l52lNKGw_ZSVaTNh2BP8T-HQjtgpM4lRps6nqLpwzV37u5wi
-67a5KIAdQz4txAjBBr62zGBpwkvEOgrtG-fk3Gh6C6C8KwxfUk-mysZNP1SaWLG0U4T05ilnrZa6
-PNqr35wqh_IBfJj2iK1pLqvlFCq8-VDDg1HWNvzlTzyzmlIFNrvHRaskgoM0QNi9ulbQyZ-j6Nsw
-l0B4khpNcOt2nc2cnI_jK7yy92i9I3IF4RcubZJSwvL1UEhtbw21XgIaWOcfnCmzIDdUZ33T-eNn
-6C6nL4_YAYfSndxOtr25tuUAbq5LWvXKUij1HAaQluN4gBMJxIdY4qm_tcKDxLTsHPTsjujyA_vr
-Ut2RWwwIqvUb98Sf2P7r8aIJe6GYrbKMs4mEnbKHzWibaW5z6652EGK20-Z3gvnZaGZ103fcV_4C
-IIQUxMmZf8TbPgjMHAP-f-uLCoQ9pPSAFsm3tdQB8IRCsfIFXsg65FPpa2YW7lVpwajCa-hPcGer
-pDbT7gKvUNijmcokNFRjjCiMUv8GyXk9xJ1XUB54pb0pZO9Nvswn94FHTpJV8o-ZSeEbnWGYfbFP
-gJYtLMrjmoolSQeGOH3gZiLoi_qkscBXhVVQ8_USSouQQPVgs2CgHpYqCrEeul9tIVTEQ6Ae_-nY
-IZKHmaEWewIRa7MhP3QzdwbuQ4v5V8D2vYYGrfrTSCOogPx8nwLKhfD1uztbMFb3pZ_qfjEvvL93
-2s8M2tnAGKXOG4z-TLQZmA0KkW32B0IB7XKQBQaElHlkbv2Sibt87APkTk38H4dlGGs1eVRnjmyX
-7sIjtbPSCzU9YXr6sRzCQH6qbzdioExUJQYNmraLx8JwJZw-C5_6jUc1jYkGMB3WFGj5i8awxSGM
-aPOeH8s6PzwK0M_4hsdl_40S8KVtaMH3541hxpUeTl_wWtlYGyRefHzSB3cEE_UD3ZvKaR56DFFJ
-szIVTeNBgZewHPkRyUiUYM3OhUwgbGkLPMA5es60qXGstqGUUZWWGRNOjE8aqQDOMElPpMZOFeqi
-m-zaUNU5i0uVpgwfEGVzl5i3jr6qRRnRRYyt7Ufiq_-L4gATQ_FtpO3YR87V9MSqKFoFT1Lr9XSg
-_-RSlaZ_uUc6DeplZqD3sExqqz3RcxvyaF1pieFMAv4IUb2-8FwNVSiMymT4g_F98s3iavydu5oy
-YtnYVAMgXeMM_O3uLnWX3uyNDWVTmSmYHSm9L0yL84E55Q-KHyjRJ5k5MKqAOmj_NzpdFyJ0zvly
-wI145Rr0IErHcrVAaqk7PR1NMoRFnndd3eRWRnsP8JzajvZfJLtLIiR2KRBl8q3Hw55rx0zr7lLu
-Wf_tRnAHfhdvwaTXZiGWPDTVOm4LlXUYm4WNu2RjEJeKq0aJ8z4aRSynxAE95xBn4wPEgu76l97X
-ipIYDz8Fv2VD4k2Oe358FtQri6wxeHV_0PVJqwSGthn3X9aDpfrAl4scUU8SoOG6CGkWRM1U1ALv
-2pv7aYrdv729j-2F8UTdXYDCxg8nlXXIi0RekPviB-AhQRX9vt4z4z6ePFXKIZqf5Lt0diG4rz_z
--tN7Vyb21CsgcE-yDk_yonyp66G1dOFMaJd-FXelfyx-9-0PskvRCrD_OMspAqb7xqDyML2CSZxs
-BvDTH9V-5Ixr72FlA3jecd9SJwCE_icpdqttZnkF-Gu7DN2dHM31WIX7ivnwef2YmxtglwKL
\ No newline at end of file
diff --git a/src/test/resources/org.onap.dmaap.mr.p12 b/src/test/resources/org.onap.dmaap.mr.p12
deleted file mode 100644
index 589075e..0000000
--- a/src/test/resources/org.onap.dmaap.mr.p12
+++ /dev/null
diff --git a/src/test/resources/org.onap.dmaap.mr.trust.jks b/src/test/resources/org.onap.dmaap.mr.trust.jks
deleted file mode 100644
index c2e8111..0000000
--- a/src/test/resources/org.onap.dmaap.mr.trust.jks
+++ /dev/null