Merge "Add copy constructors to more models-pdp classes"

4 files changed, 165 insertions, 2 deletions

diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java
index bca162e91..d8f938bbc 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java
@@ -28,7 +28,8 @@ import org.onap.policy.models.pdp.enums.PdpMessageType;
 import org.onap.policy.models.pdp.enums.PdpState;
 
 /**
- * Class to represent the PDP_STATE_CHANGE message that PAP will send to either PDPGroup/Subgroup or a PDP.
+ * Class to represent the PDP_STATE_CHANGE message that PAP will send to either
+ * PDPGroup/Subgroup or a PDP.
  *
  * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
  */
@@ -49,4 +50,18 @@ public class PdpStateChange extends PdpMessage {
     public PdpStateChange() {
         super(PdpMessageType.PDP_STATE_CHANGE);
     }
+
+    /**
+     * Constructs the object, making a deep copy.
+     *
+     * @param source source from which to copy
+     */
+    public PdpStateChange(PdpStateChange source) {
+        super(PdpMessageType.PDP_STATE_CHANGE);
+
+        this.name = source.name;
+        this.state = source.state;
+        this.pdpGroup = source.pdpGroup;
+        this.pdpSubgroup = source.pdpSubgroup;
+    }
 }
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java
index 5c99a56f5..c8c8783df 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java
@@ -22,7 +22,7 @@
 package org.onap.policy.models.pdp.concepts;
 
 import java.util.List;
-
+import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -53,4 +53,21 @@ public class PdpUpdate extends PdpMessage {
     public PdpUpdate() {
         super(PdpMessageType.PDP_UPDATE);
     }
+
+    /**
+     * Constructs the object, making a deep copy.
+     *
+     * @param source source from which to copy
+     */
+    public PdpUpdate(PdpUpdate source) {
+        super(PdpMessageType.PDP_UPDATE);
+
+        this.name = source.name;
+        this.pdpType = source.pdpType;
+        this.description = source.description;
+        this.pdpGroup = source.pdpGroup;
+        this.pdpSubgroup = source.pdpSubgroup;
+        this.policies = (source.policies == null ? null
+                        : source.policies.stream().map(ToscaPolicy::new).collect(Collectors.toList()));
+    }
 }
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPdpStateChange.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPdpStateChange.java
new file mode 100644
index 000000000..8c843a1ac
--- /dev/null
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPdpStateChange.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Models
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 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.models.pdp.concepts;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.onap.policy.models.pdp.enums.PdpState;
+
+/**
+ * Test the copy constructor, as {@link TestModels} tests the other methods.
+ */
+public class TestPdpStateChange {
+
+    @Test
+    public void testCopyConstructor() {
+        assertThatThrownBy(() -> new PdpStateChange(null)).isInstanceOf(NullPointerException.class);
+
+        PdpStateChange orig = new PdpStateChange();
+
+        // verify with null values
+        assertEquals("PdpStateChange(name=null, state=null, pdpGroup=null, pdpSubgroup=null)",
+                        new PdpStateChange(orig).toString());
+
+        // verify with all values
+        orig.setName("my-name");
+        orig.setPdpGroup("my-group");
+        orig.setPdpSubgroup("my-subgroup");
+        orig.setState(PdpState.SAFE);
+
+        assertEquals("PdpStateChange(name=my-name, state=SAFE, pdpGroup=my-group, pdpSubgroup=my-subgroup)",
+                        new PdpStateChange(orig).toString());
+    }
+}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPdpUpdate.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPdpUpdate.java
new file mode 100644
index 000000000..44204e514
--- /dev/null
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPdpUpdate.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Models
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 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.models.pdp.concepts;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.onap.policy.models.base.PfConceptKey;
+import org.onap.policy.models.tosca.simple.concepts.ToscaPolicy;
+
+/**
+ * Test the copy constructor, as {@link TestModels} tests the other methods.
+ */
+public class TestPdpUpdate {
+
+    @Test
+    public void testCopyConstructor() {
+        assertThatThrownBy(() -> new PdpUpdate(null)).isInstanceOf(NullPointerException.class);
+
+        PdpUpdate orig = new PdpUpdate();
+
+        // verify with null values
+        assertEquals("PdpUpdate(name=null, pdpType=null, description=null, pdpGroup=null, "
+                        + "pdpSubgroup=null, policies=null)", new PdpUpdate(orig).toString());
+
+        // verify with all values
+        orig.setDescription("my-description");
+        orig.setName("my-name");
+        orig.setPdpGroup("my-group");
+        orig.setPdpSubgroup("my-subgroup");
+        orig.setPdpType("my-type");
+
+        ToscaPolicy policy1 = new ToscaPolicy();
+        policy1.setKey(new PfConceptKey("policy-a", "1.2.3"));
+
+        ToscaPolicy policy2 = new ToscaPolicy();
+        policy2.setKey(new PfConceptKey("policy-b", "4.5.6"));
+
+        List<ToscaPolicy> policies = Arrays.asList(policy1, policy2);
+        orig.setPolicies(policies);
+
+        PdpUpdate other = new PdpUpdate(orig);
+
+        assertEquals("PdpUpdate(name=my-name, pdpType=my-type, description=my-description, pdpGroup=my-group, "
+                        + "pdpSubgroup=my-subgroup, policies=["
+                        + "ToscaPolicy(type=PfConceptKey(name=NULL, version=0.0.0), properties=null, targets=null), "
+                        + "ToscaPolicy(type=PfConceptKey(name=NULL, version=0.0.0), properties=null, targets=null)])",
+                        other.toString());
+
+        // ensure list and items are not the same object
+        assertTrue(other.getPolicies() != policies);
+        assertTrue(other.getPolicies().get(0) != policies.get(0));
+    }
+}