X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FServiceList.java;h=9be6b2ebf72c53e3b7815508b127a51d02832b03;hb=refs%2Fchanges%2F49%2F98449%2F4;hp=057b869925d857d920894477f61740e3318b4286;hpb=c579209f8a4045d7f96f2b566a82ce1b8cf8660d;p=policy%2Fengine.git

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
index 057b86992..9be6b2ebf 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.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,119 +30,40 @@ 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="servicegroup")
-@NamedQuery(name="ServiceList.findAll", query="SELECT e FROM ServiceList e ")
+@Table(name = "servicegroup")
+@NamedQuery(name = "ServiceList.findAll", query = "SELECT e FROM ServiceList e ")
+@Getter
+@Setter
 public class ServiceList 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 serviceName;
-	
-	@Column(name="description")
-	private String serviceDesc;
-	
-	@Column(name="type")
-	private String serviceType;
-	
-	@Column(name="transportprotocol")
-	private String serviceTrasProtocol;
-	
-	@Column(name="appprotocol ")
-	private String serviceAppProtocol;
-	
-	@Column(name="ports")
-	private String servicePorts;
-
-	public ServiceList() {
-		// Empty constructor
-	}
-	public ServiceList(String string, String userid) {
-		this(domain);
-		
-	}
-	public ServiceList(String domain) {
-		// Empty constructor
-	}	
-
-	@PrePersist
-	public void	prePersist() {
-		// Empty function
-	}
-	@PreUpdate
-	public void preUpdate() {
-		// Empty function
-	}
-
-	
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getServiceName() {
-		return this.serviceName;
-	}
-
-	public void setServiceName(String serviceName) {
-		this.serviceName = serviceName;
-
-	}
-	
-	public String getServiceDescription() {
-		return this.serviceDesc;
-	}
-
-	public void setServiceDescription(String serviceDesc) {
-		this.serviceDesc = serviceDesc;
-
-	}
-	
-	public String getServiceType() {
-		return this.serviceType;
-	}
+    private static final long serialVersionUID = 1L;
 
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-	
-	public String getServiceTransProtocol() {
-		return this.serviceTrasProtocol;
-	}
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
 
-	public void setServiceTransProtocol(String serviceTrasProtocol) {
-		this.serviceTrasProtocol = serviceTrasProtocol;
+    @Column(name = "name", nullable = false)
+    @OrderBy("asc")
+    private String serviceName;
 
-	}
-	
-	public String getServiceAppProtocol() {
-		return this.serviceAppProtocol;
-	}
+    @Column(name = "description")
+    private String serviceDescription;
 
-	public void setServiceAppProtocol(String serviceAppProtocol) {
-		this.serviceAppProtocol = serviceAppProtocol;
+    @Column(name = "type")
+    private String serviceType;
 
-	}
-	public String getServicePorts() {
-		return this.servicePorts;
-	}
+    @Column(name = "transportprotocol")
+    private String serviceTransportProtocol;
 
-	public void setServicePorts(String servicePorts) {
-		this.servicePorts = servicePorts;
+    @Column(name = "appprotocol ")
+    private String serviceAppProtocol;
 
-	}
+    @Column(name = "ports")
+    private String servicePorts;
 }