summaryrefslogtreecommitdiffstats
path: root/ONAP-REST/src/main/java
diff options
context:
space:
mode:
authorrb7147 <rb7147@att.com>2018-02-13 18:17:22 -0500
committerrb7147 <rb7147@att.com>2018-02-13 23:17:59 -0500
commit49048e277bba438cf6486c1229b53f608a7af114 (patch)
tree50c3b252ea07e91aa04e5df2087e7a69cf5266f8 /ONAP-REST/src/main/java
parent8baa15218033f9ab6741645eb380e17eb7d9c2dd (diff)
Added Junits for Policy PAP-REST
Cleaned the unnecessary constructors and methods in onap-rest. Added Junits for JPA Classes in ONAP-REST. Issue-ID: POLICY-338 Change-Id: I7e4f928342315475db96d89e9ad3adac5cb7eb00 Signed-off-by: rb7147 <rb7147@att.com>
Diffstat (limited to 'ONAP-REST/src/main/java')
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java26
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java10
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java28
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java9
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java14
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java16
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java16
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java28
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java28
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java28
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java28
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java10
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java26
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java26
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java31
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java25
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java25
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java16
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java26
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java28
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java27
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java28
28 files changed, 30 insertions, 631 deletions
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
index 7d46330f0..aeaa14a62 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,7 +38,6 @@ import javax.persistence.Table;
public class ActionList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@@ -53,26 +50,7 @@ public class ActionList implements Serializable {
@Column(name="description")
private String description;
-
- public ActionList() {
- //An empty constructor
- }
- public ActionList(String string, String userid) {
- this(domain);
-
- }
- public ActionList(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
+
public String getActionName() {
return this.actionName;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
index c3673f336..4d31ec9e7 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class AddressGroup implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -58,27 +54,6 @@ public class AddressGroup implements Serializable {
@Column(name="description")
private String description;
- public AddressGroup() {
- //An empty constructor
- }
- public AddressGroup(String string, String userid) {
- this(domain);
-
- }
- public AddressGroup(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java
index 8dd2a5995..e1a6f5434 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -86,14 +86,6 @@ public class BRMSParamTemplate implements Serializable{
this.userCreatedBy = userCreatedBy;
}
- public BRMSParamTemplate(){
- //An empty constructor
- }
-
- public BRMSParamTemplate(String userid){
- //An empty constructor
- }
-
@PrePersist
public void prePersist() {
Date date = new Date();
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java
index 1b08c1cc5..baf3cbe49 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class DCAEUsers implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -54,28 +50,6 @@ public class DCAEUsers implements Serializable {
@Column(name="description ")
private String description ;
-
-
- public DCAEUsers() {
- //An empty constructor
- }
- public DCAEUsers(String string, String userid) {
- this(domain);
-
- }
- public DCAEUsers(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java
index dc6960997..eb07943f3 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class DCAEuuid implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -55,27 +51,6 @@ public class DCAEuuid implements Serializable {
@Column(name="description")
private String description;
-
- public DCAEuuid() {
- //An empty constructor
- }
- public DCAEuuid(String string, String userid) {
- this(domain);
-
- }
- public DCAEuuid(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
public String getDescription() {
return description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
index e0ed676d7..ae3620294 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -127,13 +127,6 @@ public class DecisionSettings implements Serializable {
}
- public String getDecisionSettings(){
- return this.xacmlId;
- }
-
- public String setDecisionSettings(){
- return this.xacmlId;
- }
@PrePersist
public void prePersist() {
Date date = new Date();
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java
index ed6981152..31ec31d21 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -99,18 +99,6 @@ public class FWTag implements Serializable {
private static Log LOGGER = LogFactory.getLog(FWTag.class);
- public FWTag(){
- //An empty constructor
- }
-
- public FWTag(String string, String userid) {
- this(string);
- }
-
- public FWTag(String domain) {
- this.fwTagName = domain;
- }
-
@PrePersist
public void prePersist() {
Date date = new Date();
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java
index 6090558ae..708ebf591 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -83,19 +83,7 @@ public class FWTagPicker implements Serializable {
@JoinColumn(name="modified_by")
private UserInfo userModifiedBy;
- private static Log logger = LogFactory.getLog(FWTagPicker.class);
-
- public FWTagPicker(){
- //An empty constructor
- }
-
- public FWTagPicker(String string, String userid) {
- this(string);
- }
-
- public FWTagPicker(String domain) {
- this.tagPickerName = domain;
- }
+ private static Log logger = LogFactory.getLog(FWTagPicker.class);
@PrePersist
public void prePersist() {
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java
index 5644d4a3d..8e1a83d5d 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -38,8 +38,6 @@ import javax.persistence.Table;
public class FirewallDictionaryList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -97,16 +95,4 @@ public class FirewallDictionaryList implements Serializable {
public void setServiceList(String serviceList) {
this.serviceList = serviceList;
}
-
- public FirewallDictionaryList() {
- //An empty constructor
- }
-
- public FirewallDictionaryList(String string, String userid) {
- this(domain);
- }
- public FirewallDictionaryList(String domain) {
- this.parentItemName = domain;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
index 55c3bd6ef..51b321e32 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class GroupPolicyScopeList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -58,27 +54,6 @@ public class GroupPolicyScopeList implements Serializable {
@Column(name="description")
private String description;
- public GroupPolicyScopeList() {
- //An empty constructor
- }
- public GroupPolicyScopeList(String string, String userid) {
- this(domain);
-
- }
- public GroupPolicyScopeList(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
index 4d1560f0c..71df0391a 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class GroupServiceList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -55,28 +51,6 @@ public class GroupServiceList implements Serializable {
@Column(name="serviceList ")
private String serviceList;
-
- public GroupServiceList() {
- //An empty constructor
- }
- public GroupServiceList(String string, String userid) {
- this(domain);
-
- }
- public GroupServiceList(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
index 88db4dd53..816b9d010 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -29,8 +29,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -39,8 +37,6 @@ import javax.persistence.Table;
public class MicroServiceAttribute implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -56,28 +52,6 @@ public class MicroServiceAttribute implements Serializable {
@Column(name="modelName")
private String modelName;
-
- public MicroServiceAttribute() {
- //An empty constructor
- }
- public MicroServiceAttribute(String string, String userid) {
- this(domain);
-
- }
- public MicroServiceAttribute(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
index 90a066b83..f404af153 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class MicroServiceConfigName implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -55,28 +51,6 @@ public class MicroServiceConfigName implements Serializable {
@Column(name="description ")
private String description ;
-
- public MicroServiceConfigName() {
- //An empty constructor
- }
- public MicroServiceConfigName(String string, String userid) {
- this(domain);
-
- }
- public MicroServiceConfigName(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
index 130de0a83..da7227511 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class MicroServiceLocation implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -54,28 +50,6 @@ public class MicroServiceLocation implements Serializable {
@Column(name="description ")
private String description ;
-
-
- public MicroServiceLocation() {
- //An empty constructor
- }
- public MicroServiceLocation(String string, String userid) {
- this(domain);
-
- }
- public MicroServiceLocation(String domain) {
- //An empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- //An empty function
- }
- @PreUpdate
- public void preUpdate() {
- //An empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
index 699aa8ac4..f323251cc 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -105,14 +105,6 @@ public class MicroServiceModels implements Serializable{
this.userCreatedBy = userCreatedBy;
}
- public MicroServiceModels(){
- //An empty constructor
- }
-
- public MicroServiceModels(String userid){
- //An empty constructor
- }
-
public String getAttributes() {
return attributes;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
index 9f437ce28..32dd112f7 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,7 +39,6 @@ import javax.persistence.Table;
public class PolicyScopeClosedLoop implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@@ -55,27 +52,6 @@ public class PolicyScopeClosedLoop implements Serializable {
@Column(name="description ")
private String description ;
- public PolicyScopeClosedLoop() {
- // Empty constructor
- }
- public PolicyScopeClosedLoop(String string, String userid) {
- this(domain);
-
- }
- public PolicyScopeClosedLoop(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
index 9d71600e9..10c3c74fd 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class PolicyScopeResource implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -54,27 +50,6 @@ public class PolicyScopeResource implements Serializable {
@Column(name="description ")
private String description ;
-
- public PolicyScopeResource() {
- // Empty constructor
- }
- public PolicyScopeResource(String string, String userid) {
- this(domain);
-
- }
- public PolicyScopeResource(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
index ec95d1691..9d89b98b1 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,7 +39,6 @@ import javax.persistence.Table;
public class PolicyScopeService implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@@ -54,27 +51,6 @@ public class PolicyScopeService implements Serializable {
@Column(name="description ")
private String description ;
-
- public PolicyScopeService() {
- // Empty constructor
- }
- public PolicyScopeService(String string, String userid) {
- this(domain);
-
- }
- public PolicyScopeService(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
index 92252b043..0367b0149 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class PolicyScopeType implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -55,27 +51,6 @@ public class PolicyScopeType implements Serializable {
@Column(name="description ")
private String description ;
- public PolicyScopeType() {
- // Empty constructor
- }
- public PolicyScopeType(String string, String userid) {
- this(domain);
-
- }
- public PolicyScopeType(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
index e696b1d06..64c892921 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class PortList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -53,32 +49,7 @@ public class PortList implements Serializable {
@Column(name="description")
private String description;
-/*
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
- private Date modifiedDate;*/
-
- public PortList() {
- // Empty constructor
- }
- public PortList(String string, String userid) {
- this(domain);
-
- }
- public PortList(String domain) {
- // Empty constructor
- }
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
-
public int getId() {
return this.id;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
index 16ef24cf7..4047143a1 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class PrefixList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -57,25 +53,6 @@ public class PrefixList implements Serializable {
@Column(name="pl_value", nullable=false)
private String prefixListValue;
- public PrefixList() {
- // Empty constructor
- }
- public PrefixList(String string, String userid) {
- this(domain);
-
- }
- public PrefixList(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
public String getPrefixListName() {
return this.prefixListName;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
index b74bb4a57..7e96c4053 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class ProtocolList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -54,25 +50,6 @@ public class ProtocolList implements Serializable {
@Column(name="description")
private String description;
- public ProtocolList() {
- // Empty constructor
- }
- public ProtocolList(String string, String userid) {
- this(domain);
-
- }
- public ProtocolList(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
public String getProtocolName() {
return this.protocolName;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java
index a65e41f2e..a533a70c1 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -52,8 +52,6 @@ import org.onap.policy.rest.XacmlAdminAuthorization;
public class RiskType implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -99,18 +97,6 @@ public class RiskType implements Serializable {
}
private static Log LOGGER = LogFactory.getLog(RiskType.class);
-
- public RiskType() {
- // Empty constructor
- }
-
- public RiskType(String string, String userid) {
- this(domain);
- }
-
- public RiskType(String domain) {
- this.name = domain;
- }
@PrePersist
public void prePersist() {
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java
index 8b017c006..4426cac60 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class SafePolicyWarning implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -63,27 +59,7 @@ public class SafePolicyWarning implements Serializable {
}
public void setRiskType(String riskType) {
this.riskType = riskType;
- }
- public SafePolicyWarning() {
- // Empty constructor
- }
- public SafePolicyWarning(String string, String userid) {
- this(domain);
-
- }
- public SafePolicyWarning(String domain) {
- // Empty constructor
}
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java
index cbbb8962e..30881337a 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class SecurityZone implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -53,28 +49,6 @@ public class SecurityZone implements Serializable {
@Column(name="value")
private String zoneValue;
-
-
- public SecurityZone() {
- // Empty constructor
- }
- public SecurityZone(String string, String userid) {
- this(domain);
-
- }
- public SecurityZone(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
index 057b86992..e09dff07a 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class ServiceList implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -65,27 +61,6 @@ public class ServiceList implements Serializable {
@Column(name="ports")
private String servicePorts;
-
- public ServiceList() {
- // Empty constructor
- }
- public ServiceList(String string, String userid) {
- this(domain);
-
- }
- public ServiceList(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public int getId() {
return this.id;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java
index 356ecb7c9..98a4e58e7 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@@ -41,8 +39,6 @@ import javax.persistence.Table;
public class VMType implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -55,27 +51,6 @@ public class VMType implements Serializable {
@Column(name="description")
private String description;
-
- public VMType() {
- // Empty constructor
- }
- public VMType(String string, String userid) {
- this(domain);
-
- }
- public VMType(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public String getDescription() {
return description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java
index fe5d62adc..c8759acb7 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -30,8 +30,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
import javax.persistence.Table;
@Entity
@@ -40,8 +38,6 @@ import javax.persistence.Table;
public class Zone implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@ -53,28 +49,6 @@ public class Zone implements Serializable {
@Column(name="zonevalue")
private String zoneValue;
-
-
- public Zone() {
- // Empty constructor
- }
- public Zone(String string, String userid) {
- this(domain);
-
- }
- public Zone(String domain) {
- // Empty constructor
- }
-
- @PrePersist
- public void prePersist() {
- // Empty function
- }
- @PreUpdate
- public void preUpdate() {
- // Empty function
- }
-
public int getId() {
return this.id;