diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-03-21 09:54:30 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-03-22 12:19:37 -0400 |
| commit | a4b62b8f4da98eefe530e0fc11f6dafabe0019c2 (patch) | |
| tree | 96f6acb9c49b9e4aa0d3c33dc805cf37b264f659 /models-pap/src/main/java/org/onap | |
| parent | 834851e6c460ef8a28f356a64fe7b85d8bbf9a55 (diff) | |
Add models-pdp to models repo
Also changed supportedPolicyTypes to PfConceptKey.
Updated licenses.
Removed trailing whitespace from pom.
Provide default request id.
Rebased to fix merge conflict.
Added SupportedPolicyType class.
Renamed SupportedPolicyType to PolicyTypeIdent, and moved it to
models-base. Also updated models-pap to use it.
Deleted models-pdp Policy and replaced it with ToscaPolicy.
Updated test method name.
Change-Id: Id65f769c2f308c6b56e79978bd50b84f2e0b3d02
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-pap/src/main/java/org/onap')
| -rw-r--r-- | models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java | 6 |
1 files changed, 3 insertions, 3 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; |