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=33243b0a5c83d92f3f7ac0fbe03fb960d0f64db0;hb=refs%2Fchanges%2F84%2F98384%2F3;hp=40e31172e2d3817cc1b5741f4b6dcb256689a37b;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;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 40e31172e..33243b0a5 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,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,125 +30,94 @@ 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="servicegroup")
 @NamedQuery(name="ServiceList.findAll", query="SELECT e FROM ServiceList e ")
 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;
-	
-	
-	
-/*
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="modified_date", nullable=false)
-	private Date modifiedDate;*/
-
-	public ServiceList() {
-		
-	}
-	public ServiceList(String string, String userid) {
-		this(domain);
-		
-	}
-	public ServiceList(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 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;
-	}
-
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-	
-	public String getServiceTransProtocol() {
-		return this.serviceTrasProtocol;
-	}
-
-	public void setServiceTransProtocol(String serviceTrasProtocol) {
-		this.serviceTrasProtocol = serviceTrasProtocol;
-
-	}
-	
-	public String getServiceAppProtocol() {
-		return this.serviceAppProtocol;
-	}
-
-	public void setServiceAppProtocol(String serviceAppProtocol) {
-		this.serviceAppProtocol = serviceAppProtocol;
-
-	}
-	public String getServicePorts() {
-		return this.servicePorts;
-	}
-
-	public void setServicePorts(String servicePorts) {
-		this.servicePorts = servicePorts;
-
-	}
+    private static final long serialVersionUID = 1L;
+
+    @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 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;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getServiceTransProtocol() {
+        return this.serviceTrasProtocol;
+    }
+
+    public void setServiceTransProtocol(String serviceTrasProtocol) {
+        this.serviceTrasProtocol = serviceTrasProtocol;
+
+    }
+
+    public String getServiceAppProtocol() {
+        return this.serviceAppProtocol;
+    }
+
+    public void setServiceAppProtocol(String serviceAppProtocol) {
+        this.serviceAppProtocol = serviceAppProtocol;
+
+    }
+    public String getServicePorts() {
+        return this.servicePorts;
+    }
+
+    public void setServicePorts(String servicePorts) {
+        this.servicePorts = servicePorts;
+
+    }
 }