Merge "Remove pdpType from PdpUpdate"
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 c8c8783..80d4e94 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
@@ -40,7 +40,6 @@
public class PdpUpdate extends PdpMessage {
private String name;
- private String pdpType;
private String description;
private String pdpGroup;
private String pdpSubgroup;
@@ -63,7 +62,6 @@
super(PdpMessageType.PDP_UPDATE);
this.name = source.name;
- this.pdpType = source.pdpType;
this.description = source.description;
this.pdpGroup = source.pdpGroup;
this.pdpSubgroup = source.pdpSubgroup;
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
index 5f8819b..3d4359a 100644
--- 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
@@ -42,7 +42,7 @@
PdpUpdate orig = new PdpUpdate();
// verify with null values
- assertEquals("PdpUpdate(name=null, pdpType=null, description=null, pdpGroup=null, "
+ assertEquals("PdpUpdate(name=null, description=null, pdpGroup=null, "
+ "pdpSubgroup=null, policies=null)", new PdpUpdate(orig).toString());
// verify with all values
@@ -50,7 +50,6 @@
orig.setName("my-name");
orig.setPdpGroup("my-group");
orig.setPdpSubgroup("my-subgroup");
- orig.setPdpType("my-type");
ToscaPolicy policy1 = new ToscaPolicy();
policy1.setName("policy-a");
@@ -65,7 +64,7 @@
PdpUpdate other = new PdpUpdate(orig);
- assertEquals("PdpUpdate(name=my-name, pdpType=my-type, description=my-description, "
+ assertEquals("PdpUpdate(name=my-name, description=my-description, "
+ "pdpGroup=my-group, pdpSubgroup=my-subgroup, policies=["
+ "ToscaPolicy(super=ToscaEntity(name=policy-a, version=1.2.3, derivedFrom=null, "
+ "metadata=null, description=null), type=null, typeVersion=null, properties=null), "