Add protocols to hosts

Add default protocols for Consul hosts

Add controller for healt check

Fix for merging properties from file and Consul

Change-Id: Ifa8c7cdfa333d8ffee175b5eb4446f0c3a986f27
Issue-ID: DCAEGEN2-747
Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>

1 files changed, 36 insertions, 0 deletions

diff --git a/src/main/java/org/onap/dcae/restapi/HealthCheckController.java b/src/main/java/org/onap/dcae/restapi/HealthCheckController.java
new file mode 100644
index 00000000..9c65619c
--- /dev/null
+++ b/src/main/java/org/onap/dcae/restapi/HealthCheckController.java
@@ -0,0 +1,36 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved.s
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae.restapi;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+
+@Controller
+public class HealthCheckController {
+
+    @GetMapping("/healthcheck")
+    public String healthCheck() {
+        return "hello";
+    }
+
+}