summaryrefslogtreecommitdiffstats
path: root/models-pap
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-22 23:09:06 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-22 23:09:06 +0000
commit28b1dc09f468259ef6c55d11c94b6693465a41d5 (patch)
treeefff764b25bd6e49070e3e40e709defa117a3805 /models-pap
parentc61eebfa4f17e30e3be000d4c59bc74e75b880a1 (diff)
parenta4b62b8f4da98eefe530e0fc11f6dafabe0019c2 (diff)
Merge "Add models-pdp to models repo"
Diffstat (limited to 'models-pap')
-rw-r--r--models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java6
-rw-r--r--models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpSubGroup.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java
index e535233bc..43356982e 100644
--- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java
+++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java
@@ -28,8 +28,8 @@ import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
import lombok.ToString;
-import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfUtils;
+import org.onap.policy.models.base.keys.PolicyTypeIdent;
/**
* Class to represent a group of all PDP's of the same pdp type running for a particular
@@ -43,7 +43,7 @@ import org.onap.policy.models.base.PfUtils;
public class PdpSubGroup {
private String pdpType;
- private List<PfConceptKey> supportedPolicyTypes;
+ private List<PolicyTypeIdent> supportedPolicyTypes;
private List<Policy> policies;
private int currentInstanceCount;
private int desiredInstanceCount;
@@ -64,7 +64,7 @@ public class PdpSubGroup {
*/
public PdpSubGroup(@NonNull PdpSubGroup source) {
this.pdpType = source.pdpType;
- this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, PfConceptKey::new);
+ this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, PolicyTypeIdent::new);
this.policies = PfUtils.mapList(source.policies, Policy::new);
this.currentInstanceCount = source.currentInstanceCount;
this.desiredInstanceCount = source.desiredInstanceCount;
diff --git a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpSubGroup.java b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpSubGroup.java
index d2e5f2fcc..9af2f4e9d 100644
--- a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpSubGroup.java
+++ b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpSubGroup.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.TreeMap;
import org.junit.Test;
-import org.onap.policy.models.base.PfConceptKey;
+import org.onap.policy.models.base.keys.PolicyTypeIdent;
/**
* Test the copy constructor, as {@link TestModels} tests the other methods.
@@ -66,8 +66,8 @@ public class TestPdpSubGroup {
props.put("key-B", "value-B");
orig.setProperties(props);
- PfConceptKey supp1 = new PfConceptKey("supp-A", "1.2");
- PfConceptKey supp2 = new PfConceptKey("supp-B", "3.4");
+ PolicyTypeIdent supp1 = new PolicyTypeIdent("supp-A", "1.2");
+ PolicyTypeIdent supp2 = new PolicyTypeIdent("supp-B", "3.4");
orig.setSupportedPolicyTypes(Arrays.asList(supp1, supp2));
assertEquals(orig.toString(), new PdpSubGroup(orig).toString());