1 files changed, 72 insertions, 140 deletions
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionDefinition.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionDefinition.java
index 80c9beb2c..9201eec32 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionDefinition.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionDefinition.java
@@ -3,13 +3,14 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 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.
@@ -21,165 +22,93 @@
 package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
-
-import javax.persistence.*;
-
 import java.util.List;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 /**
  * The persistent class for the FunctionDefinition database table.
- * 
+ *
  */
+// @formatter:off
 @Entity
-@Table(name="FunctionDefinition")
-@NamedQueries({
-    @NamedQuery(name="FunctionDefinition.findAll", query="SELECT f FROM FunctionDefinition f")
-})
+@Table(name = "FunctionDefinition")
+@NamedQueries(
+    {
+        @NamedQuery(name = "FunctionDefinition.findAll", query = "SELECT f FROM FunctionDefinition f")
+    }
+)
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+// @formatter:on
 public class FunctionDefinition implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy=GenerationType.AUTO)
-    @Column(name="id")
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
     private int id;
 
-    @Column(name="short_name", nullable=false, length=64)
+    @Column(name = "short_name", nullable = false, length = 64)
     private String shortname;
 
-    @Column(name="xacml_id", nullable=false, length=255)
+    @Column(name = "xacml_id", nullable = false, length = 255)
     private String xacmlid;
 
-    //bi-directional many-to-one association to Datatype
+    // bi-directional many-to-one association to Datatype
     @ManyToOne
-    @JoinColumn(name="return_datatype", nullable=true)
+    @JoinColumn(name = "return_datatype", nullable = true)
     private Datatype datatypeBean;
 
-    @Column(name="is_bag_return", nullable=false)
+    @Column(name = "is_bag_return", nullable = false)
     private Integer isBagReturn;
 
-    @Column(name="is_higher_order", nullable=false)
+    @Column(name = "is_higher_order", nullable = false)
     private Integer isHigherOrder;
 
-    @Column(name="arg_lb", nullable=false)
+    @Column(name = "arg_lb", nullable = false)
     private Integer argLb;
 
-    @Column(name="arg_ub", nullable=false)
+    @Column(name = "arg_ub", nullable = false)
     private Integer argUb;
 
-    @Column(name="ho_arg_lb", nullable=true)
-    private Integer higherOrderArg_LB;
+    @Column(name = "ho_arg_lb", nullable = true)
+    private Integer higherOrderArgLb;
 
-    @Column(name="ho_arg_ub", nullable=true)
-    private Integer higherOrderArg_UB;
+    @Column(name = "ho_arg_ub", nullable = true)
+    private Integer higherOrderArgUb;
 
-    @Column(name="ho_primitive", nullable=true)
+    @Column(name = "ho_primitive", nullable = true)
     private Character higherOrderIsPrimitive;
 
-    //bi-directional many-to-one association to FunctionArgument
-    @OneToMany(mappedBy="functionDefinition")
+    // bi-directional many-to-one association to FunctionArgument
+    @OneToMany(mappedBy = "functionDefinition")
     private List<FunctionArgument> functionArguments;
 
-    public FunctionDefinition() {
-        //An empty constructor
-    }
-
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public int getArgLb() {
-        return this.argLb;
-    }
-
-    public void setArgLb(Integer argLb) {
-        this.argLb = argLb;
-    }
-
-    public int getArgUb() {
-        return this.argUb;
-    }
-
-    public void setArgUb(Integer argUb) {
-        this.argUb = argUb;
-    }
-
-    public int getIsBagReturn() {
-        return isBagReturn;
-    }
-
-    public void setIsBagReturn(Integer isBagReturn) {
-        this.isBagReturn = isBagReturn;
-    }
-
-    public int getIsHigherOrder() {
-        return isHigherOrder;
-    }
-
-    public void setIsHigherOrder(Integer isHigherOrder) {
-        this.isHigherOrder = isHigherOrder;
-    }
-
-    public Datatype getDatatypeBean() {
-        return this.datatypeBean;
-    }
-
-    public void setDatatypeBean(Datatype datatypeBean) {
-        this.datatypeBean = datatypeBean;
-    }
-
-    public String getShortname() {
-        return this.shortname;
-    }
-
-    public void setShortname(String shortname) {
-        this.shortname = shortname;
-    }
-
-    public String getXacmlid() {
-        return this.xacmlid;
-    }
-
-    public void setXacmlid(String xacmlid) {
-        this.xacmlid = xacmlid;
-    }
-
-    public int getHigherOrderArg_LB() {
-        return higherOrderArg_LB;
-    }
-
-    public void setHigherOrderArg_LB(Integer higherOrderArg_LB) {
-        this.higherOrderArg_LB = higherOrderArg_LB;
-    }
-
-    public int getHigherOrderArg_UB() {
-        return higherOrderArg_UB;
-    }
-
-    public void setHigherOrderArg_UB(Integer higherOrderArg_UB) {
-        this.higherOrderArg_UB = higherOrderArg_UB;
-    }
-
-    public Character getHigherOrderIsPrimitive() {
-        return higherOrderIsPrimitive;
-    }
-
-    public void setHigherOrderIsPrimitive(Character higherOrderIsPrimitive) {
-        this.higherOrderIsPrimitive = higherOrderIsPrimitive;
-    }
-
-    public List<FunctionArgument> getFunctionArguments() {
-        return this.functionArguments;
-    }
-
-    public void setFunctionArguments(List<FunctionArgument> functionArguments) {
-        this.functionArguments = functionArguments;
-    }
-
+    /**
+     * Adds the function argument.
+     *
+     * @param functionArgument the function argument
+     * @return the function argument
+     */
     public FunctionArgument addFunctionArgument(FunctionArgument functionArgument) {
         getFunctionArguments().add(functionArgument);
         functionArgument.setFunctionDefinition(this);
@@ -187,6 +116,12 @@ public class FunctionDefinition implements Serializable {
         return functionArgument;
     }
 
+    /**
+     * Removes the function argument.
+     *
+     * @param functionArgument the function argument
+     * @return the function argument
+     */
     public FunctionArgument removeFunctionArgument(FunctionArgument functionArgument) {
         getFunctionArguments().remove(functionArgument);
         functionArgument.setFunctionDefinition(null);
@@ -194,24 +129,21 @@ public class FunctionDefinition implements Serializable {
         return functionArgument;
     }
 
-    @Transient
-    @Override
-    public String toString() {
-        return "FunctionDefinition [id=" + id + ", argLb=" + argLb + ", argUb="
-                + argUb + ", isBagReturn=" + isBagReturn + ", isHigherOrder="
-                + isHigherOrder + ", datatypeBean=" + datatypeBean
-                + ", shortname=" + shortname + ", xacmlid=" + xacmlid
-                + ", higherOrderArg_LB=" + higherOrderArg_LB
-                + ", higherOrderArg_UB=" + higherOrderArg_UB
-                + ", higherOrderIsPrimitive=" + higherOrderIsPrimitive
-                + ", functionArguments=" + functionArguments + "]";
-    }
-
+    /**
+     * Checks if is bag return.
+     *
+     * @return true, if is bag return
+     */
     @Transient
     public boolean isBagReturn() {
         return this.isBagReturn == 1;
     }
 
+    /**
+     * Checks if is higher order.
+     *
+     * @return true, if is higher order
+     */
     @Transient
     public boolean isHigherOrder() {
         return this.isHigherOrder == 1;