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%2FObadviceExpression.java;h=db437095cf2ae9fbcc7438876bcca2ab34488a0d;hp=7b0db3f72d9b3cd7a432e4575f710aebeb69d506;hb=2f3ca9fc5edc5a52659b3486605e0db508143318;hpb=c579209f8a4045d7f96f2b566a82ce1b8cf8660d

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
index 7b0db3f72..db437095c 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.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.
@@ -33,85 +34,57 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * The persistent class for the ObadviceExpressions database table.
- * 
  */
 @Entity
-@Table(name="ObadviceExpressions")
-@NamedQuery(name="ObadviceExpression.findAll", query="SELECT o FROM ObadviceExpression o")
+@Table(name = "ObadviceExpressions")
+@NamedQuery(name = "ObadviceExpression.findAll", query = "SELECT o FROM ObadviceExpression o")
+@Getter
+@Setter
 public class ObadviceExpression implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	public static final String EXPRESSION_APPLY = "Apply";
-	public static final String EXPRESSION_SELECTOR = "Attribute Selector";
-	public static final String EXPRESSION_VALUE = "Attribute Value";
-	public static final String EXPRESSION_FUNCTION = "Function";
-	public static final String EXPRESSION_REFERENCE = "Varable Reference";
-	public static final String EXPRESSION_DESIGNATOR = "Attribute Designator";
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name="id")
-	private int id;
-
-	//unidirectional one-to-one association to Attribute
-	@OneToOne
-	@JoinColumn(name="attribute_id")
-	private Attribute attribute;
-
-	@Column(name="type", nullable=false)
-	private String type;
-
-	//bi-directional many-to-one association to Obadvice
-	@ManyToOne
-	@JoinColumn(name="obadvice_id")
-	private Obadvice obadvice;
-
-	public ObadviceExpression() {
-		type = EXPRESSION_VALUE;
-	}
-
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Attribute getAttribute() {
-		return this.attribute;
-	}
-
-	public void setAttribute(Attribute attribute) {
-		this.attribute = attribute;
-	}
-
-	public String getType() {
-		return this.type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Obadvice getObadvice() {
-		return this.obadvice;
-	}
-
-	public void setObadvice(Obadvice obadvice) {
-		this.obadvice = obadvice;
-	}
-
-	public ObadviceExpression clone() {
-		ObadviceExpression expression = new ObadviceExpression();
-		
-		expression.attribute = this.attribute;
-		expression.type = this.type;
-		expression.obadvice = this.obadvice;
-		
-		return expression;
-	}
+    private static final long serialVersionUID = 1L;
+
+    public static final String EXPRESSION_APPLY = "Apply";
+    public static final String EXPRESSION_SELECTOR = "Attribute Selector";
+    public static final String EXPRESSION_VALUE = "Attribute Value";
+    public static final String EXPRESSION_FUNCTION = "Function";
+    public static final String EXPRESSION_REFERENCE = "Varable Reference";
+    public static final String EXPRESSION_DESIGNATOR = "Attribute Designator";
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
+
+    // unidirectional one-to-one association to Attribute
+    @OneToOne
+    @JoinColumn(name = "attribute_id")
+    private Attribute attribute;
+
+    @Column(name = "type", nullable = false)
+    private String type;
+
+    // bi-directional many-to-one association to Obadvice
+    @ManyToOne
+    @JoinColumn(name = "obadvice_id")
+    private Obadvice obadvice;
+
+    public ObadviceExpression() {
+        type = EXPRESSION_VALUE;
+    }
+
+    @Override
+    public ObadviceExpression clone() {
+        ObadviceExpression expression = new ObadviceExpression();
+
+        expression.attribute = this.attribute;
+        expression.type = this.type;
+        expression.obadvice = this.obadvice;
+
+        return expression;
+    }
 }