7 files changed, 33 insertions, 81 deletions

diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpHealthCheck.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpHealthCheck.java
deleted file mode 100644
index b82af0225..000000000
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpHealthCheck.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property.
- * ================================================================================
- * 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.models.pdp.concepts;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.onap.policy.models.pdp.enums.PdpMessageType;
-
-/**
- * Class to represent the PDP_HEALTH_CHECK message that PAP will send to either PDPGroup/Subgroup or a PDP.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
- */
-@Getter
-@Setter
-@ToString
-public class PdpHealthCheck extends PdpMessage {
-
-    private String name;
-    private String pdpGroup;
-    private String pdpSubgroup;
-
-    /**
-     * Constructor for instantiating PdpHealthCheck class with message name.
-     *
-     */
-    public PdpHealthCheck() {
-        super(PdpMessageType.PDP_HEALTH_CHECK);
-    }
-}
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
index eb0758e61..d0fef4503 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
@@ -22,13 +22,14 @@
 package org.onap.policy.models.pdp.concepts;
 
 import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+
 import org.onap.policy.models.pdp.enums.PdpHealthStatus;
 import org.onap.policy.models.pdp.enums.PdpMessageType;
 import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 
 /**
  * Class to represent the PDP_STATUS message that all the PDP's will send to PAP.
@@ -48,8 +49,8 @@ public class PdpStatus extends PdpMessage {
     private String description;
     private String pdpGroup;
     private String pdpSubgroup;
-    private List<PolicyTypeIdent> supportedPolicyTypes;
-    private List<ToscaPolicy> policies;
+    private List<ToscaPolicyTypeIdentifier> supportedPolicyTypes;
+    private List<ToscaPolicyIdentifier> policies;
     private String instance;
     private String deploymentInstanceInfo;
     private String properties;
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpSubGroup.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpSubGroup.java
index b4539ec3e..b4f469388 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpSubGroup.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpSubGroup.java
@@ -1,4 +1,4 @@
-/*
+/*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
  *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
@@ -24,16 +24,16 @@ package org.onap.policy.models.pdp.concepts;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.ToString;
+
 import org.onap.policy.models.base.PfUtils;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 
 /**
- * Class to represent a group of all PDP's of the same pdp type running for a particular
- * domain.
+ * Class to represent a group of all PDP's of the same pdp type running for a particular domain.
  *
  * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
  */
@@ -42,8 +42,8 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 @ToString
 public class PdpSubGroup {
     private String pdpType;
-    private List<PolicyTypeIdent> supportedPolicyTypes;
-    private List<ToscaPolicy> policies;
+    private List<ToscaPolicyTypeIdentifier> supportedPolicyTypes;
+    private List<ToscaPolicyIdentifier> policies;
     private int currentInstanceCount;
     private int desiredInstanceCount;
     private Map<String, String> properties;
@@ -61,10 +61,10 @@ public class PdpSubGroup {
      *
      * @param source source from which to copy fields
      */
-    public PdpSubGroup(@NonNull PdpSubGroup source) {
+    public PdpSubGroup(@NonNull final PdpSubGroup source) {
         this.pdpType = source.pdpType;
-        this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, PolicyTypeIdent::new);
-        this.policies = PfUtils.mapList(source.policies, ToscaPolicy::new);
+        this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, ToscaPolicyTypeIdentifier::new);
+        this.policies = PfUtils.mapList(source.policies, ToscaPolicyIdentifier::new);
         this.currentInstanceCount = source.currentInstanceCount;
         this.desiredInstanceCount = source.desiredInstanceCount;
         this.properties = (source.properties == null ? null : new LinkedHashMap<>(source.properties));
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/ToscaPolicyIdentifier.java
index a62d90090..245806c71 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/ToscaPolicyIdentifier.java
@@ -29,7 +29,7 @@ import lombok.NonNull;
  */
 @Data
 @NoArgsConstructor
-public class PolicyIdent {
+public class ToscaPolicyIdentifier {
 
     @NonNull
     private String name;
@@ -38,12 +38,12 @@ public class PolicyIdent {
     private String version;
 
 
-    public PolicyIdent(@NonNull String name, @NonNull String version) {
+    public ToscaPolicyIdentifier(@NonNull String name, @NonNull String version) {
         this.name = name;
         this.version = version;
     }
 
-    public PolicyIdent(PolicyIdent source) {
+    public ToscaPolicyIdentifier(ToscaPolicyIdentifier source) {
         this.name = source.name;
         this.version = source.version;
     }
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/ToscaPolicyIdentifierOptVersion.java
index f86a3c46d..bd6b26ede 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/ToscaPolicyIdentifierOptVersion.java
@@ -29,7 +29,7 @@ import lombok.NonNull;
  */
 @Data
 @NoArgsConstructor
-public class PolicyIdentOptVersion {
+public class ToscaPolicyIdentifierOptVersion {
 
     @NonNull
     private String name;
@@ -37,12 +37,12 @@ public class PolicyIdentOptVersion {
     private String version;
 
 
-    public PolicyIdentOptVersion(@NonNull String name, String version) {
+    public ToscaPolicyIdentifierOptVersion(@NonNull String name, String version) {
         this.name = name;
         this.version = version;
     }
 
-    public PolicyIdentOptVersion(PolicyIdentOptVersion source) {
+    public ToscaPolicyIdentifierOptVersion(ToscaPolicyIdentifierOptVersion source) {
         this.name = source.name;
         this.version = source.version;
     }
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/ToscaPolicyTypeIdentifier.java
index 44ca168f5..cf989f3ae 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/ToscaPolicyTypeIdentifier.java
@@ -29,7 +29,7 @@ import lombok.NonNull;
  */
 @Data
 @NoArgsConstructor
-public class PolicyTypeIdent {
+public class ToscaPolicyTypeIdentifier {
 
     @NonNull
     private String name;
@@ -38,12 +38,12 @@ public class PolicyTypeIdent {
     private String version;
 
 
-    public PolicyTypeIdent(@NonNull String name, @NonNull String version) {
+    public ToscaPolicyTypeIdentifier(@NonNull String name, @NonNull String version) {
         this.name = name;
         this.version = version;
     }
 
-    public PolicyTypeIdent(PolicyTypeIdent source) {
+    public ToscaPolicyTypeIdentifier(ToscaPolicyTypeIdentifier source) {
         this.name = source.name;
         this.version = source.version;
     }
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpSubGroup.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpSubGroup.java
index 5164d3418..7020b4596 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpSubGroup.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpSubGroup.java
@@ -58,7 +58,8 @@ import org.onap.policy.models.base.PfValidationResult;
 import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 import org.onap.policy.models.pdp.concepts.Pdp;
 import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.concepts.PolicyTypeIdent;
+import org.onap.policy.models.pdp.concepts.ToscaPolicyIdentifier;
+import org.onap.policy.models.pdp.concepts.ToscaPolicyTypeIdentifier;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 
 /**
@@ -161,17 +162,17 @@ public class JpaPdpSubGroup extends PfConcept implements PfAuthorative<PdpSubGro
 
         pdpSubgroup.setSupportedPolicyTypes(new ArrayList<>());
         for (PfConceptKey supportedPolicyTypeKey : supportedPolicyTypes) {
-            PolicyTypeIdent supportedPolicyTypeIdent =
-                    new PolicyTypeIdent(supportedPolicyTypeKey.getName(), supportedPolicyTypeKey.getVersion());
+            ToscaPolicyTypeIdentifier supportedPolicyTypeIdent = new ToscaPolicyTypeIdentifier(
+                    supportedPolicyTypeKey.getName(), supportedPolicyTypeKey.getVersion());
             pdpSubgroup.getSupportedPolicyTypes().add(supportedPolicyTypeIdent);
         }
 
         pdpSubgroup.setPolicies(new ArrayList<>());
         for (PfConceptKey policyKey : policies) {
-            ToscaPolicy toscaPolicy = new ToscaPolicy();
-            toscaPolicy.setName(policyKey.getName());
-            toscaPolicy.setVersion(policyKey.getVersion());
-            pdpSubgroup.getPolicies().add(toscaPolicy);
+            ToscaPolicyIdentifier toscaPolicyIdentifier = new ToscaPolicyIdentifier();
+            toscaPolicyIdentifier.setName(policyKey.getName());
+            toscaPolicyIdentifier.setVersion(policyKey.getVersion());
+            pdpSubgroup.getPolicies().add(toscaPolicyIdentifier);
         }
 
         pdpSubgroup.setCurrentInstanceCount(currentInstanceCount);
@@ -194,15 +195,15 @@ public class JpaPdpSubGroup extends PfConcept implements PfAuthorative<PdpSubGro
         }
 
         this.supportedPolicyTypes = new ArrayList<>();
-        for (PolicyTypeIdent supportedPolicyType : pdpSubgroup.getSupportedPolicyTypes()) {
+        for (ToscaPolicyTypeIdentifier supportedPolicyType : pdpSubgroup.getSupportedPolicyTypes()) {
             this.supportedPolicyTypes
                     .add(new PfConceptKey(supportedPolicyType.getName(), supportedPolicyType.getVersion()));
         }
 
 
         this.policies = new ArrayList<>();
-        for (ToscaPolicy toscaPolicy : pdpSubgroup.getPolicies()) {
-            this.policies.add(new PfConceptKey(toscaPolicy.getName(), toscaPolicy.getVersion()));
+        for (ToscaPolicyIdentifier toscaPolicyIdentifier : pdpSubgroup.getPolicies()) {
+            this.policies.add(new PfConceptKey(toscaPolicyIdentifier.getName(), toscaPolicyIdentifier.getVersion()));
         }
 
         this.currentInstanceCount = pdpSubgroup.getCurrentInstanceCount();