Push variuos changes

- Spring Boot
- Cadi
- Cassandra Locking

Change-Id: Ie9882f81f0ca141bdb7862cdabf978481fcd7c4a
Issue-ID: MUSIC-296,MUSIC-272
Signed-off-by: Nelson,Thomas(tn1381)(arthurdent3) <tn1381@att.com>

3 files changed, 55 insertions, 44 deletions

diff --git a/docs/delivery.rst b/docs/delivery.rst
index f3f083a7..c90ff818 100644
--- a/docs/delivery.rst
+++ b/docs/delivery.rst
@@ -27,17 +27,17 @@ Example use of a block diagram.
    m -> y;
    m -> z;
    group l1 {
-	color = blue;
-	x; y; z;
-	}
+    color = blue;
+    x; y; z;
+    }
    group l2 {
-	color = yellow;
-	m; n; 
-	}
+    color = yellow;
+    m; n; 
+    }
    group l3 {
-	color = orange;
-	a; b; c;
-	}
+    color = orange;
+    a; b; c;
+    }
 
    }
 
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d764cedd..68fd3207 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -24,17 +24,17 @@ Version: 3.0.24
 
 **Bug Fixes**
 
-	- `MUSIC-176 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-176>`_ nc: bad address
+    - `MUSIC-176 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-176>`_ nc: bad address
 
-	- `MUSIC-154 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-154>`_ Helm charts using latest tag name
+    - `MUSIC-154 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-154>`_ Helm charts using latest tag name
 
-	- `MUSIC-152 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-152>`_ MUSIC tomcat returning HTTP 401
+    - `MUSIC-152 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-152>`_ MUSIC tomcat returning HTTP 401
 
-	- `MUSIC-147 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-147>`_ Cassandra-job is failing
+    - `MUSIC-147 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-147>`_ Cassandra-job is failing
 
-	- `MUSIC-143 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-143>`_ Translator Service not picking records from controller
+    - `MUSIC-143 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-143>`_ Translator Service not picking records from controller
 
-	- `MUSIC-78 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-78>`_ Build failed to find artifact org.onap.music:MUSIC:jar:2.5.5
+    - `MUSIC-78 <https://jira.onap.org/projects/MUSIC/issues/MUSIC-78>`_ Build failed to find artifact org.onap.music:MUSIC:jar:2.5.5
 
 
 
@@ -55,15 +55,15 @@ Quick Links:
 
 **Upgrade Notes**
 
-	N/A
+    N/A
 
 **Deprecation Notes**
 
-	N/A
+    N/A
 
 **Other**
 
-	N/A
+    N/A
 
 ===========
 
diff --git a/docs/swagger.json b/docs/swagger.json
index 27db769f..534d2af4 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -875,26 +875,43 @@
         }
       }
     },
-    "/v{version}/service/pingCassandra/{consistency}": {
+    "/v{version}/service/pingZookeeper": {
       "get": {
         "tags": [
           "Healthcheck Api"
         ],
         "summary": "Get Health Status",
         "description": "",
-        "operationId": "cassandraStatus",
+        "operationId": "ZKStatus",
         "produces": [
           "application/json"
         ],
-        "parameters": [
-          {
-            "name": "consistency",
-            "in": "path",
-            "description": "Consistency level",
-            "required": true,
-            "type": "string"
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object"
+              }
+            }
           }
+        }
+      }
+    },
+    "/v{version}/service/musicHealthCheck": {
+      "get": {
+        "tags": [
+          "Healthcheck Api"
         ],
+        "summary": "Get Health Status",
+        "description": "",
+        "operationId": "musicHealthCheck",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [],
         "responses": {
           "200": {
             "description": "successful operation",
@@ -908,18 +925,26 @@
         }
       }
     },
-    "/v{version}/service/pingZookeeper": {
+    "/v{version}/service/pingCassandra/{consistency}": {
       "get": {
         "tags": [
           "Healthcheck Api"
         ],
         "summary": "Get Health Status",
         "description": "",
-        "operationId": "ZKStatus",
+        "operationId": "cassandraStatus",
         "produces": [
           "application/json"
         ],
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "consistency",
+            "in": "path",
+            "description": "Consistency level",
+            "required": true,
+            "type": "string"
+          }
+        ],
         "responses": {
           "200": {
             "description": "successful operation",
@@ -1269,20 +1294,6 @@
             "description": "Application namespace",
             "required": true,
             "type": "string"
-          },
-          {
-            "name": "userId",
-            "in": "header",
-            "description": "userId",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "password",
-            "in": "header",
-            "description": "Password",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {