summaryrefslogtreecommitdiffstats
path: root/common/src
diff options
context:
space:
mode:
authorFrancescoFioraEst <francesco.fiora@est.tech>2021-07-13 11:18:01 +0100
committerFrancescoFioraEst <francesco.fiora@est.tech>2021-07-15 16:49:53 +0100
commit741b6c5c5eac437ae2a54a6dd5518513cdfe9034 (patch)
tree83a827f6ec593b442c13d6950d3b9440d2f3484c /common/src
parent258fdc2ddb8b5e130ccc2b287c10c3fd782b7ee9 (diff)
Convert Control Loop components to Spring and Supervision refactor
Issue-ID: POLICY-3463 Change-Id: Icc5b2ea576dbbe4cf954b51b8074f91884e93f56 Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'common/src')
-rw-r--r--common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java32
-rw-r--r--common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java95
-rw-r--r--common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java47
-rw-r--r--common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java63
4 files changed, 0 insertions, 237 deletions
diff --git a/common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java
deleted file mode 100644
index aa8b720bc..000000000
--- a/common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * 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.policy.clamp.controlloop.common;
-
-/**
- * Names of various items contained in the Registry.
- */
-public class ControlLoopConstants {
-
- // Registry keys
- public static final String REG_CLRUNTIME_ACTIVATOR = "object:activator/clruntime";
-
- private ControlLoopConstants() {
- super();
- }
-}
diff --git a/common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java
deleted file mode 100644
index 18297da42..000000000
--- a/common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.controlloop.common.handler;
-
-import java.util.List;
-import lombok.Getter;
-import lombok.NonNull;
-import org.onap.policy.common.endpoints.event.comm.TopicSink;
-import org.onap.policy.common.endpoints.listeners.MessageTypeDispatcher;
-import org.onap.policy.models.provider.PolicyModelsProviderParameters;
-
-/**
- * Abstract class for handlers for sub components in the control loop system
- *
- * <p>Instances are effectively singletons that are started at system start.
- */
-public abstract class ControlLoopHandler {
- @Getter
- private final PolicyModelsProviderParameters databaseProviderParameters;
-
- /**
- * Create a handler.
- *
- * @param databaseProviderParameters the parameters for access to the database
- */
- protected ControlLoopHandler(@NonNull PolicyModelsProviderParameters databaseProviderParameters) {
- this.databaseProviderParameters = databaseProviderParameters;
-
- }
-
- public void close() {
- }
-
- /**
- * Start any topic message listeners for this handler.
- *
- * @param msgDispatcher the message dispatcher with which to register the listener
- */
- public void startAndRegisterListeners(MessageTypeDispatcher msgDispatcher) {
- // Start and register listeners
- }
-
- /**
- * Start any topic message publishers for this handler.
- *
- * @param topicSinks the topic sinks on which the publisher can publish
- */
- public void startAndRegisterPublishers(List<TopicSink> topicSinks) {
- // Start and register publishers
- }
-
- /**
- * Stop any topic message publishers for this handler.
- */
- public void stopAndUnregisterPublishers() {
- // Stop and unregister publishers
- }
-
- /**
- * Stop any topic message listeners for this handler.
- *
- * @param msgDispatcher the message dispatcher from which to unregister the listener
- */
- public void stopAndUnregisterListeners(MessageTypeDispatcher msgDispatcher) {
- // Stop and unregister listeners
- }
-
- /**
- * Start any providers for this handler.
- */
- public abstract void startProviders();
-
- /**
- * Stop any providers for this handler.
- */
- public abstract void stopProviders();
-}
diff --git a/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java
deleted file mode 100644
index 7def2873a..000000000
--- a/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.controlloop.common.handler;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.jupiter.api.Test;
-import org.onap.policy.models.provider.PolicyModelsProviderParameters;
-
-class ControlLoopHandlerTest {
-
- @Test
- void testControlLoopHandler() {
- assertThatThrownBy(() -> new DummyControlLoopHandler(null)).isInstanceOf(NullPointerException.class);
-
- assertNotNull(new DummyControlLoopHandler(new PolicyModelsProviderParameters()));
-
- PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
-
- DummyControlLoopHandler dclh = new DummyControlLoopHandler(pars);
- assertNotNull(dclh);
-
- assertEquals(pars, dclh.getDatabaseProviderParameters());
-
- dclh.close();
- }
-}
diff --git a/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java
deleted file mode 100644
index 1602fb6eb..000000000
--- a/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.controlloop.common.handler;
-
-import java.util.List;
-import org.onap.policy.common.endpoints.event.comm.TopicSink;
-import org.onap.policy.common.endpoints.listeners.MessageTypeDispatcher;
-import org.onap.policy.models.provider.PolicyModelsProviderParameters;
-
-public class DummyControlLoopHandler extends ControlLoopHandler {
-
- public DummyControlLoopHandler(PolicyModelsProviderParameters databaseProviderParameters) {
- super(databaseProviderParameters);
- }
-
- @Override
- public void startAndRegisterListeners(MessageTypeDispatcher msgDispatcher) {
- // Do nothing on this dummy class
- }
-
- @Override
- public void startAndRegisterPublishers(List<TopicSink> topicSinks) {
- // Do nothing on this dummy class
- }
-
- @Override
- public void stopAndUnregisterPublishers() {
- // Do nothing on this dummy class
- }
-
- @Override
- public void stopAndUnregisterListeners(MessageTypeDispatcher msgDispatcher) {
- // Do nothing on this dummy class
- }
-
- @Override
- public void startProviders() {
- // Do nothing on this dummy class
- }
-
- @Override
- public void stopProviders() {
- // Do nothing on this dummy class
- }
-}