X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FZone.java;h=71252ed057e46beff5f8bde084cbcfd23a1c4519;hb=d4e3a1b394715c6386f963130e4e081d421ecd1b;hp=eb53c42f1122fee52d838bb5ca53aa17c82459ae;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

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 eb53c42f1..71252ed05 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,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.
@@ -19,8 +20,7 @@
  */
 
 package org.onap.policy.rest.jpa;
-/*
- */
+
 import java.io.Serializable;
 
 import javax.persistence.Column;
@@ -30,72 +30,28 @@ 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;
 
+import lombok.Getter;
+import lombok.Setter;
+
 @Entity
-@Table(name="zone")
-@NamedQuery(name="Zone.findAll", query="SELECT e FROM Zone e ")
+@Table(name = "zone")
+@NamedQuery(name = "Zone.findAll", query = "SELECT e FROM Zone e ")
+@Getter
+@Setter
 public class Zone 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="zonename", nullable=false)
-	@OrderBy("asc")
-	private String zoneName;
-	
-	@Column(name="zonevalue")
-	private String zoneValue;
-
-
-	public Zone() {
-		
-	}
-	public Zone(String string, String userid) {
-		this(domain);
-		
-	}
-	public Zone(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 getZoneName() {
-		return this.zoneName;
-	}
+    private static final long serialVersionUID = 1L;
 
-	public void setZoneName(String zoneName) {
-		this.zoneName = zoneName;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
 
-	}
-	public String getZoneValue() {
-		return this.zoneValue;
-	}
+    @Column(name = "zonename", nullable = false)
+    @OrderBy("asc")
+    private String zoneName;
 
-	public void setZoneValue(String zoneValue) {
-		this.zoneValue = zoneValue;
-	}
-	
+    @Column(name = "zonevalue")
+    private String zoneValue;
 }