From b109c218ab7db28fd1cbe62c808496dfdedad809 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 18 Jul 2018 11:23:20 +0100 Subject: Fix incorrect naming on context plugins This change fixes inconsistent naming on the context plugins in APEX. All plugins should fillow the naming convention of plugin-A.plugin-A.B.plugin.A.B.C and so on. Not following this convention breaks the APEX documentation build. Issue-ID: POLICY-954 Change-Id: I8aad4a28d143427e60017eaa119ee4f7ce9f5b3d Signed-off-by: liamfallon --- .../context-distribution-hazelcast/pom.xml | 46 --------- .../hazelcast/HazelcastContextDistributor.java | 106 --------------------- .../distribution/hazelcast/package-info.java | 27 ------ .../main/resources/hazelcast/hazelcast.xml.sample | 55 ----------- .../hazelcast/HazelcastContextDistributorTest.java | 74 -------------- 5 files changed, 308 deletions(-) delete mode 100644 plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml delete mode 100644 plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java delete mode 100644 plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java delete mode 100644 plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample delete mode 100644 plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java (limited to 'plugins/plugins-context/context-distribution/context-distribution-hazelcast') diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml b/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml deleted file mode 100644 index 71806c54f..000000000 --- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution - 2.0.0-SNAPSHOT - - - context-distribution-hazelcast - ${project.artifactId} - [${project.parent.artifactId}] Plugin for distribution using Hazelcast - - - - com.hazelcast - hazelcast - ${version.hazelcast} - - - org.onap.policy.apex-pdp.context - context-test-utils - ${project.version} - test - - - \ No newline at end of file diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java b/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java deleted file mode 100644 index 2b17b17cf..000000000 --- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java +++ /dev/null @@ -1,106 +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.util.Map; - -import org.onap.policy.apex.context.ContextException; -import org.onap.policy.apex.context.impl.distribution.AbstractDistributor; -import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; -import org.slf4j.ext.XLogger; -import org.slf4j.ext.XLoggerFactory; - -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; - -/** - * This context distributor distributes context across threads in multiple JVMs on multiple hosts. - * It uses hazelcast to distribute maps. - * - * @author Liam Fallon (liam.fallon@ericsson.com) - */ -public class HazelcastContextDistributor extends AbstractDistributor { - // Logger for this class - private static final XLogger LOGGER = XLoggerFactory.getXLogger(HazelcastContextDistributor.class); - - // The hazelcast instance for distributing context for this JVM - private static HazelcastInstance hazelcastInstance = null; - - /** - * Create an instance of a Hazelcast Context Distributor. - * - * @throws ContextException On errors creating the context distributor - */ - public HazelcastContextDistributor() throws ContextException { - super(); - LOGGER.entry("HazelcastContextDistributor()"); - - LOGGER.exit("HazelcastContextDistributor()"); - } - - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.distribution.AbstractContextDistributor#init(org.onap. - * policy.apex.model.basicmodel.concepts.AxArtifactKey) - */ - @Override - public void init(final AxArtifactKey key) throws ContextException { - LOGGER.entry("init(" + key + ")"); - - super.init(key); - - // Create the hazelcast instance if it does not already exist - if (hazelcastInstance == null) { - hazelcastInstance = Hazelcast.newHazelcastInstance(); - } - - LOGGER.exit("init(" + key + ")"); - } - - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor# - * getContextAlbumMap(org.onap.policy.apex.core.model.concepts.AxArtifactKey) - */ - @Override - public Map getContextAlbumMap(final AxArtifactKey contextAlbumKey) { - // Get the map from Hazelcast - LOGGER.info("HazelcastContextDistributor: create album: " + contextAlbumKey.getID()); - return hazelcastInstance.getMap(contextAlbumKey.getID()); - } - - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor#shutdown() - */ - @Override - public void shutdown() { - // Shut down the hazelcast instance - if (hazelcastInstance != null) { - hazelcastInstance.shutdown(); - } - hazelcastInstance = null; - } -} diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java b/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java deleted file mode 100644 index 027aeecde..000000000 --- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java +++ /dev/null @@ -1,27 +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========================================================= - */ - -/** - * Implements the Hazelcast context distributor for distribution - * of Apex context across JVMs. - * - * @author Liam Fallon (liam.fallon@ericsson.com) - */ -package org.onap.policy.apex.plugins.context.distribution.hazelcast; diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample b/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample deleted file mode 100644 index 5f6c1b005..000000000 --- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - ApexHazelcastGroup - ApexHazelcastGroupPassword - - - 5706 - - - 224.2.2.10 - 54327 - - - 127.0.0.1 - - - - - 127.0.0.* - - - - true - slf4j - - false - 60 - - - 16 - - diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java b/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java deleted file mode 100644 index c999c95f0..000000000 --- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java +++ /dev/null @@ -1,74 +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.Test; -import org.onap.policy.apex.context.parameters.ContextParameters; -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.slf4j.ext.XLogger; -import org.slf4j.ext.XLoggerFactory; - -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); - - - @Test - public void testContextAlbumUpdateHazelcast() throws ApexModelException, IOException, ApexException { - logger.debug("Running testContextAlbumUpdateHazelcast test . . ."); - - final ContextParameters contextParameters = new ContextParameters(); - contextParameters.getDistributorParameters().setPluginClass(HAZEL_CAST_PLUGIN_CLASS); - new ContextAlbumUpdate().testContextAlbumUpdate(); - - logger.debug("Ran testContextAlbumUpdateHazelcast test"); - } - - @Test - public void testContextInstantiationHazelcast() throws ApexModelException, IOException, ApexException { - logger.debug("Running testContextInstantiationHazelcast test . . ."); - - final ContextParameters contextParameters = new ContextParameters(); - contextParameters.getDistributorParameters().setPluginClass(HAZEL_CAST_PLUGIN_CLASS); - new ContextInstantiation().testContextInstantiation(); - - logger.debug("Ran testContextInstantiationHazelcast test"); - } - - @Test - public void testContextUpdateHazelcast() throws ApexModelException, IOException, ApexException { - logger.debug("Running testContextUpdateHazelcast test . . ."); - - final ContextParameters contextParameters = new ContextParameters(); - contextParameters.getDistributorParameters().setPluginClass(HAZEL_CAST_PLUGIN_CLASS); - new ContextUpdate().testContextUpdate(); - - logger.debug("Ran testContextUpdateHazelcast test"); - } - -} -- cgit