Rework the Clamp db model

[clamp.git] / src / main / java / org / onap / clamp / clds / model / CldsEvent.java

diff --git a/src/main/java/org/onap/clamp/clds/model/CldsEvent.java b/src/main/java/org/onap/clamp/clds/model/CldsEvent.java
index 8379e50..3b9c1d2 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/CldsEvent.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsEvent.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2017 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. 
+ * 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. 
- * See the License for the specific language governing permissions and 
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
@@ -29,29 +29,34 @@ import org.onap.clamp.clds.dao.CldsDao;
  * Represent a CLDS Event.
  */
 public class CldsEvent {
-    public static final String ACTION_CREATE = "CREATE";
-    public static final String ACTION_SUBMIT = "SUBMIT";
-    public static final String ACTION_RESUBMIT = "RESUBMIT"; // an update before model is active
-    public static final String ACTION_DISTRIBUTE = "DISTRIBUTE"; // only from dcae
-    public static final String ACTION_DEPLOY = "DEPLOY"; // only from dcae
-    public static final String ACTION_UNDEPLOY = "UNDEPLOY"; // only from dcae
-    public static final String ACTION_UPDATE = "UPDATE";
-    public static final String ACTION_DELETE = "DELETE";
-    public static final String ACTION_STOP = "STOP";
-    public static final String ACTION_RESTART = "RESTART";
+    public static final String ACTION_TEST            = "TEST";
+    public static final String ACTION_CREATE          = "CREATE";
+    public static final String ACTION_SUBMIT          = "SUBMIT";
+    // an update before model is active
+    public static final String ACTION_RESUBMIT        = "RESUBMIT";
+    // only from dcae
+    public static final String ACTION_DISTRIBUTE      = "DISTRIBUTE";
+    // only from dcae
+    public static final String ACTION_DEPLOY          = "DEPLOY";
+    // only from dcae
+    public static final String ACTION_UNDEPLOY        = "UNDEPLOY";
+    public static final String ACTION_UPDATE          = "UPDATE";
+    public static final String ACTION_DELETE          = "DELETE";
+    public static final String ACTION_STOP            = "STOP";
+    public static final String ACTION_RESTART         = "RESTART";
 
     public static final String ACTION_STATE_INITIATED = "INITIATED";
-    public static final String ACTION_STATE_SENT = "SENT";
+    public static final String ACTION_STATE_SENT      = "SENT";
     public static final String ACTION_STATE_COMPLETED = "COMPLETED";
-    public static final String ACTION_STATE_RECEIVED = "RECEIVED";
-    public static final String ACTION_STATE_ERROR = "ERROR";
-    public static final String ACTION_STATE_ANY = null;
+    public static final String ACTION_STATE_RECEIVED  = "RECEIVED";
+    public static final String ACTION_STATE_ERROR     = "ERROR";
+    public static final String ACTION_STATE_ANY       = null;
 
-    private String id;
-    private String actionCd;
-    private String actionStateCd;
-    private String processInstanceId;
-    private String userid;
+    private String             id;
+    private String             actionCd;
+    private String             actionStateCd;
+    private String             processInstanceId;
+    private String             userid;
 
     public String getId() {
         return id;
@@ -70,14 +75,16 @@ public class CldsEvent {
      * @param processInstanceId
      * @return
      */
-    public static CldsEvent insEvent(CldsDao cldsDao, String controlName, String userid, String actionCd, String actionStateCd, String processInstanceId) {
+    public static CldsEvent insEvent(CldsDao cldsDao, String controlName, String userid, String actionCd,
+            String actionStateCd, String processInstanceId) {
         CldsModel model = CldsModel.createUsingControlName(controlName);
-        return insEvent(cldsDao, model, actionCd, actionStateCd, processInstanceId);
+        return insEvent(cldsDao, model, userid, actionCd, actionStateCd, processInstanceId);
     }
 
     /**
-     * Insert event using controlNameUuid to find the model.
-     * This method meant for processing events from dcae.
+     * Insert event using controlNameUuid to find the model. This method meant
+     * for processing events from dcae.
+     * 
      * @param cldsDao
      * @param model
      * @param actionCd
@@ -85,8 +92,10 @@ public class CldsEvent {
      * @param processInstanceId
      * @return
      */
-    public static CldsEvent insEvent(CldsDao cldsDao, CldsModel model, String actionCd, String actionStateCd, String processInstanceId) {
+    public static CldsEvent insEvent(CldsDao cldsDao, CldsModel model, String userId, String actionCd, String actionStateCd,
+            String processInstanceId) {
         CldsEvent event = new CldsEvent();
+        event.setUserid(userId);
         event.setActionCd(actionCd);
         event.setActionStateCd(actionStateCd);
         event.setProcessInstanceId(processInstanceId);
@@ -95,9 +104,23 @@ public class CldsEvent {
     }
 
     /**
-     * Check if actionCd  and actionStateCd are equal to the supplied checkActionCd and checkActionStateCd.
-     * Treat checkActionStateCd == null as a wildcard
-     * checkActionCd should not be null.
+     * Check if actionCd is equal to the supplied checkActionCd checkActionCd
+     * should not be null.
+     * 
+     * @param checkActionCd
+     * @return
+     */
+    public boolean isActionCd(String checkActionCd) {
+        if (actionCd == null) {
+            return false;
+        }
+        return actionCd.equals(checkActionCd);
+    }
+
+    /**
+     * Check if actionCd and actionStateCd are equal to the supplied
+     * checkActionCd and checkActionStateCd. Treat checkActionStateCd == null as
+     * a wildcard checkActionCd should not be null.
      *
      * @param checkActionCd
      * @param checkActionStateCd
@@ -107,7 +130,8 @@ public class CldsEvent {
         if (actionCd == null) {
             return false;
         }
-        // treat checkActionStateCd == null as a wildcard (same for actionStateCd, although it shouln't be null...)
+        // treat checkActionStateCd == null as a wildcard (same for
+        // actionStateCd, although it shouln't be null...)
         if (checkActionStateCd == null || actionStateCd == null) {
             return actionCd.equals(checkActionCd);
         }
@@ -133,7 +157,8 @@ public class CldsEvent {
     }
 
     /**
-     * @param actionCd the actionCd to set
+     * @param actionCd
+     *            the actionCd to set
      */
     public void setActionCd(String actionCd) {
         this.actionCd = actionCd;
@@ -147,7 +172,8 @@ public class CldsEvent {
     }
 
     /**
-     * @param actionStateCd the actionStateCd to set
+     * @param actionStateCd
+     *            the actionStateCd to set
      */
     public void setActionStateCd(String actionStateCd) {
         this.actionStateCd = actionStateCd;
@@ -161,7 +187,8 @@ public class CldsEvent {
     }
 
     /**
-     * @param processInstanceId the processInstanceId to set
+     * @param processInstanceId
+     *            the processInstanceId to set
      */
     public void setProcessInstanceId(String processInstanceId) {
         this.processInstanceId = processInstanceId;
@@ -175,7 +202,8 @@ public class CldsEvent {
     }
 
     /**
-     * @param userid the userid to set
+     * @param userid
+     *            the userid to set
      */
     public void setUserid(String userid) {
         this.userid = userid;