1 files changed, 50 insertions, 24 deletions

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..1c6d811e1 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,14 @@
  * ============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.
  * ================================================================================
  * 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,10 +17,10 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -28,58 +28,75 @@ 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
  */
 
 
 @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")})
+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)
+    @Column(name = "ref_attributes", nullable = false, length = 255)
     private String ref_attributes;
 
-    @Column (name="sub_attributes", nullable=false, length=2000)
+    @Column(name = "sub_attributes", nullable = false, length = 2000)
     private String sub_attributes;
 
-    @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;
 
+    @Column(name = "decisionModel", nullable = true)
+    private Boolean decisionModel = false;
+
+    @Column(name = "ruleFormation", nullable = true)
+    private String ruleFormation;
+
+    public String getRuleFormation() {
+        return ruleFormation;
+    }
+
+    public void setRuleFormation(String ruleFormation) {
+        this.ruleFormation = ruleFormation;
+    }
+
     public String getSub_attributes() {
         return sub_attributes;
     }
@@ -105,7 +122,7 @@ public class MicroServiceModels implements Serializable{
     }
 
     @ManyToOne
-    @JoinColumn(name="imported_by")
+    @JoinColumn(name = "imported_by")
     private UserInfo userCreatedBy;
 
     public UserInfo getUserCreatedBy() {
@@ -156,11 +173,11 @@ public class MicroServiceModels implements Serializable{
         this.dependency = dependency;
     }
 
-    public String getModelName(){
+    public String getModelName() {
         return this.modelName;
     }
 
-    public void setModelName(String modelName){
+    public void setModelName(String modelName) {
         this.modelName = modelName;
     }
 
@@ -179,4 +196,13 @@ public class MicroServiceModels implements Serializable{
     public void setAnnotation(String annotation) {
         this.annotation = annotation;
     }
-}
\ No newline at end of file
+
+    public Boolean isDecisionModel() {
+        return decisionModel;
+    }
+
+    public void setDecisionModel(boolean decisionModel) {
+        this.decisionModel = decisionModel;
+    }
+}
+