Fix Security and Unit Test DB issues

This review removes more links to the Zookeeper version 3.5.4-beta with
Zookeeper version 3.4.14.

It also replaces the Derby in-memory database with the H2 in memory
database for unit tests.

Issue-ID: POLICY-1540
Change-Id: Ic44f2e866644114b7c0cf66aac7e528017b8206b
Signed-off-by: liamfallon <liam.fallon@est.tech>

4 files changed, 0 insertions, 306 deletions

diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
index 28b822553..582ef1c71 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
@@ -35,12 +35,6 @@
             <artifactId>hazelcast</artifactId>
             <version>${version.hazelcast}</version>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.context</groupId>
-            <artifactId>context-test-utils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java
deleted file mode 100644
index 9d7f003ee..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.context.distribution.hazelcast;
-
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters;
-import org.onap.policy.apex.context.parameters.ContextParameterConstants;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.context.parameters.SchemaParameters;
-import org.onap.policy.apex.context.test.distribution.ContextAlbumUpdate;
-import org.onap.policy.apex.context.test.distribution.ContextInstantiation;
-import org.onap.policy.apex.context.test.distribution.ContextUpdate;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.common.parameters.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class HazelcastContextDistributorTest.
- */
-public class HazelcastContextDistributorTest {
-    private static final String HAZEL_CAST_PLUGIN_CLASS = HazelcastContextDistributor.class.getCanonicalName();
-    // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(HazelcastContextDistributorTest.class);
-
-    private SchemaParameters schemaParameters;
-    private ContextParameters contextParameters;
-
-    /**
-     * Before test.
-     */
-    @Before
-    public void beforeTest() {
-        contextParameters = new ContextParameters();
-
-        contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME);
-        contextParameters.getDistributorParameters().setName(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
-        contextParameters.getLockManagerParameters().setName(ContextParameterConstants.LOCKING_GROUP_NAME);
-        contextParameters.getPersistorParameters().setName(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
-
-        contextParameters.getDistributorParameters().setPluginClass(HAZEL_CAST_PLUGIN_CLASS);
-
-        ParameterService.register(contextParameters);
-        ParameterService.register(contextParameters.getDistributorParameters());
-        ParameterService.register(contextParameters.getLockManagerParameters());
-        ParameterService.register(contextParameters.getPersistorParameters());
-        
-        schemaParameters = new SchemaParameters();
-        schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME);
-        schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters());
-
-        ParameterService.register(schemaParameters);
-    }
-
-    /**
-     * After test.
-     */
-    @After
-    public void afterTest() {
-        ParameterService.deregister(schemaParameters);
-
-        ParameterService.deregister(contextParameters.getDistributorParameters());
-        ParameterService.deregister(contextParameters.getLockManagerParameters());
-        ParameterService.deregister(contextParameters.getPersistorParameters());
-        ParameterService.deregister(contextParameters);
-    }
-    
-    /**
-     * Test context album update hazelcast.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testContextAlbumUpdateHazelcast() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextAlbumUpdateHazelcast test . . .");
-
-        new ContextAlbumUpdate().testContextAlbumUpdate();
-
-        logger.debug("Ran testContextAlbumUpdateHazelcast test");
-    }
-
-    /**
-     * Test context instantiation hazelcast.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testContextInstantiationHazelcast() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextInstantiationHazelcast test . . .");
-
-        new ContextInstantiation().testContextInstantiation();
-
-        logger.debug("Ran testContextInstantiationHazelcast test");
-    }
-
-    /**
-     * Test context update hazelcast.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testContextUpdateHazelcast() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextUpdateHazelcast test . . .");
-
-        new ContextUpdate().testContextUpdate();
-
-        logger.debug("Ran testContextUpdateHazelcast test");
-    }
-}
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index 5cfdc2e18..b01b955c4 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -41,12 +41,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.context</groupId>
-            <artifactId>context-test-utils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java
deleted file mode 100644
index 3da1cf509..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.context.distribution.infinispan;
-
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters;
-import org.onap.policy.apex.context.parameters.ContextParameterConstants;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.context.parameters.SchemaParameters;
-import org.onap.policy.apex.context.test.distribution.ContextAlbumUpdate;
-import org.onap.policy.apex.context.test.distribution.ContextInstantiation;
-import org.onap.policy.apex.context.test.distribution.ContextUpdate;
-import org.onap.policy.apex.context.test.distribution.SequentialContextInstantiation;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.common.parameters.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class InfinispanContextDistributorTest.
- */
-public class InfinispanContextDistributorTest {
-    private static final XLogger logger = XLoggerFactory.getXLogger(InfinispanContextDistributorTest.class);
-
-    private static final String PLUGIN_CLASS = InfinispanContextDistributor.class.getCanonicalName();
-
-    private SchemaParameters schemaParameters;
-    private ContextParameters contextParameters;
-
-    /**
-     * Before test.
-     */
-    @Before
-    public void beforeTest() {
-        contextParameters = new ContextParameters();
-
-        contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME);
-        InfinispanDistributorParameters inifinispanDistributorParameters = new InfinispanDistributorParameters();
-        inifinispanDistributorParameters.setName(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
-        inifinispanDistributorParameters.setPluginClass(PLUGIN_CLASS);
-        contextParameters.setDistributorParameters(inifinispanDistributorParameters);
-        contextParameters.getLockManagerParameters().setName(ContextParameterConstants.LOCKING_GROUP_NAME);
-        contextParameters.getPersistorParameters().setName(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
-
-        ParameterService.register(contextParameters);
-        ParameterService.register(contextParameters.getDistributorParameters());
-        ParameterService.register(contextParameters.getLockManagerParameters());
-        ParameterService.register(contextParameters.getPersistorParameters());
-        
-        schemaParameters = new SchemaParameters();
-        schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME);
-        schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters());
-
-        ParameterService.register(schemaParameters);
-    }
-
-    /**
-     * After test.
-     */
-    @After
-    public void afterTest() {
-        ParameterService.deregister(schemaParameters);
-
-        ParameterService.deregister(contextParameters.getDistributorParameters());
-        ParameterService.deregister(contextParameters.getLockManagerParameters());
-        ParameterService.deregister(contextParameters.getPersistorParameters());
-        ParameterService.deregister(contextParameters);
-    }
-
-    /**
-     * Test context album update infinispan.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testContextAlbumUpdateInfinispan() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextAlbumUpdateInfinispan test . . .");
-
-        new ContextAlbumUpdate().testContextAlbumUpdate();
-
-        logger.debug("Ran testContextAlbumUpdateInfinispan test");
-    }
-
-    /**
-     * Test context instantiation infinispan.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testContextInstantiationInfinispan() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextInstantiationInfinispan test . . .");
-
-        new ContextInstantiation().testContextInstantiation();
-
-        logger.debug("Ran testContextInstantiationInfinispan test");
-    }
-
-    /**
-     * Test context update infinispan.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testContextUpdateInfinispan() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextUpdateInfinispan test . . .");
-
-        new ContextUpdate().testContextUpdate();
-
-        logger.debug("Ran testContextUpdateInfinispan test");
-    }
-
-    /**
-     * Test sequential context instantiation infinispan.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testSequentialContextInstantiationInfinispan() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testSequentialContextInstantiationInfinispan test . . .");
-
-        new SequentialContextInstantiation().testSequentialContextInstantiation();
-
-        logger.debug("Ran testSequentialContextInstantiationInfinispan test");
-    }
-}