From 569eaa5163b07d153c9b76195ecfd586bc84d7a7 Mon Sep 17 00:00:00 2001
From: Oleg Mitsura <oleg.mitsura@amdocs.com>
Date: Mon, 15 Apr 2019 14:56:44 -0400
Subject: Added health-check feature for SDC-Listener that will be neede by
 Liveness probe inside HELM chart.

Issue-ID: CCSDK-1144

Change-Id: Ie6465a794a9c34136008892d141fe4662e41f6d7
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
---
 ms/cds-sdc-listener/application/pom.xml            |  8 ++++-
 .../cds/cdssdclistener/controller/HealthCheck.java | 35 ++++++++++++++++++++++
 .../application/src/main/resources/application.yml |  8 ++++-
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java

diff --git a/ms/cds-sdc-listener/application/pom.xml b/ms/cds-sdc-listener/application/pom.xml
index 537b1d6d2..657e3934e 100644
--- a/ms/cds-sdc-listener/application/pom.xml
+++ b/ms/cds-sdc-listener/application/pom.xml
@@ -80,9 +80,15 @@
     <dependency>
       <groupId>org.onap.ccsdk.cds.components</groupId>
       <artifactId>proto-definition</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
+      <version>3.2.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java b/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java
new file mode 100644
index 000000000..a1bb116bf
--- /dev/null
+++ b/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2019 Bell Canada
+ *
+ * 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
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.cds.cdssdclistener.controller;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/v1/sdclistener")
+public class HealthCheck {
+
+    @RequestMapping(path = "/healthcheck", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public @ResponseBody
+    Mono<String> ping() {
+        return Mono.just("{\"status\":\"UP\"}");
+    }
+}
diff --git a/ms/cds-sdc-listener/application/src/main/resources/application.yml b/ms/cds-sdc-listener/application/src/main/resources/application.yml
index cb1b54c96..0c2c60dca 100644
--- a/ms/cds-sdc-listener/application/src/main/resources/application.yml
+++ b/ms/cds-sdc-listener/application/src/main/resources/application.yml
@@ -18,4 +18,10 @@ listenerservice:
       grpcAddress: localhost
       grpcPort: 9111
       authHeader: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-
+#port needed by Liveness probe
+server:
+  port: 9000
+#set spring.main.web-environment=false if you want to NOT to open a port for healthcheck.
+#spring:
+#  main:
+#    web-environment: false
\ No newline at end of file
-- 
cgit 1.2.3-korg