diff options
| author |   ITSERVICES\rb7147 <rb7147@att.com> | 2017-04-25 11:46:00 -0400 |
|---|---|---|
| committer | ITSERVICES\rb7147 <rb7147@att.com> | 2017-05-03 09:58:17 -0400 |
| commit | e0addf5b588a1244f9679becd90999dfcb4c3a94 (patch) | |
| tree | 1212772d6366730266ff0e093c874b07aa716c29 /ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa | |
| parent | 39fb0f30472777e4b60d6a7ac8aa4eb9773961ff (diff) | |
Policy 1707 commit to LF
Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>
Diffstat (limited to 'ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa')
56 files changed, 944 insertions, 248 deletions
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionBodyEntity.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionBodyEntity.java index d12f6b3e1..bda58b607 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionBodyEntity.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionBodyEntity.java @@ -33,7 +33,6 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -50,13 +49,11 @@ import com.fasterxml.jackson.annotation.JsonBackReference; @NamedQuery(name=" ActionBodyEntity.findAll", query="SELECT e FROM ActionBodyEntity e "), @NamedQuery(name="ActionBodyEntity.deleteAll", query="DELETE FROM ActionBodyEntity WHERE 1=1") }) -//@SequenceGenerator(name="seqActBody", initialValue=1, allocationSize=1) public class ActionBodyEntity implements Serializable { private static final long serialVersionUID = 1L; @Id - //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator="seqActBody") @GeneratedValue(strategy = GenerationType.AUTO) @Column(name="actionBodyId") @JsonBackReference diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionList.java index 0176c17be..0fea71a1c 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity @Table(name="actionlist") diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionPolicyDict.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionPolicyDict.java index fa7d2af95..f6c8965d2 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionPolicyDict.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionPolicyDict.java @@ -44,12 +44,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.openecomp.policy.rest.XacmlAdminAuthorization; -import org.openecomp.policy.common.logging.eelf.MessageCodes; -import org.openecomp.policy.common.logging.eelf.PolicyLogger; @Entity @Table(name="ActionPolicyDict") -//@NamedQuery(name="ActionPolicyDict.findAll", query="SELECT e FROM ActionPolicyDict e ") @NamedQueries({ @NamedQuery(name="ActionPolicyDict.findAll", query="SELECT e FROM ActionPolicyDict e") }) @@ -144,8 +141,7 @@ public class ActionPolicyDict implements Serializable { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger - PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "ActionPolicyDict", "Exception caused While adding Modified by Role"); + //PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "ActionPolicyDict", "Exception caused While adding Modified by Role"); } } public int getId() { diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AddressGroup.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AddressGroup.java index 6418d6bc5..1b6430c21 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AddressGroup.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AddressGroup.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java index e79126ae2..184b4f80b 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java @@ -46,13 +46,8 @@ import javax.persistence.Transient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.openecomp.policy.rest.XacmlAdminAuthorization; -import org.openecomp.policy.rest.jpa.UserInfo; -import com.att.research.xacml.api.Identifier; -import com.att.research.xacml.std.IdentifierImpl; -import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonManagedReference; /** * The persistent class for the Attribute database table. @@ -156,7 +151,7 @@ public class Attribute implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(Attribute.class); + private static Log LOGGER = LogFactory.getLog(Attribute.class); public Attribute() { } @@ -194,9 +189,7 @@ public class Attribute implements Serializable { try { this.userModifiedBy = XacmlAdminAuthorization.getUserId(); } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger - //PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "Attribute", "Exception caused While adding Modified by Role"); + LOGGER.error("Exception caused While adding Modified by Role"+e); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSController.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSController.java new file mode 100644 index 000000000..afa6d94cf --- /dev/null +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSController.java @@ -0,0 +1,154 @@ +/*- + * ============LICENSE_START======================================================= + * ECOMP-REST + * ================================================================================ + * 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.openecomp.policy.rest.jpa; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQuery; +import javax.persistence.OrderBy; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name="BRMSController") +@NamedQuery(name="BRMSController.findAll", query="SELECT b from BRMSController b ") +public class BRMSController implements Serializable{ + private static final long serialVersionUID = -8666947569754164177L; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name="id") + private int id; + + @Column(name="controller_name", nullable=false, length=1024, unique=true) + @OrderBy("asc") + private String controllerName; + + @Column(name="description", nullable=true, length=1024) + private String description; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="created_date", updatable=false) + private Date createdDate; + + @ManyToOne(optional = false) + @JoinColumn(name="created_by") + private UserInfo userCreatedBy; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="modified_date", nullable=false) + private Date modifiedDate; + + @ManyToOne(optional = false) + @JoinColumn(name="modified_by") + private UserInfo userModifiedBy; + + @Column(name="controller", nullable=false) + private String controller; + + @PrePersist + public void prePersist() { + Date date = new Date(); + this.createdDate = date; + this.modifiedDate = date; + } + + @PreUpdate + public void preUpdate() { + this.modifiedDate = new Date(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatedDate() { + return createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } + + public UserInfo getUserCreatedBy() { + return userCreatedBy; + } + + public void setUserCreatedBy(UserInfo userCreatedBy) { + this.userCreatedBy = userCreatedBy; + } + + public Date getModifiedDate() { + return modifiedDate; + } + + public void setModifiedDate(Date modifiedDate) { + this.modifiedDate = modifiedDate; + } + + public UserInfo getUserModifiedBy() { + return userModifiedBy; + } + + public void setUserModifiedBy(UserInfo userModifiedBy) { + this.userModifiedBy = userModifiedBy; + } + + public String getController() { + return controller; + } + + public void setController(String controller) { + this.controller = controller; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getControllerName() { + return controllerName; + } + + public void setControllerName(String controllerName) { + this.controllerName = controllerName; + } + +} diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSDependency.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSDependency.java new file mode 100644 index 000000000..9c4406948 --- /dev/null +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSDependency.java @@ -0,0 +1,153 @@ +/*- + * ============LICENSE_START======================================================= + * ECOMP-REST + * ================================================================================ + * 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.openecomp.policy.rest.jpa; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQuery; +import javax.persistence.OrderBy; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name="BRMSDependency") +@NamedQuery(name="BRMSDependency.findAll", query="SELECT b from BRMSDependency b ") +public class BRMSDependency implements Serializable{ + private static final long serialVersionUID = -7005622785653160761L; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name="id") + private int id; + + @Column(name="dependency_name", nullable=false, length=1024, unique=true) + @OrderBy("asc") + private String dependencyName; + + @Column(name="description", nullable=true, length=1024) + private String description; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="created_date", updatable=false) + private Date createdDate; + + @ManyToOne(optional = false) + @JoinColumn(name="created_by") + private UserInfo userCreatedBy; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="modified_date", nullable=false) + private Date modifiedDate; + + @ManyToOne(optional = false) + @JoinColumn(name="modified_by") + private UserInfo userModifiedBy; + + @Column(name="dependency", nullable=false) + private String dependency; + + @PrePersist + public void prePersist() { + Date date = new Date(); + this.createdDate = date; + this.modifiedDate = date; + } + + @PreUpdate + public void preUpdate() { + this.modifiedDate = new Date(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatedDate() { + return createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } + + public UserInfo getUserCreatedBy() { + return userCreatedBy; + } + + public void setUserCreatedBy(UserInfo userCreatedBy) { + this.userCreatedBy = userCreatedBy; + } + + public Date getModifiedDate() { + return modifiedDate; + } + + public void setModifiedDate(Date modifiedDate) { + this.modifiedDate = modifiedDate; + } + + public UserInfo getUserModifiedBy() { + return userModifiedBy; + } + + public void setUserModifiedBy(UserInfo userModifiedBy) { + this.userModifiedBy = userModifiedBy; + } + + public String getDependency() { + return dependency; + } + + public void setDependency(String dependency) { + this.dependency = dependency; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getDependencyName() { + return dependencyName; + } + + public void setDependencyName(String dependencyName) { + this.dependencyName = dependencyName; + } +} diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Category.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Category.java index abc06879d..1f4243304 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Category.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Category.java @@ -38,7 +38,6 @@ import com.att.research.xacml.api.Identifier; import com.att.research.xacml.api.XACML3; import com.att.research.xacml.std.IdentifierImpl; import com.fasterxml.jackson.annotation.JsonBackReference; -import com.fasterxml.jackson.annotation.JsonIgnore; /** diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopD2Services.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopD2Services.java index 408190ac9..391ed9714 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopD2Services.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopD2Services.java @@ -42,10 +42,9 @@ import javax.persistence.TemporalType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.openecomp.policy.rest.XacmlAdminAuthorization; - import org.openecomp.policy.common.logging.eelf.MessageCodes; import org.openecomp.policy.common.logging.eelf.PolicyLogger; +import org.openecomp.policy.rest.XacmlAdminAuthorization; @Entity @@ -101,7 +100,7 @@ public class ClosedLoopD2Services implements Serializable{ this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(ClosedLoopD2Services.class); + private static Log LOGGER = LogFactory.getLog(ClosedLoopD2Services.class); public ClosedLoopD2Services(){ @@ -128,8 +127,7 @@ public class ClosedLoopD2Services implements Serializable{ try { this.userModifiedBy = XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "ClosedLoopD2Services", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopSite.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopSite.java index b32091307..fd8b295b9 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopSite.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopSite.java @@ -102,7 +102,7 @@ public class ClosedLoopSite implements Serializable{ this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(ClosedLoopSite.class); + private static Log LOGGER = LogFactory.getLog(ClosedLoopSite.class); public ClosedLoopSite(){ @@ -129,8 +129,7 @@ public class ClosedLoopSite implements Serializable{ try { this.userModifiedBy = XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "ClosedLoopSite", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoops.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoops.java new file mode 100644 index 000000000..5732832c6 --- /dev/null +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoops.java @@ -0,0 +1,99 @@ +/*- + * ============LICENSE_START======================================================= + * ECOMP-REST + * ================================================================================ + * 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.openecomp.policy.rest.jpa; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OrderBy; +import javax.persistence.Table; + +@Entity +@Table(name="ClosedLoops") +@NamedQueries({ + @NamedQuery(name="ClosedLoops.findAll", query="SELECT e FROM ClosedLoops e"), + @NamedQuery(name="ClosedLoops.deleteAll", query="DELETE FROM ClosedLoops WHERE 1=1") +}) +public class ClosedLoops implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -7796845092457926842L; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name="id") + private int id; + + @Column(name="closedLoopControlName", nullable=false, length=255) + @OrderBy("asc") + private String closedLoopControlName; + + @Column(name="alarmConditions", nullable=true, length=255) + private String alarmConditions; + + @Column(name="yaml", nullable=true, length=1028) + private String yaml; + + public ClosedLoops() { + + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getClosedLoopControlName() { + return closedLoopControlName; + } + + public void setClosedLoopControlName(String closedLoopControlName) { + this.closedLoopControlName = closedLoopControlName; + } + + public String getAlarmConditions() { + return alarmConditions; + } + + public void setAlarmConditions(String alarmConditions) { + this.alarmConditions = alarmConditions; + } + + public String getYaml() { + return yaml; + } + + public void setYaml(String yaml) { + this.yaml = yaml; + } + +}
\ No newline at end of file diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConfigurationDataEntity.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConfigurationDataEntity.java index 71a6d6fb7..bf42a7788 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConfigurationDataEntity.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConfigurationDataEntity.java @@ -34,7 +34,6 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -51,13 +50,11 @@ import com.fasterxml.jackson.annotation.JsonBackReference; @NamedQuery(name="ConfigurationDataEntity.findAll", query="SELECT e FROM ConfigurationDataEntity e "), @NamedQuery(name="ConfigurationDataEntity.deleteAll", query="DELETE FROM ConfigurationDataEntity WHERE 1=1") }) -//@SequenceGenerator(name="seqConfig", initialValue=1, allocationSize=1) public class ConfigurationDataEntity implements Serializable { private static final long serialVersionUID = 1L; @Id - //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator="seqConfig") @GeneratedValue(strategy = GenerationType.AUTO) @Column(name="configurationDataId") @JsonBackReference diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEUsers.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEUsers.java index eb0c4cc1b..fdad24419 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEUsers.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEUsers.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEuuid.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEuuid.java index a71921b5e..9e7225fc7 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEuuid.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEuuid.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Datatype.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Datatype.java index b3922f10b..05e4fbc0c 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Datatype.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Datatype.java @@ -39,7 +39,6 @@ import com.att.research.xacml.api.XACML3; import com.att.research.xacml.std.IdentifierImpl; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonManagedReference; /** diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DecisionSettings.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DecisionSettings.java index 1d90af679..2d3e5b58a 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DecisionSettings.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DecisionSettings.java @@ -39,16 +39,9 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.openecomp.policy.rest.XacmlAdminAuthorization; - -import com.att.research.xacml.api.Identifier; -import com.att.research.xacml.std.IdentifierImpl; -import com.fasterxml.jackson.annotation.JsonManagedReference; - import org.openecomp.policy.common.logging.eelf.MessageCodes; import org.openecomp.policy.common.logging.eelf.PolicyLogger; +import org.openecomp.policy.rest.XacmlAdminAuthorization; @Entity @@ -115,8 +108,7 @@ public class DecisionSettings implements Serializable { public void setUserModifiedBy(UserInfo userModifiedBy) { this.userModifiedBy = userModifiedBy; } - - private static Log logger = LogFactory.getLog(DecisionSettings.class); + public DecisionSettings() { } @@ -139,7 +131,7 @@ public class DecisionSettings implements Serializable { } public String setDecisionSettings(){ - return this.xacmlId = xacmlId; + return this.xacmlId; } @PrePersist public void prePersist() { @@ -154,8 +146,6 @@ public class DecisionSettings implements Serializable { try { this.userModifiedBy = XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "DecisionSettings", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DescriptiveScope.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DescriptiveScope.java index 9f751f7c0..d4719cf41 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DescriptiveScope.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DescriptiveScope.java @@ -99,7 +99,7 @@ public class DescriptiveScope implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(DescriptiveScope.class); + private static Log LOGGER = LogFactory.getLog(DescriptiveScope.class); public DescriptiveScope(){ @@ -126,8 +126,7 @@ public class DescriptiveScope implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "DescriptiveScope", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EcompName.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EcompName.java index 599e47818..09dcd4738 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EcompName.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EcompName.java @@ -39,16 +39,9 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.openecomp.policy.rest.XacmlAdminAuthorization; -import org.openecomp.policy.rest.jpa.UserInfo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonManagedReference; - import org.openecomp.policy.common.logging.eelf.MessageCodes; import org.openecomp.policy.common.logging.eelf.PolicyLogger; +import org.openecomp.policy.rest.XacmlAdminAuthorization; @Entity @@ -102,8 +95,6 @@ public class EcompName implements Serializable { public void setUserModifiedBy(UserInfo userModifiedBy) { this.userModifiedBy = userModifiedBy; } - - private static Log logger = LogFactory.getLog(EcompName.class); public EcompName() { @@ -130,8 +121,6 @@ public class EcompName implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId(); } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "EcompName", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTag.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTag.java new file mode 100644 index 000000000..f10f6662c --- /dev/null +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTag.java @@ -0,0 +1,180 @@ +/*- + * ============LICENSE_START======================================================= + * ECOMP-REST + * ================================================================================ + * 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.openecomp.policy.rest.jpa; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQuery; +import javax.persistence.OrderBy; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.openecomp.policy.common.logging.eelf.MessageCodes; +import org.openecomp.policy.common.logging.eelf.PolicyLogger; +import org.openecomp.policy.rest.XacmlAdminAuthorization; + +@Entity +@Table(name = "FWTag") +@NamedQuery(name = "FWTag.findAll", query= "Select p from FWTag p") +public class FWTag implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "Id") + private int id; + + @Column(name="tagName", nullable=false) + @OrderBy("asc") + private String fwTagName; + + @Column(name="description", nullable=true, length=2048) + private String description; + + @Column(name="tagValues", nullable=true) + @OrderBy("asc") + private String tagValues; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="created_date", updatable=false) + private Date createdDate; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="modified_date", nullable=false) + private Date modifiedDate; + + @ManyToOne(optional = false) + @JoinColumn(name="created_by") + private UserInfo userCreatedBy; + + @ManyToOne(optional = false) + @JoinColumn(name="modified_by") + private UserInfo userModifiedBy; + + public UserInfo getUserCreatedBy() { + return userCreatedBy; + } + + public void setUserCreatedBy(UserInfo userCreatedBy) { + this.userCreatedBy = userCreatedBy; + } + + public UserInfo getUserModifiedBy() { + return userModifiedBy; + } + + public void setUserModifiedBy(UserInfo userModifiedBy) { + this.userModifiedBy = userModifiedBy; + } + + private static Log LOGGER = LogFactory.getLog(FWTag.class); + + public FWTag(){ + + } + + public FWTag(String string, String userid) { + this(string); + } + + public FWTag(String domain) { + this.fwTagName = domain; + } + + @PrePersist + public void prePersist() { + Date date = new Date(); + this.createdDate = date; + this.modifiedDate = date; + } + + @PreUpdate + public void preUpdate() { + this.modifiedDate = new Date(); + try { + this.userModifiedBy =XacmlAdminAuthorization.getUserId();; + } catch (Exception e) { + LOGGER.error("Exception caused While adding Modified by Role"+e); + PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "FWTag", "Exception caused While adding Modified by Role"); + } + } + + public int getId() { + return this.id; + } + public void setId(int id) { + this.id = id; + } + + public String getFwTagName() { + return fwTagName; + } + + public void setFwTagName(String fwTagName) { + this.fwTagName = fwTagName; + } + + public String getTagValues() { + return tagValues; + } + + public void setTagValues(String tagValues) { + this.tagValues = tagValues; + } + + + public Date getCreatedDate() { + return this.createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getModifiedDate() { + return this.modifiedDate; + } + + public void setModifiedDate(Date modifiedDate) { + this.modifiedDate = modifiedDate; + } + +} diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java new file mode 100644 index 000000000..129ad37df --- /dev/null +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java @@ -0,0 +1,178 @@ +/*- + * ============LICENSE_START======================================================= + * ECOMP-REST + * ================================================================================ + * 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.openecomp.policy.rest.jpa; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQuery; +import javax.persistence.OrderBy; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.openecomp.policy.common.logging.eelf.MessageCodes; +import org.openecomp.policy.common.logging.eelf.PolicyLogger; +import org.openecomp.policy.rest.XacmlAdminAuthorization; + +@Entity +@Table(name = "FWTagPicker") +@NamedQuery(name = "FWTagPicker.findAll", query= "Select p from FWTagPicker p") +public class FWTagPicker implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "Id") + private int id; + + @Column(name="tagPickerName", nullable=false) + @OrderBy("asc") + private String tagPickerName; + + @Column(name="description", nullable=true, length=2048) + private String description; + + @Column(name="tags", nullable=true) + @OrderBy("asc") + private String tagValues; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="created_date", updatable=false) + private Date createdDate; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="modified_date", nullable=false) + private Date modifiedDate; + + @ManyToOne(optional = false) + @JoinColumn(name="created_by") + private UserInfo userCreatedBy; + + @ManyToOne(optional = false) + @JoinColumn(name="modified_by") + private UserInfo userModifiedBy; + + private static Log logger = LogFactory.getLog(FWTagPicker.class); + + public FWTagPicker(){ + + } + + public FWTagPicker(String string, String userid) { + this(string); + } + + public FWTagPicker(String domain) { + this.tagPickerName = domain; + } + + @PrePersist + public void prePersist() { + Date date = new Date(); + this.createdDate = date; + this.modifiedDate = date; + } + + @PreUpdate + public void preUpdate() { + this.modifiedDate = new Date(); + try { + this.userModifiedBy =XacmlAdminAuthorization.getUserId(); + } catch (Exception e) { + logger.error("Exception caused While adding Modified by Role"+e); + PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "DescriptiveScope", "Exception caused While adding Modified by Role"); + } + } + + public int getId() { + return this.id; + } + public void setId(int id) { + this.id = id; + } + + public String getTagPickerName() { + return tagPickerName; + } + + public void setTagPickerName(String tagPickerName) { + this.tagPickerName = tagPickerName; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getTagValues() { + return tagValues; + } + + public void setTagValues(String tagValues) { + this.tagValues = tagValues; + } + + public Date getCreatedDate() { + return this.createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } + + public Date getModifiedDate() { + return this.modifiedDate; + } + + public void setModifiedDate(Date modifiedDate) { + this.modifiedDate = modifiedDate; + } + + public UserInfo getUserCreatedBy() { + return userCreatedBy; + } + + public void setUserCreatedBy(UserInfo userCreatedBy) { + this.userCreatedBy = userCreatedBy; + } + + public UserInfo getUserModifiedBy() { + return userModifiedBy; + } + + public void setUserModifiedBy(UserInfo userModifiedBy) { + this.userModifiedBy = userModifiedBy; + } + +} diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FirewallDictionaryList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FirewallDictionaryList.java index 3c47de817..712172acb 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FirewallDictionaryList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FirewallDictionaryList.java @@ -21,29 +21,15 @@ package org.openecomp.policy.rest.jpa; import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; import javax.persistence.NamedQuery; import javax.persistence.OrderBy; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.openecomp.policy.rest.XacmlAdminAuthorization; - -import org.openecomp.policy.common.logging.eelf.MessageCodes; -import org.openecomp.policy.common.logging.eelf.PolicyLogger; @Entity @@ -145,15 +131,10 @@ public class FirewallDictionaryList implements Serializable { this.userModifiedBy = userModifiedBy; }*/ - private static Log logger = LogFactory.getLog(FirewallDictionaryList.class); - public FirewallDictionaryList() { } - private static final Log auditLogger = LogFactory - .getLog("auditLogger"); - public FirewallDictionaryList(String string, String userid) { this(domain); } @@ -175,8 +156,6 @@ public class FirewallDictionaryList implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "TermList", "Exception caused While adding Modified by Role"); } auditLogger.debug("Updated Term Name: "+this.parentItemName+" by "+this.userModifiedBy); diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupEntity.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupEntity.java index b3897d0ee..405a5d458 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupEntity.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupEntity.java @@ -35,26 +35,22 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.Index; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; -import javax.persistence.Lob; import javax.persistence.ManyToMany; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; import javax.persistence.Version; import com.fasterxml.jackson.annotation.JsonManagedReference; @@ -80,7 +76,6 @@ public class GroupEntity implements Serializable { @Id @Column (name="groupKey", nullable=false) - //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator="seqGroup") @GeneratedValue(strategy = GenerationType.AUTO) private long groupKey; @@ -94,9 +89,8 @@ public class GroupEntity implements Serializable { @Column(name="version") private int version; - @ManyToMany - @JoinTable(name="PolicyGroupEntity",joinColumns={@JoinColumn(name="groupKey", referencedColumnName="groupKey")}, - inverseJoinColumns={@JoinColumn(name="policyId",referencedColumnName="policyId")}) + @ManyToMany(cascade = CascadeType.ALL) + @JoinTable(name="PolicyGroupEntity",joinColumns={@JoinColumn(name="groupKey")}, inverseJoinColumns={@JoinColumn(name="policyId")}) @JsonManagedReference private List<PolicyEntity> policies; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupPolicyScopeList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupPolicyScopeList.java index c57d1475a..a8e052282 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupPolicyScopeList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupPolicyScopeList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupServiceList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupServiceList.java index b5fbd9355..d214e4694 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupServiceList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupServiceList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceAttribute.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceAttribute.java new file mode 100644 index 000000000..e30379e1d --- /dev/null +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceAttribute.java @@ -0,0 +1,109 @@ +/*- + * ============LICENSE_START======================================================= + * ECOMP-REST + * ================================================================================ + * 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.openecomp.policy.rest.jpa; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +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 +@Table(name="MicroServiceAttribute") +@NamedQuery(name="MicroServiceAttribute.findAll", query="SELECT e FROM MicroServiceAttribute e ") +public class MicroServiceAttribute implements Serializable { + private static final long serialVersionUID = 1L; + + private static String domain; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name="id") + private int id; + + @Column(name="name", nullable=false) + @OrderBy("asc") + private String name; + + @Column(name="value") + private String value ; + + @Column(name="modelName") + private String modelName; + + + public MicroServiceAttribute() { + + } + public MicroServiceAttribute(String string, String userid) { + this(domain); + + } + public MicroServiceAttribute(String domain) { + + } + + @PrePersist + public void prePersist() { + + } + @PreUpdate + public void preUpdate() { + } + + + public int getId() { + return this.id; + } + + public void setId(int id) { + this.id = id; + } + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + + } + public String getValue() { + return this.value ; + } + + public void setValue(String value ) { + this.value = value ; + } + public String getModelName() { + return modelName; + } + public void setModelName(String modelName) { + this.modelName = modelName; + } + +}
\ No newline at end of file diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceConfigName.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceConfigName.java index 594cacf33..0a1034c77 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceConfigName.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceConfigName.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceLocation.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceLocation.java index 8532f81a1..a72f690ac 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceLocation.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceLocation.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceModels.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceModels.java index ca7460640..c1eb24058 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceModels.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceModels.java @@ -31,7 +31,6 @@ package org.openecomp.policy.rest.jpa; import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -48,10 +47,6 @@ import javax.persistence.Table; * * @version: 0.1 */ -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.openecomp.policy.rest.jpa.UserInfo; @Entity @@ -87,6 +82,12 @@ public class MicroServiceModels implements Serializable{ @Column (name="version", nullable=false, length=2000) private String version; + @Column (name="enumValues", nullable=false, length=2000) + private String enumValues; + + @Column (name="annotation", nullable=false, length=2000) + private String annotation; + public String getSub_attributes() { return sub_attributes; } @@ -169,4 +170,20 @@ public class MicroServiceModels implements Serializable{ public void setModelName(String modelName){ this.modelName = modelName; } + + public String getEnumValues() { + return enumValues; + } + + public void setEnumValues(String enumValues) { + this.enumValues = enumValues; + } + + public String getAnnotation() { + return annotation; + } + + public void setAnnotation(String annotation) { + this.annotation = annotation; + } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ObadviceExpression.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ObadviceExpression.java index 28957fa85..1908b9dc9 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ObadviceExpression.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ObadviceExpression.java @@ -28,14 +28,11 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQuery; import javax.persistence.OneToOne; import javax.persistence.Table; -import org.openecomp.policy.rest.jpa.Attribute; - /** * The persistent class for the ObadviceExpressions database table. diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PEPOptions.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PEPOptions.java index 8b05e8ffc..ed520472c 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PEPOptions.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PEPOptions.java @@ -101,7 +101,7 @@ public class PEPOptions implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(PEPOptions.class); + private static Log LOGGER = LogFactory.getLog(PEPOptions.class); public PEPOptions(){ @@ -128,8 +128,7 @@ public class PEPOptions implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PEPOptions", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java index 8f75bef89..07f1b3bbc 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java @@ -51,21 +51,16 @@ import javax.persistence.Transient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import org.openecomp.policy.common.logging.eelf.MessageCodes; +import org.openecomp.policy.common.logging.eelf.PolicyLogger; import org.openecomp.policy.xacml.api.XACMLErrorConstants; + import com.att.research.xacml.api.pip.PIPException; import com.att.research.xacml.std.pip.engines.StdConfigurableEngine; -import com.att.research.xacml.std.pip.engines.csv.CSVEngine; -import com.att.research.xacml.std.pip.engines.csv.HyperCSVEngine; -import com.att.research.xacml.std.pip.engines.jdbc.JDBCEngine; -import com.att.research.xacml.std.pip.engines.ldap.LDAPEngine; import com.att.research.xacml.util.XACMLProperties; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import org.openecomp.policy.common.logging.eelf.MessageCodes; -import org.openecomp.policy.common.logging.eelf.PolicyLogger; - /** * The persistent class for the PIPConfiguration database table. @@ -358,15 +353,12 @@ public class PIPConfiguration implements Serializable { PIPConfiguration configuration; try { String user = "super-admin"; - //TODO - //String user = ((XacmlAdminUI)UI.getCurrent()).getUserid(); configuration = new PIPConfiguration(id, properties, user); configuration.setCreatedBy(user); configuration.setModifiedBy(user); configurations.add(configuration); } catch (PIPException e) { logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Import failed: " + e.getLocalizedMessage()); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PIPConfiguration", "Import failed"); } } @@ -385,7 +377,6 @@ public class PIPConfiguration implements Serializable { this.id = Integer.parseInt(id); } catch (NumberFormatException e) { logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Convert id to integer failed: " + id); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PIPConfiguration", "Convert id to integer failed"); } } @@ -397,30 +388,6 @@ public class PIPConfiguration implements Serializable { throw new PIPException("PIP Engine defined without a classname"); } // - // These classes we know for sure require resolvers. - // - //TODO: Commented out due to JPAUtils class & As of now we are not using PIP. So, it will not impact any Errors - /*if (this.classname.equals(JDBCEngine.class.getCanonicalName())) { - this.setRequiresResolvers(true); - this.setPiptype(JPAUtils.getPIPType(PIPType.TYPE_SQL)); - } else if (this.classname.equals(LDAPEngine.class.getCanonicalName())) { - this.setRequiresResolvers(true); - this.setPiptype(JPAUtils.getPIPType(PIPType.TYPE_LDAP)); - } else if (this.classname.equals(HyperCSVEngine.class.getCanonicalName())) { - this.setRequiresResolvers(true); - this.setPiptype(JPAUtils.getPIPType(PIPType.TYPE_HYPERCSV)); - } else if (this.classname.equals(CSVEngine.class.getCanonicalName())) { - this.setRequiresResolvers(true); - this.setPiptype(JPAUtils.getPIPType(PIPType.TYPE_CSV)); - } else { - // - // Assume it does not require resolvers for now, if we encounter - // one then we will change it. The user can always change it via the gui. - // - this.setRequiresResolvers(false); - this.setPiptype(JPAUtils.getPIPType(PIPType.TYPE_CUSTOM)); - }*/ - // // Go through each property // for (Object name : properties.keySet()) { @@ -450,8 +417,6 @@ public class PIPConfiguration implements Serializable { properties.getProperty(name.toString()), properties,"super-admin" ); - //TODO: replace with UserId - //((XacmlAdminUI)UI.getCurrent()).getUserid() for (PIPResolver resolver : resolvers) { this.addPipresolver(resolver); } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PdpEntity.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PdpEntity.java index 191dfde60..c7d666056 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PdpEntity.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PdpEntity.java @@ -29,21 +29,15 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.Index; import javax.persistence.JoinColumn; -import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; /* * The Entity class to persist a policy object and its configuration data diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEntity.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEntity.java index 80869c225..7b938e461 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEntity.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEntity.java @@ -29,7 +29,6 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.Index; import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.NamedQueries; @@ -37,11 +36,9 @@ import javax.persistence.NamedQuery; import javax.persistence.OneToOne; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; import javax.persistence.Version; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -56,13 +53,7 @@ import com.fasterxml.jackson.annotation.JsonManagedReference; */ @Entity //Add a non-unique index and a constraint that says the combo of policyName and scopeId must be unique -@Table(name="PolicyEntity", indexes = {@Index(name="scope", columnList="scope", unique=false), - @Index(name="policyName", columnList="policyName", unique=false)}, - uniqueConstraints=@UniqueConstraint(columnNames={"policyName", "scope"})) - -//Using a sequence generator because the value is available as soon as the -//the object is persisted. That is, you don't have to flush/commit to the DB. -//@SequenceGenerator(name="seqPolicy", initialValue=1, allocationSize=1) +@Table(name="PolicyEntity") @NamedQueries({ @NamedQuery(name="PolicyEntity.findAll", query="SELECT e FROM PolicyEntity e "), @@ -76,7 +67,6 @@ public class PolicyEntity implements Serializable { private static final long serialVersionUID = 1L; @Id - //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator="seqPolicy") @GeneratedValue(strategy = GenerationType.AUTO) @Column (name="policyId") @JsonBackReference @@ -102,12 +92,12 @@ public class PolicyEntity implements Serializable { private String policyData = "NoData"; @OneToOne(optional=true, orphanRemoval=true) - @JoinColumn(name="configurationDataId", referencedColumnName="configurationDataId") + @JoinColumn(name="configurationDataId") @JsonManagedReference private ConfigurationDataEntity configurationDataEntity; @OneToOne(optional=true, orphanRemoval=true) - @JoinColumn(name="actionBodyId", referencedColumnName="actionBodyId") + @JoinColumn(name="actionBodyId") @JsonManagedReference private ActionBodyEntity actionBodyEntity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyRoles.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyRoles.java index 71df02b99..ede5d1020 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyRoles.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyRoles.java @@ -56,14 +56,14 @@ public class PolicyRoles implements Serializable { @ManyToOne @JoinColumn(name="loginid") @OrderBy("asc") - private UserInfo loginid; + private UserInfo loginId; public UserInfo getLoginId() { - return loginid; + return loginId; } - public void setLoginId(UserInfo loginid) { - this.loginid = loginid; + public void setLoginId(UserInfo loginId) { + this.loginId = loginId; } @Column(name="scope", nullable=true, length=45) diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeClosedLoop.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeClosedLoop.java index 484851d7b..8315ed070 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeClosedLoop.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeClosedLoop.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeResource.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeResource.java index e126c4118..76eb40d3e 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeResource.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeResource.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeService.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeService.java index cc8c11383..820616988 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeService.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeService.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeType.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeType.java index d4ade7fe9..65fe6e5f7 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeType.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeType.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScore.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScore.java index cae9cfc6a..3cd84eb2d 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScore.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScore.java @@ -20,7 +20,6 @@ package org.openecomp.policy.rest.jpa; import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -30,11 +29,7 @@ import javax.persistence.Id; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OrderBy; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyVersion.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyVersion.java index 73d39ad8e..4355693f3 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyVersion.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyVersion.java @@ -44,7 +44,8 @@ import javax.persistence.TemporalType; @NamedQueries({ @NamedQuery(name="PolicyVersion.findAll", query="SELECT p FROM PolicyVersion p"), @NamedQuery(name="PolicyVersion.deleteAll", query="DELETE FROM PolicyVersion WHERE 1=1"), - @NamedQuery(name="PolicyVersion.findByPolicyName", query="Select p from PolicyVersion p where p.policyName=:pname") + @NamedQuery(name="PolicyVersion.findByPolicyName", query="Select p from PolicyVersion p where p.policyName=:pname"), + @NamedQuery(name="PolicyVersion.findAllCount", query="SELECT COUNT(p) FROM PolicyVersion p") }) public class PolicyVersion implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PortList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PortList.java index 88ce58afc..7bc4cf46a 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PortList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PortList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity @Table(name="portlist") diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PREFIXLIST.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PrefixList.java index aac04795c..e94afd4f1 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PREFIXLIST.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PrefixList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,13 +33,11 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity -@Table(name="PREFIXLIST") -@NamedQuery(name="PREFIXLIST.findAll", query="SELECT e FROM PREFIXLIST e ") -public class PREFIXLIST implements Serializable { +@Table(name="PrefixList") +@NamedQuery(name="PrefixList.findAll", query="SELECT e FROM PrefixList e ") +public class PrefixList implements Serializable { private static final long serialVersionUID = 1L; private static String domain; @@ -64,14 +61,14 @@ public class PREFIXLIST implements Serializable { @Column(name="modified_date", nullable=false) private Date modifiedDate;*/ - public PREFIXLIST() { + public PrefixList() { } - public PREFIXLIST(String string, String userid) { + public PrefixList(String string, String userid) { this(domain); } - public PREFIXLIST(String domain) { + public PrefixList(String domain) { } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ProtocolList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ProtocolList.java index a450c2551..d7cba8ffe 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ProtocolList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ProtocolList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity @Table(name="protocollist") diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RemoteCatalogValues.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RemoteCatalogValues.java index c906c79cb..b2b4df75b 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RemoteCatalogValues.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RemoteCatalogValues.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RiskType.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RiskType.java index da18c744e..077138e1f 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RiskType.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RiskType.java @@ -41,14 +41,9 @@ import javax.persistence.TemporalType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.openecomp.policy.rest.XacmlAdminAuthorization; -import org.openecomp.policy.rest.jpa.UserInfo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonManagedReference; - import org.openecomp.policy.common.logging.eelf.MessageCodes; import org.openecomp.policy.common.logging.eelf.PolicyLogger; +import org.openecomp.policy.rest.XacmlAdminAuthorization; @Entity @@ -103,7 +98,7 @@ public class RiskType implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(RiskType.class); + private static Log LOGGER = LogFactory.getLog(RiskType.class); public RiskType() { @@ -130,8 +125,7 @@ public class RiskType implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId(); } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "RiskType", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SecurityZone.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SecurityZone.java index 2fbd4486d..5de032f8f 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SecurityZone.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SecurityZone.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity @Table(name="securityzone") diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ServiceList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ServiceList.java index 9a72916b1..b3e473b1a 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ServiceList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ServiceList.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity @Table(name="servicegroup") diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SystemLogDB.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SystemLogDB.java index a86857aee..6fa91ee03 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SystemLogDB.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SystemLogDB.java @@ -32,25 +32,16 @@ package org.openecomp.policy.rest.jpa; import java.io.Serializable; import java.util.Date; -import java.util.HashSet; -import java.util.Set; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import com.att.research.xacml.api.Identifier; /** * The persistent class for the system log database table. @@ -93,7 +84,6 @@ public class SystemLogDB implements Serializable { public SystemLogDB(int id, String system, String description, String remote, String type, String logtype) { - // TODO Auto-generated constructor stub this.id = id; this.system = system; this.description = description; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/TermList.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/TermList.java index ce94fb8d8..38bbf793a 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/TermList.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/TermList.java @@ -125,7 +125,7 @@ public class TermList implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(TermList.class); + private static Log LOGGER = LogFactory.getLog(TermList.class); public TermList() { @@ -155,8 +155,7 @@ public class TermList implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "TermList", "Exception caused While adding Modified by Role"); } auditLogger.debug("Updated Term Name: "+this.termName+" by "+this.userModifiedBy); diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/UserInfo.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/UserInfo.java index 6f5982aa8..9dd771e6c 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/UserInfo.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/UserInfo.java @@ -40,7 +40,7 @@ public class UserInfo implements Serializable { private static final long serialVersionUID = 1L; @Id - @Column(name="loginId", nullable=false, length=45) + @Column(name="loginid", nullable=false, length=45) private String userLoginId; @Column(name = "name", nullable = false, unique = true) diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VMType.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VMType.java index a1adcd447..e7ae197fc 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VMType.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VMType.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VNFType.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VNFType.java index a2c19da31..693e27553 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VNFType.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VNFType.java @@ -99,7 +99,7 @@ public class VNFType implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(VNFType.class); + private static Log LOGGER = LogFactory.getLog(VNFType.class); public VNFType() { @@ -134,8 +134,7 @@ public class VNFType implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "VNFType", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VSCLAction.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VSCLAction.java index 39d671f1d..7f42650a3 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VSCLAction.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VSCLAction.java @@ -98,7 +98,7 @@ public class VSCLAction implements Serializable { this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(VSCLAction.class); + private static Log LOGGER = LogFactory.getLog(VSCLAction.class); public VSCLAction() { @@ -125,8 +125,7 @@ public class VSCLAction implements Serializable { try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "VSCLAction", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VarbindDictionary.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VarbindDictionary.java index 05e5710d7..1bb56a067 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VarbindDictionary.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VarbindDictionary.java @@ -100,7 +100,7 @@ public class VarbindDictionary implements Serializable{ this.userModifiedBy = userModifiedBy; } - private static Log logger = LogFactory.getLog(VarbindDictionary.class); + private static Log LOGGER = LogFactory.getLog(VarbindDictionary.class); public VarbindDictionary() { @@ -127,8 +127,7 @@ public class VarbindDictionary implements Serializable{ try { this.userModifiedBy =XacmlAdminAuthorization.getUserId();; } catch (Exception e) { - logger.error("Exception caused While adding Modified by Role"+e); - // TODO:EELF Cleanup - Remove logger + LOGGER.error("Exception caused While adding Modified by Role"+e); PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "VarbindDictionary", "Exception caused While adding Modified by Role"); } } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Zone.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Zone.java index e1db124c3..30e02e06d 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Zone.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Zone.java @@ -22,7 +22,6 @@ package org.openecomp.policy.rest.jpa; /* */ import java.io.Serializable; -import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,8 +33,6 @@ import javax.persistence.OrderBy; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; @Entity @Table(name="zone") diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/package-info.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/package-info.java index d5b935077..4e77ba9e7 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/package-info.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/package-info.java @@ -18,10 +18,4 @@ * ============LICENSE_END========================================================= */ -/** - * - */ -/** - * - */ package org.openecomp.policy.rest.jpa; |