1 files changed, 34 insertions, 49 deletions

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
index 606403318..10394ae6f 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.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.
@@ -35,9 +36,16 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 @Entity
-@Table(name="ConstraintType")
-@NamedQuery(name="ConstraintType.findAll", query="SELECT a FROM ConstraintType a")
+@Table(name = "ConstraintType")
+@NamedQuery(name = "ConstraintType.findAll", query = "SELECT a FROM ConstraintType a")
+@Getter
+@Setter
+@NoArgsConstructor
 public class ConstraintType implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -46,35 +54,37 @@ public class ConstraintType implements Serializable {
     public static final String REGEXP_TYPE = "Regular Expression";
 
     protected static final Map<String, String> defaults = new HashMap<>();
+
     static {
-        defaults.put(ENUMERATION_TYPE, "Enumerate a set of values that the attribute may be set to during policy creation.");
-        defaults.put(RANGE_TYPE, "Set a range of min and/or max integer/double values the attribute can be set to during policy creation.");
-        defaults.put(REGEXP_TYPE, "Define a regular expression the attribute must match against during policy creation.");
+        defaults.put(ENUMERATION_TYPE,
+                        "Enumerate a set of values that the attribute may be set to during policy creation.");
+        defaults.put(RANGE_TYPE, "Set a range of min and/or max integer/double values "
+                        + "the attribute can be set to during policy creation.");
+        defaults.put(REGEXP_TYPE,
+                        "Define a regular expression the attribute must match against during policy creation.");
     }
-    private static final String[] RANGE_TYPES = {"minExclusive", "minInclusive", "maxExclusive", "maxInclusive"};
+
+    private static final String[] RANGE_TYPES =
+        { "minExclusive", "minInclusive", "maxExclusive", "maxInclusive" };
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    @Column(name="constraint_type", nullable=false, length=64)
-    private String constraintType;
+    @Column(name = "constraint_type", nullable = false, length = 64)
+    private String theConstraintType;
 
-    @Column(name="description", nullable=false, length=255)
+    @Column(name = "description", nullable = false, length = 255)
     private String description;
 
-    //bi-directional many-to-one association to Attribute
-    @OneToMany(mappedBy="constraintType")
+    // bi-directional many-to-one association to Attribute
+    @OneToMany(mappedBy = "constraintType")
     private Set<Attribute> attributes = new HashSet<>();
 
-    public ConstraintType() {
-        //An empty constructor
-    }
-
     public ConstraintType(String constraintType) {
         this();
-        this.constraintType = constraintType;
+        this.theConstraintType = constraintType;
     }
 
     public ConstraintType(String constraintType, String description) {
@@ -82,40 +92,15 @@ public class ConstraintType implements Serializable {
         this.description = description;
     }
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
+    public static String[] getRangeTypes() {
+        return RANGE_TYPES;
     }
 
     public String getConstraintType() {
-        return constraintType;
+        return theConstraintType;
     }
 
-    public void setConstraintType(String constraintType) {
-        this.constraintType = constraintType;
+    public void setConstraintType(final String theConstraintType) {
+        this.theConstraintType = theConstraintType;
     }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Set<Attribute> getAttributes() {
-        return attributes;
-    }
-
-    public void setAttributes(Set<Attribute> attributes) {
-        this.attributes = attributes;
-    }
-
-    public static String[] getRangeTypes() {
-        return RANGE_TYPES;
-    }
-
 }