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%2FMicroServiceModels.java;h=ccedd6b8b77e60d82acaeefc931482e6cb6401cb;hp=955e7ffda77672038f3c0ec4b138a16ac5b2fb97;hb=2f3ca9fc5edc5a52659b3486605e0db508143318;hpb=7a6c4f9214a71101db3354ed06ccd3cfd3cea65b

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
index 955e7ffda..ccedd6b8b 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
@@ -2,14 +2,15 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 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.
@@ -17,6 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
@@ -28,155 +30,83 @@ 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.OrderBy;
 import javax.persistence.Table;
 /*
- * JPA for the Micro Service Models. 
- * 
+ * JPA for the Micro Service Models.
+ *
  * @version: 0.1
  */
 
+import lombok.Getter;
+import lombok.Setter;
 
+// @formatter:off
 @Entity
-@Table(name="MicroServiceModels")
-@NamedQuery(name="MicroServiceModels.findAll", query="SELECT b FROM MicroServiceModels b ")
-public class MicroServiceModels implements Serializable{
+@Table(name = "MicroServiceModels")
+@NamedQueries(
+    {
+        @NamedQuery(name = "MicroServiceModels.findAll", query = "SELECT b FROM MicroServiceModels b "),
+        @NamedQuery(
+                        name = "MicroServiceModels.findAllDecision",
+                        query = "SELECT b FROM MicroServiceModels b WHERE b.decisionModel=1")
+    }
+)
+@Getter
+@Setter
+// @formatter:on
+public class MicroServiceModels implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    @Column(name="modelName", nullable=false, unique=true)
+    @Column(name = "modelName", nullable = false, unique = true)
     @OrderBy("asc")
     private String modelName;
 
-    @Column(name="description", nullable=true, length=2048)
+    @Column(name = "description", nullable = true, length = 2048)
     private String description;
 
-    @Column(name="dependency", nullable=true, length=2048)
+    @Column(name = "dependency", nullable = true, length = 2048)
     private String dependency;
 
-    @Column(name="attributes", nullable=false, length=255)
+    @Column(name = "attributes", nullable = false, length = 255)
     private String attributes;
 
-    @Column(name="ref_attributes", nullable=false, length=255)
-    private String ref_attributes;
+    @Column(name = "ref_attributes", nullable = false, length = 255)
+    private String refAttributes;
 
-    @Column (name="sub_attributes", nullable=false, length=2000)
-    private String sub_attributes;
+    @Column(name = "sub_attributes", nullable = false, length = 2000)
+    private String subAttributes;
 
-    @Column (name="dataOrderInfo", nullable=true, length=2000)
+    @Column(name = "dataOrderInfo", nullable = true, length = 2000)
     private String dataOrderInfo;
 
-    @Column (name="version", nullable=false, length=2000)
+    @Column(name = "version", nullable = false, length = 2000)
     private String version;
 
-    @Column (name="enumValues", nullable=false, length=2000)
+    @Column(name = "enumValues", nullable = false, length = 2000)
     private String enumValues;
 
-    @Column (name="annotation", nullable=false, length=2000)
+    @Column(name = "annotation", nullable = false, length = 2000)
     private String annotation;
 
-    public String getSub_attributes() {
-        return sub_attributes;
-    }
-
-    public void setSub_attributes(String sub_attributes) {
-        this.sub_attributes = sub_attributes;
-    }
-
-    public String getDataOrderInfo() {
-        return dataOrderInfo;
-    }
-
-    public void setDataOrderInfo(String dataOrderInfo) {
-        this.dataOrderInfo = dataOrderInfo;
-    }
-
-    public String getVersion() {
-        return version;
-    }
+    @Column(name = "decisionModel", nullable = true)
+    private Boolean decisionModel = false;
 
-    public void setVersion(String version) {
-        this.version = version;
-    }
+    @Column(name = "ruleFormation", nullable = true)
+    private String ruleFormation;
 
     @ManyToOne
-    @JoinColumn(name="imported_by")
+    @JoinColumn(name = "imported_by")
     private UserInfo userCreatedBy;
 
-    public UserInfo getUserCreatedBy() {
-        return userCreatedBy;
-    }
-
-    public void setUserCreatedBy(UserInfo userCreatedBy) {
-        this.userCreatedBy = userCreatedBy;
-    }
-
-    public String getAttributes() {
-        return attributes;
-    }
-
-    public void setAttributes(String attributes) {
-        this.attributes = attributes;
-    }
-
-    public String getRef_attributes() {
-        return ref_attributes;
-    }
-
-    public void setRef_attributes(String ref_attributes) {
-        this.ref_attributes = ref_attributes;
-    }
-
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDependency() {
-        return dependency;
-    }
-
-    public void setDependency(String dependency) {
-        this.dependency = dependency;
-    }
-
-    public String getModelName(){
-        return this.modelName;
-    }
-
-    public void setModelName(String modelName){
-        this.modelName = modelName;
-    }
-
-    public String getEnumValues() {
-        return enumValues;
-    }
-
-    public void setEnumValues(String enumValues) {
-        this.enumValues = enumValues;
-    }
-
-    public String getAnnotation() {
-        return annotation;
-    }
-
-    public void setAnnotation(String annotation) {
-        this.annotation = annotation;
+    public boolean isDecisionModel() {
+        return decisionModel;
     }
-}
\ No newline at end of file
+}