Move tosca-controlloop src directries to new modulestosca-poc

This is the second stage of the TOSCA Controlloop merge.

In this review, the src directories of the old tosca-controlloop modules
are moved to the new modules off the root of the clamp repo and the
pom.xml files are updated with dependencies to allow the build of the
moved modules to run.

So the changes are renaming of files and updates of POM files in the
modules to which src directories are added so that the build works, and
of course deletion of the tosca-controlloop directory and its sub-
modules

The third and final review will follow this, which will merge the
tosca-poc branch onto master, in effect merging this review to master.

The differences with the clamp master repo are shown here:
diff -qr clamp clamp-tp | diff_filter.sh
Files clamp/INFO.yaml and clamp-tp/INFO.yaml differ
Only in clamp-tp/common: src
Only in clamp-tp/models: src
Files clamp/participant/participant-impl/participant-impl-dcae/pom.xml and clamp-tp/participant/participant-impl/participant-impl-dcae/pom.xml differ
Only in clamp-tp/participant/participant-impl/participant-impl-dcae: src
Only in clamp-tp/participant/participant-impl/participant-impl-policy: src
Only in clamp-tp/participant/participant-impl/participant-impl-simulator: src
Files clamp/participant/participant-impl/pom.xml and clamp-tp/participant/participant-impl/pom.xml differ
Only in clamp-tp/participant/participant-intermediary: src
Files clamp/participant/pom.xml and clamp-tp/participant/pom.xml differ
Files clamp/pom.xml and clamp-tp/pom.xml differ
Only in clamp/releases: 6.0.1-container.yaml
Only in clamp/releases: 6.0.1.yaml
Only in clamp/releases: 6.0.2-container.yaml
Only in clamp/releases: 6.0.2.yaml
Only in clamp/releases: 6.1.0-container.yaml
Only in clamp/releases: 6.1.0.yaml
Only in clamp/releases: 6.1.1-container.yaml
Only in clamp/releases: 6.1.1.yaml
Files clamp/runtime/pom.xml and clamp-tp/runtime/pom.xml differ
Only in clamp-tp: runtime-controlloop

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

1 files changed, 296 insertions, 0 deletions

diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java
new file mode 100644
index 000000000..01062b046
--- /dev/null
+++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java
@@ -0,0 +1,296 @@
+/*-
+ * ============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.models.controlloop.persistence.concepts;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import org.junit.Test;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoops;
+import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.models.base.PfConceptKey;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
+
+/**
+ * Test the {@link JpaControlLoopTest} class.
+ */
+public class JpaControlLoopTest {
+
+    private static final String NULL_KEY_ERROR = "key is marked .*ull but is null";
+
+    @Test
+    public void testJpaControlLoopConstructor() {
+        assertThatThrownBy(() -> {
+            new JpaControlLoop((JpaControlLoop) null);
+        }).hasMessageMatching("copyConcept is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop((PfConceptKey) null);
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, null, null, null);
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, null, null, new LinkedHashMap<>());
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, null, ControlLoopState.UNINITIALISED, null);
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, null, ControlLoopState.UNINITIALISED, new LinkedHashMap<>());
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, new PfConceptKey(), null, null);
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, new PfConceptKey(), null, new LinkedHashMap<>());
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, new PfConceptKey(), ControlLoopState.UNINITIALISED, null);
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(null, new PfConceptKey(), ControlLoopState.UNINITIALISED, new LinkedHashMap<>());
+        }).hasMessageMatching(NULL_KEY_ERROR);
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), null, null, null);
+        }).hasMessageMatching("definition is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), null, null, new LinkedHashMap<>());
+        }).hasMessageMatching("definition is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), null, ControlLoopState.UNINITIALISED, null);
+        }).hasMessageMatching("definition is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), null, ControlLoopState.UNINITIALISED, new LinkedHashMap<>());
+        }).hasMessageMatching("definition is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), new PfConceptKey(), null, null);
+        }).hasMessageMatching("state is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), new PfConceptKey(), null, new LinkedHashMap<>());
+        }).hasMessageMatching("state is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
+            new JpaControlLoop(new PfConceptKey(), new PfConceptKey(), ControlLoopState.UNINITIALISED, null);
+        }).hasMessageMatching("elements is marked .*ull but is null");
+
+        assertNotNull(new JpaControlLoop());
+        assertNotNull(new JpaControlLoop((new PfConceptKey())));
+        assertNotNull(new JpaControlLoop(new PfConceptKey(), new PfConceptKey(), ControlLoopState.UNINITIALISED,
+                new LinkedHashMap<>()));
+    }
+
+    @Test
+    public void testJpaControlLoop() {
+        JpaControlLoop testJpaControlLoop = createJpaControlLoopInstance();
+
+        ControlLoop participant = createControlLoopInstance();
+        assertEquals(participant, testJpaControlLoop.toAuthorative());
+
+        assertThatThrownBy(() -> {
+            testJpaControlLoop.fromAuthorative(null);
+        }).hasMessageMatching("controlLoop is marked .*ull but is null");
+
+        assertThatThrownBy(() -> new JpaControlLoop((JpaControlLoop) null)).isInstanceOf(NullPointerException.class);
+
+        JpaControlLoop testJpaControlLoopFa = new JpaControlLoop();
+        testJpaControlLoopFa.setKey(null);
+        testJpaControlLoopFa.fromAuthorative(participant);
+        assertEquals(testJpaControlLoop, testJpaControlLoopFa);
+        testJpaControlLoopFa.setKey(PfConceptKey.getNullKey());
+        testJpaControlLoopFa.fromAuthorative(participant);
+        assertEquals(testJpaControlLoop, testJpaControlLoopFa);
+        testJpaControlLoopFa.setKey(new PfConceptKey("control-loop", "0.0.1"));
+        testJpaControlLoopFa.fromAuthorative(participant);
+        assertEquals(testJpaControlLoop, testJpaControlLoopFa);
+
+        assertEquals("control-loop", testJpaControlLoop.getKey().getName());
+        assertEquals("control-loop", new JpaControlLoop(createControlLoopInstance()).getKey().getName());
+        assertEquals("control-loop",
+                ((PfConceptKey) new JpaControlLoop(createControlLoopInstance()).getKeys().get(0)).getName());
+
+        testJpaControlLoop.clean();
+        assertEquals("control-loop", testJpaControlLoop.getKey().getName());
+
+        testJpaControlLoop.setDescription("   A Message   ");
+        testJpaControlLoop.clean();
+        assertEquals("A Message", testJpaControlLoop.getDescription());
+
+        JpaControlLoop testJpaControlLoop2 = new JpaControlLoop(testJpaControlLoop);
+        assertEquals(testJpaControlLoop, testJpaControlLoop2);
+    }
+
+    @Test
+    public void testJpaControlLoopElementOrderedState() throws CoderException {
+        ControlLoop testControlLoop = createControlLoopInstance();
+        JpaControlLoop testJpaControlLoop = createJpaControlLoopInstance();
+
+        testJpaControlLoop.setOrderedState(null);
+        assertEquals(testControlLoop, testJpaControlLoop.toAuthorative());
+        testJpaControlLoop.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
+
+        ControlLoop noOrderedStateCl = new StandardCoder()
+                .decode(new File("src/test/resources/json/ControlLoopNoOrderedState.json"), ControlLoop.class);
+
+        JpaControlLoop noOrderedStateJpaCl = new JpaControlLoop(noOrderedStateCl);
+        assertNull(noOrderedStateJpaCl.getOrderedState());
+        noOrderedStateCl.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
+        noOrderedStateJpaCl = new JpaControlLoop(noOrderedStateCl);
+        assertEquals(testJpaControlLoop, noOrderedStateJpaCl);
+
+        ControlLoops controlLoopsWithElements = new StandardCoder()
+                .decode(new File("src/test/resources/providers/TestControlLoops.json"), ControlLoops.class);
+
+        JpaControlLoop jpaControlLoopWithElements =
+                new JpaControlLoop(controlLoopsWithElements.getControlLoopList().get(0));
+        assertEquals(4, jpaControlLoopWithElements.getElements().size());
+        assertEquals(18, jpaControlLoopWithElements.getKeys().size());
+        assertThatCode(() -> jpaControlLoopWithElements.clean()).doesNotThrowAnyException();
+
+        assertEquals(controlLoopsWithElements.getControlLoopList().get(0), jpaControlLoopWithElements.toAuthorative());
+    }
+
+    @Test
+    public void testJpaControlLoopValidation() {
+        JpaControlLoop testJpaControlLoop = createJpaControlLoopInstance();
+
+        assertThatThrownBy(() -> {
+            testJpaControlLoop.validate(null);
+        }).hasMessageMatching("fieldName is marked .*ull but is null");
+
+        assertTrue(testJpaControlLoop.validate("").isValid());
+    }
+
+    @Test
+    public void testJpaControlLoopCompareTo() {
+        JpaControlLoop testJpaControlLoop = createJpaControlLoopInstance();
+
+        JpaControlLoop otherJpaControlLoop = new JpaControlLoop(testJpaControlLoop);
+        assertEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+        assertEquals(-1, testJpaControlLoop.compareTo(null));
+        assertEquals(0, testJpaControlLoop.compareTo(testJpaControlLoop));
+        assertNotEquals(0, testJpaControlLoop.compareTo(new DummyJpaControlLoopChild()));
+
+        testJpaControlLoop.setKey(new PfConceptKey("BadValue", "0.0.1"));
+        assertNotEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+        testJpaControlLoop.setKey(new PfConceptKey("control-loop", "0.0.1"));
+        assertEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+
+        testJpaControlLoop.setDefinition(new PfConceptKey("BadValue", "0.0.1"));
+        assertNotEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+        testJpaControlLoop.setDefinition(new PfConceptKey("controlLoopDefinitionName", "0.0.1"));
+        assertEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+
+        testJpaControlLoop.setState(ControlLoopState.PASSIVE);
+        assertNotEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+        testJpaControlLoop.setState(ControlLoopState.UNINITIALISED);
+        assertEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+
+        testJpaControlLoop.setOrderedState(ControlLoopOrderedState.PASSIVE);
+        assertNotEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+        testJpaControlLoop.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
+        assertEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+
+        testJpaControlLoop.setDescription("A description");
+        assertNotEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+        testJpaControlLoop.setDescription(null);
+        assertEquals(0, testJpaControlLoop.compareTo(otherJpaControlLoop));
+
+        assertEquals(testJpaControlLoop, new JpaControlLoop(testJpaControlLoop));
+    }
+
+    @Test
+    public void testJpaControlLoopLombok() {
+        assertNotNull(new ControlLoop());
+        JpaControlLoop cl0 = new JpaControlLoop();
+
+        assertThat(cl0.toString()).contains("JpaControlLoop(");
+        assertThat(cl0.hashCode()).isNotZero();
+        assertEquals(true, cl0.equals(cl0));
+        assertEquals(false, cl0.equals(null));
+
+
+        JpaControlLoop cl1 = new JpaControlLoop();
+
+        cl1.setDefinition(new PfConceptKey("defName", "0.0.1"));
+        cl1.setDescription("Description");
+        cl1.setElements(new LinkedHashMap<>());
+        cl1.setKey(new PfConceptKey("participant", "0.0.1"));
+        cl1.setState(ControlLoopState.UNINITIALISED);
+
+        assertThat(cl1.toString()).contains("ControlLoop(");
+        assertEquals(false, cl1.hashCode() == 0);
+        assertEquals(false, cl1.equals(cl0));
+        assertEquals(false, cl1.equals(null));
+
+        assertNotEquals(cl1, cl0);
+
+        JpaControlLoop cl2 = new JpaControlLoop();
+        assertEquals(cl2, cl0);
+    }
+
+    private JpaControlLoop createJpaControlLoopInstance() {
+        ControlLoop testControlLoop = createControlLoopInstance();
+        JpaControlLoop testJpaControlLoop = new JpaControlLoop();
+        testJpaControlLoop.setKey(null);
+        testJpaControlLoop.fromAuthorative(testControlLoop);
+        testJpaControlLoop.setKey(PfConceptKey.getNullKey());
+        testJpaControlLoop.fromAuthorative(testControlLoop);
+
+        return testJpaControlLoop;
+    }
+
+    private ControlLoop createControlLoopInstance() {
+        ControlLoop testControlLoop = new ControlLoop();
+        testControlLoop.setName("control-loop");
+        testControlLoop.setVersion("0.0.1");
+        testControlLoop.setDefinition(new ToscaConceptIdentifier("controlLoopDefinitionName", "0.0.1"));
+        testControlLoop.setElements(new LinkedHashMap<>());
+
+        return testControlLoop;
+    }
+}