X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FFirewallDictionaryList.java;h=8581cdf514df49b94db808be303d6922a4a8a409;hp=27f5e75bdc4effcfa166d71421f79e71ecedeb89;hb=0c20d1c294fe146e1018f14b07a8d861c29fe527;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52

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 27f5e75bd..8581cdf51 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,14 +2,15 @@
  * ============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.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * 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.
@@ -31,134 +32,32 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
-@Table(name="parentdictionaryitems")
-@NamedQuery(name="FirewallDictionaryList.findAll", query="SELECT e FROM FirewallDictionaryList e")
+@Table(name = "parentdictionaryitems")
+@NamedQuery(name = "FirewallDictionaryList.findAll", query = "SELECT e FROM FirewallDictionaryList e")
+@Getter
+@Setter
 public class FirewallDictionaryList implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static String domain;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name="id")
-	private int id;
-	
-	@Column(name="parentItemName", nullable=false)
-	@OrderBy("asc")
-	private String parentItemName;
-	
-	@Column(name="description")
-	private String description;
-	
-	@Column(name="addressList")
-	private String addressList;
-	
-	@Column(name="serviceList")
-	private String serviceList;
-	
-/*	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="created_date", updatable=false)
-	private Date createdDate;
+    @Column(name = "parentItemName", nullable = false)
+    @OrderBy("asc")
+    private String parentItemName;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="modified_date", nullable=false)
-	private Date modifiedDate;
-	
-	@ManyToOne(optional = false)
-	@JoinColumn(name="created_by")
-	private UserInfo userCreatedBy;
+    @Column(name = "description")
+    private String description;
 
-	@ManyToOne(optional = false)
-	@JoinColumn(name="modified_by")
-	private UserInfo userModifiedBy;*/
+    @Column(name = "addressList")
+    private String addressList;
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-	
-	public String getParentItemName() {
-		return parentItemName;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public String getAddressList() {
-		return addressList;
-	}
-
-	public String getServiceList() {
-		return serviceList;
-	}
-
-	public void setParentItemName(String parentItemName) {
-		this.parentItemName = parentItemName;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public void setAddressList(String addressList) {
-		this.addressList = addressList;
-	}
-
-	public void setServiceList(String serviceList) {
-		this.serviceList = serviceList;
-	}
-	
-	
-	/*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;
-	}*/
-
-	public FirewallDictionaryList() {
-		
-	}
-	
-	public FirewallDictionaryList(String string, String userid) {
-		this(domain);
-	}
-	public FirewallDictionaryList(String domain) {
-		this.parentItemName = domain;
-	}	
-
-	/*@PrePersist
-	public void	prePersist() {
-		Date date = new Date();
-		this.createdDate = date;
-		this.modifiedDate = date;
-		auditLogger.debug("Added New Term Name: "+this.parentItemName+" by "+this.userCreatedBy);
-		
-	}
-	@PreUpdate
-	public void preUpdate() {
-		this.modifiedDate = new Date();
-		try {
-			this.userModifiedBy =XacmlAdminAuthorization.getUserId();;
-		} catch (Exception e) {
-			PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "TermList", "Exception caused While adding Modified by Role");
-		}
-		auditLogger.debug("Updated Term Name: "+this.parentItemName+" by "+this.userModifiedBy);
-	}
-*/
+    @Column(name = "serviceList")
+    private String serviceList;
 }