X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FZone.java;h=58c1a275a703bc27dcbac761dc9baa102985dd34;hb=e4ac1ef3c51fc9afe44849ada5bea8c3d6057897;hp=fe5d62adcaabd4765cb2095b25d0004bd6a281f7;hpb=066fc4529f36d210a4a4700e8dbfd2cb42f4dc66;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 fe5d62adc..58c1a275a 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,73 +30,47 @@ 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="zone")
 @NamedQuery(name="Zone.findAll", query="SELECT e FROM Zone e ")
 public class Zone 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="zonename", nullable=false)
-	@OrderBy("asc")
-	private String zoneName;
-	
-	@Column(name="zonevalue")
-	private String zoneValue;
+    @Column(name="zonename", nullable=false)
+    @OrderBy("asc")
+    private String zoneName;
 
+    @Column(name="zonevalue")
+    private String zoneValue;
 
-	public Zone() {
-		// Empty constructor
-	}
-	public Zone(String string, String userid) {
-		this(domain);
-		
-	}
-	public Zone(String domain) {
-		// Empty constructor
-	}	
+    public int getId() {
+        return this.id;
+    }
 
-	@PrePersist
-	public void	prePersist() {
-		// Empty function
-	}
-	@PreUpdate
-	public void preUpdate() {
-		// Empty function
-	}
+    public void setId(int id) {
+        this.id = id;
+    }
+    public String getZoneName() {
+        return this.zoneName;
+    }
 
-	
-	public int getId() {
-		return this.id;
-	}
+    public void setZoneName(String zoneName) {
+        this.zoneName = zoneName;
 
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getZoneName() {
-		return this.zoneName;
-	}
+    }
+    public String getZoneValue() {
+        return this.zoneValue;
+    }
 
-	public void setZoneName(String zoneName) {
-		this.zoneName = zoneName;
+    public void setZoneValue(String zoneValue) {
+        this.zoneValue = zoneValue;
+    }
 
-	}
-	public String getZoneValue() {
-		return this.zoneValue;
-	}
-
-	public void setZoneValue(String zoneValue) {
-		this.zoneValue = zoneValue;
-	}
-	
 }