X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FMicroServiceAttribute.java;h=8ae81b9c09feb8b61beedb606ab45f33f106233f;hp=bb05071233c01c63e504d3b89b8b80a7d1922b95;hb=refs%2Fchanges%2F84%2F98384%2F3;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
index bb0507123..8ae81b9c0 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.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.
@@ -29,81 +30,32 @@ 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="MicroServiceAttribute")
-@NamedQuery(name="MicroServiceAttribute.findAll", query="SELECT e FROM MicroServiceAttribute e ")
-public class MicroServiceAttribute 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="value")
-	private String value ;
+import lombok.Getter;
+import lombok.Setter;
 
-	@Column(name="modelName")
-	private String modelName;
-	
-
-	public MicroServiceAttribute() {
-		
-	}
-	public MicroServiceAttribute(String string, String userid) {
-		this(domain);
-		
-	}
-	public MicroServiceAttribute(String domain) {
-		
-	}	
-
-	@PrePersist
-	public void	prePersist() {
-		
-	}
-	@PreUpdate
-	public void preUpdate() {
-	}
+@Entity
+@Table(name = "MicroServiceAttribute")
+@NamedQuery(name = "MicroServiceAttribute.findAll", query = "SELECT e FROM MicroServiceAttribute e ")
+@Getter
+@Setter
 
-	
-	public int getId() {
-		return this.id;
-	}
+public class MicroServiceAttribute implements Serializable {
+    private static final long serialVersionUID = 1L;
 
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getName() {
-		return this.name;
-	}
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
 
-	public void setName(String name) {
-		this.name = name;
+    @Column(name = "name", nullable = false)
+    @OrderBy("asc")
+    private String name;
 
-	}
-	public String getValue() {
-		return this.value ;
-	}
+    @Column(name = "value")
+    private String value;
 
-	public void setValue(String value ) {
-		this.value  = value ;
-	}
-	public String getModelName() {
-		return modelName;
-	}
-	public void setModelName(String modelName) {
-		this.modelName = modelName;
-	}
-	
+    @Column(name = "modelName")
+    private String modelName;
 }
\ No newline at end of file