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%2FAddressGroup.java;h=efefad2d2f6f9f6995f099e396c39168ad03611d;hb=f4ec47c009cdc385a7efed02dda5d26f2ec31b57;hp=c3673f336295bcee3f2c98f7de686af9b4f96343;hpb=401b48bc573561f097960a9ca7abe6d788456f28;p=policy%2Fengine.git

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
index c3673f336..efefad2d2 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
@@ -2,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,86 +30,63 @@ 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="AddressGroup")
-@NamedQuery(name="AddressGroup.findAll", query="SELECT e FROM AddressGroup e ")
-public class AddressGroup 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="prefixlist")
-	private String prefixList;
-	
-	
-	@Column(name="description")
-	private String description;
-	
-	public AddressGroup() {
-		//An empty constructor
-	}
-	public AddressGroup(String string, String userid) {
-		this(domain);
-		
-	}
-	public AddressGroup(String domain) {
-		//An empty constructor
-	}	
+import lombok.Data;
 
-	@PrePersist
-	public void	prePersist() {
-		//An empty function
-	}
-	@PreUpdate
-	public void preUpdate() {
-		//An empty function
-	}
-
-	
-	public int getId() {
-		return this.id;
-	}
+/**
+ * The Class AddressGroup is a JPA class for address groups.
+ */
+@Entity
+@Table(name = "AddressGroup")
+@NamedQuery(name = "AddressGroup.findAll", query = "SELECT e FROM AddressGroup e ")
 
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getGroupName() {
-		return this.name;
-	}
+/**
+ * Instantiates a new address group.
+ */
+@Data
+public class AddressGroup implements Serializable {
+    private static final long serialVersionUID = 1L;
 
-	public void setGroupName(String serviceName) {
-		this.name = serviceName;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
 
-	}
-		
-	public String getPrefixList() {
-		return this.prefixList;
-	}
+    @Column(name = "name", nullable = false)
+    @OrderBy("asc")
+    private String name;
 
-	public void setServiceList(String prefixList) {
-		this.prefixList = prefixList;
+    @Column(name = "prefixlist")
+    private String prefixList;
 
-	}
-	public String getDescription() {
-		return this.description;
-	}
+    @Column(name = "description")
+    private String description;
 
-	public void setDescription(String description) {
-		this.description = description;
+    /**
+     * Get the group name.
+     *
+     * @return the group name
+     */
+    public String getGroupName() {
+        return name;
+    }
 
-	}
+    /**
+     * Set the group name.
+     *
+     * @param groupName the group name
+     */
+    public void setGroupName(final String groupName) {
+        this.name = groupName;
+    }
 
+    /**
+     * Sets the service list.
+     *
+     * @param prefixList the new service list
+     */
+    public void setServiceList(String prefixList) {
+        this.prefixList = prefixList;
+    }
 }