Fix reload endpoint to return status

Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com>
Issue-ID: AAF-997
wChange-Id: I4563428ef407b4dc8c84c3efc8ec213145806b32
Change-Id: Iee33a26feb5cc1acd39d91ee9f34a49183040e06

2 files changed, 61 insertions, 4 deletions

diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/CertificationService.java b/certService/src/main/java/org/onap/aaf/certservice/api/CertificationController.java
index 945fc6d1..e663909c 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/api/CertificationService.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/api/CertificationController.java
@@ -39,15 +39,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
-public class CertificationService {
+public class CertificationController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CertificationService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CertificationController.class);
 
     private final CsrModelFactory csrModelFactory;
     private final CertificationModelFactory certificationModelFactory;
 
     @Autowired
-    CertificationService(CsrModelFactory csrModelFactory, CertificationModelFactory certificationModelFactory) {
+    CertificationController(CsrModelFactory csrModelFactory, CertificationModelFactory certificationModelFactory) {
         this.csrModelFactory = csrModelFactory;
         this.certificationModelFactory = certificationModelFactory;
     }
@@ -81,5 +81,4 @@ public class CertificationService {
 
     }
 
-
 }
diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java b/certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java
new file mode 100644
index 00000000..5390a00c
--- /dev/null
+++ b/certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java
@@ -0,0 +1,58 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2020 Nokia. 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.
+ * 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.aaf.certservice.api;
+
+import org.onap.aaf.certservice.certification.configuration.CmpServersConfig;
+import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ReloadConfigController {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReloadConfigController.class);
+
+    private final CmpServersConfig cmpServersConfig;
+
+    @Autowired
+    public ReloadConfigController(CmpServersConfig cmpServersConfig) {
+        this.cmpServersConfig = cmpServersConfig;
+    }
+
+    @GetMapping("/reload")
+    public ResponseEntity<String> reloadConfiguration() throws CmpServersConfigLoadingException {
+        cmpServersConfig.reloadConfiguration();
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @ExceptionHandler(value = CmpServersConfigLoadingException.class)
+    public ResponseEntity<String> handle(CmpServersConfigLoadingException exception) {
+        LOGGER.error(exception.getMessage(), exception.getCause());
+        return new ResponseEntity<>(exception.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+}