diff options
Diffstat (limited to 'certService/src/main')
4 files changed, 60 insertions, 7 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java b/certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java new file mode 100644 index 00000000..e33bf512 --- /dev/null +++ b/certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java @@ -0,0 +1,48 @@ +/* + * ============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.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ReadinessController { + + private final CmpServersConfig cmpServersConfig; + + @Autowired + public ReadinessController(CmpServersConfig cmpServersConfig) { + this.cmpServersConfig = cmpServersConfig; + } + + @GetMapping("/ready") + public ResponseEntity<String> checkReady() { + if (cmpServersConfig.isReady()) { + return new ResponseEntity<>(HttpStatus.OK); + } else { + return new ResponseEntity<>(HttpStatus.SERVICE_UNAVAILABLE); + } + } +} diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java b/certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java index 9ce65e6a..501ed6d0 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java +++ b/certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java @@ -83,7 +83,6 @@ public class CsrModelFactory { public Optional<String> asString() { try { String decodedString = new String(decoder.decode(value)); - LOGGER.debug("Decoded string: {}", decodedString); return Optional.of(decodedString); } catch(RuntimeException e) { LOGGER.error("Exception occurred during decoding:", e); diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java b/certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java index c2293d2d..1eb5270f 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java +++ b/certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java @@ -39,7 +39,6 @@ public class PemObjectFactory { try (StringReader stringReader = new StringReader(pem); PemReader pemReader = new PemReader(stringReader)) { - LOGGER.debug("Creating pem object from: {}", pem); return Optional.ofNullable(pemReader.readPemObject()); } catch (DecoderException | IOException e) { LOGGER.error("Exception occurred during creation of PEM:", e); diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java index a304b5a6..cea228c1 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java +++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java @@ -35,15 +35,16 @@ import org.springframework.context.annotation.Configuration; public class CmpServersConfig { private static final Logger LOGGER = LoggerFactory.getLogger(CmpServersConfig.class); + private static final String INIT_CONFIGURATION = "Loading initial configuration"; + private static final String RELOADING_CONFIGURATION = "Reloading configuration"; private static final String LOADING_SUCCESS_MESSAGE = "CMP Servers configuration successfully loaded from file {}"; private static final String CMP_SERVERS_CONFIG_FILENAME = "cmpServers.json"; - private static final String INIT_CONFIGURATION = "Loading initial configuration"; - private static final String REFRESHING_CONFIGURATION = "Refreshing configuration"; private final String configPath; private final CmpServersConfigLoader cmpServersConfigLoader; private List<Cmpv2Server> cmpServers; + private volatile boolean isReady; @Autowired public CmpServersConfig(@Value("${app.config.path}") String configPath, @@ -54,8 +55,8 @@ public class CmpServersConfig { @PostConstruct void init() { - LOGGER.info(INIT_CONFIGURATION); try { + LOGGER.info(INIT_CONFIGURATION); loadConfiguration(); } catch (CmpServersConfigLoadingException e) { LOGGER.error(e.getMessage(), e.getCause()); @@ -63,18 +64,24 @@ public class CmpServersConfig { } public void reloadConfiguration() throws CmpServersConfigLoadingException { - LOGGER.info(REFRESHING_CONFIGURATION); + LOGGER.info(RELOADING_CONFIGURATION); loadConfiguration(); } - void loadConfiguration() throws CmpServersConfigLoadingException { + + synchronized void loadConfiguration() throws CmpServersConfigLoadingException { + isReady = false; String configFilePath = configPath + File.separator + CMP_SERVERS_CONFIG_FILENAME; this.cmpServers = Collections.unmodifiableList(cmpServersConfigLoader.load(configFilePath)); LOGGER.info(LOADING_SUCCESS_MESSAGE, configFilePath); + isReady = true; } public List<Cmpv2Server> getCmpServers() { return cmpServers; } + public boolean isReady() { + return isReady; + } } |