summaryrefslogtreecommitdiffstats
path: root/ONAP-REST/src/main/java/org/onap
diff options
context:
space:
mode:
authorrb7147 <rb7147@att.com>2017-12-04 16:45:55 -0500
committerrb7147 <rb7147@att.com>2017-12-08 10:45:57 -0500
commit428150834ee60899b9a8da019bae3c8bf009adf1 (patch)
tree7197eb324477cad918cf527c7a479302cb5029f7 /ONAP-REST/src/main/java/org/onap
parent775f45908025e46a40c9c147fca2066af5c8c5b8 (diff)
Upgraded the latest ONAP SDK
Upgraded latest ONAP SDK Code. Change-Id: I669d6cfcefe068b1e4c078889d7d6c77ce788e2e Issue-ID: POLICY-432 Signed-off-by: rb7147 <rb7147@att.com>
Diffstat (limited to 'ONAP-REST/src/main/java/org/onap')
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java8
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java9
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembersJson.java46
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java2
4 files changed, 60 insertions, 5 deletions
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java
index c634a74d1..da4671ba4 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java
@@ -28,7 +28,7 @@ public class AddressGroupJson {
protected String name;
protected String description;
- protected List<AddressMembers> members;
+ protected List<AddressMembersJson> members;
// name
public String getName() {
@@ -66,16 +66,16 @@ public class AddressGroupJson {
this.description = value;
}
- public List<AddressMembers> getMembers()
+ public List<AddressMembersJson> getMembers()
{
if(members==null)
{
- members= new ArrayList<AddressMembers>();
+ members= new ArrayList<AddressMembersJson>();
}
return this.members;
}
- public void setMembers(List<AddressMembers> members)
+ public void setMembers(List<AddressMembersJson> members)
{
this.members = members;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java
index 14e46f15f..e6b993fb9 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java
@@ -25,6 +25,7 @@ package org.onap.policy.rest.adapter;
public class AddressMembers {
protected String type;
+ protected String name;
protected String value;
public String getType() {
@@ -35,6 +36,14 @@ public class AddressMembers {
this.type = type;
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
public String getValue() {
return value;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembersJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembersJson.java
new file mode 100644
index 000000000..e97d2b2cf
--- /dev/null
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembersJson.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.rest.adapter;
+
+
+
+public class AddressMembersJson {
+
+ protected String type;
+ protected String name;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+} \ No newline at end of file
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
index bc6ad99fd..dd51bee2a 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
@@ -168,7 +168,7 @@ public class PolicyVersion implements Serializable {
return modifiedDate;
}
- public void setModifiedDate(Timestamp modifiedDate) {
+ public void setModifiedDate(Date modifiedDate) {
this.modifiedDate = modifiedDate;
}