various Updates

Q-api,
triggers,
conductor conditional updates.
Bug fixes

Change-Id: Iec392309787cd90f0a2827a2955399723640e800
Issue-ID: MUSIC-93
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>

3 files changed, 27 insertions, 16 deletions

diff --git a/src/main/java/org/onap/music/lockingservice/MusicLockState.java b/src/main/java/org/onap/music/lockingservice/MusicLockState.java
index 448a36e5..6c31410f 100644
--- a/src/main/java/org/onap/music/lockingservice/MusicLockState.java
+++ b/src/main/java/org/onap/music/lockingservice/MusicLockState.java
@@ -134,11 +134,4 @@ public class MusicLockState implements Serializable {
         }
         return (MusicLockState) o;
     }
-    
-    @Override
-	public String toString() {
-		// TODO Auto-generated method stub
-		return "lockStatus:"+ (lockStatus == null ? null : lockStatus.toString())+" |needToSyncQuorum:"+needToSyncQuorum+" |lockHolder:"+lockHolder
-				+" |leasePeriod:"+leasePeriod+" |leaseStartTime:"+leaseStartTime;
-	}
 }
diff --git a/src/main/java/org/onap/music/lockingservice/MusicLockingService.java b/src/main/java/org/onap/music/lockingservice/MusicLockingService.java
index d0c33000..ae026903 100644
--- a/src/main/java/org/onap/music/lockingservice/MusicLockingService.java
+++ b/src/main/java/org/onap/music/lockingservice/MusicLockingService.java
@@ -19,8 +19,6 @@ package org.onap.music.lockingservice;
 
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.StringTokenizer;
 import java.util.concurrent.CountDownLatch;
 
@@ -99,12 +97,7 @@ public class MusicLockingService implements Watcher {
         try{
         	data = zkLockHandle.getNodeData(lockName);
         }catch (Exception ex){
-        	StringWriter sw = new StringWriter();
-			ex.printStackTrace();
-			ex.printStackTrace(new PrintWriter(sw));
-			String exceptionAsString = sw.toString();
-			logger.error(EELFLoggerDelegate.errorLogger,exceptionAsString);
-        	throw new  MusicLockingException(exceptionAsString);
+        	logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),AppMessages.UNKNOWNERROR, ErrorSeverity.ERROR, ErrorTypes.LOCKINGERROR);
         }
         if(data !=null)
         return MusicLockState.deSerialize(data);
diff --git a/src/main/java/org/onap/music/lockingservice/ZkStatelessLockService.java b/src/main/java/org/onap/music/lockingservice/ZkStatelessLockService.java
index e99df255..38c873af 100644
--- a/src/main/java/org/onap/music/lockingservice/ZkStatelessLockService.java
+++ b/src/main/java/org/onap/music/lockingservice/ZkStatelessLockService.java
@@ -28,10 +28,15 @@ import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.eelf.logging.EELFLoggerDelegate;
 import org.onap.music.eelf.logging.format.AppMessages;
 import org.onap.music.eelf.logging.format.ErrorSeverity;
 import org.onap.music.eelf.logging.format.ErrorTypes;
+import org.onap.music.main.MusicCore;
+import org.onap.music.main.MusicUtil;
+
+import com.datastax.driver.core.DataType;
 
 /**
  * A <a href="package.html">protocol to implement an exclusive write lock or to elect a leader</a>.
@@ -288,8 +293,28 @@ public class ZkStatelessLockService extends ProtocolSupport {
                     if (logger.isDebugEnabled()) {
                     	logger.debug(EELFLoggerDelegate.debugLogger, "Created id: " + id);
                     }
-                    if (id != null)
+                    if (id != null) {
+                        Stat stat = null;
+                        try {
+                            stat = zookeeper.exists(id, false);
+                        } catch (KeeperException | InterruptedException e1) {
+                            e1.printStackTrace();
+                        }
+                        Long ctime = stat.getCtime();
+                        System.out.println("Created id ....####"+ctime+"##.......id...:"+id);
+                        MusicUtil.zkNodeMap.put(id, ctime);
+                        PreparedQueryObject pQuery = new PreparedQueryObject();
+                        pQuery.appendQueryString(
+                                        "INSERT INTO admin.locks(lock_id, ctime) VALUES (?,?)");
+                        try {
+                            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), id));
+                            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), ctime));
+                            MusicCore.eventualPut(pQuery);
+                        } catch (Exception e) {
+                               e.printStackTrace();
+                        }
                         break;
+                   }
                 }
                 if (id != null) {
                     List<String> names = zookeeper.getChildren(dir, false);