From 2ceb5596c6491a1a6f3a2c187afeb89329abb078 Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Mon, 9 Mar 2020 14:53:43 +0100 Subject: Fix sonar issue. Issue-ID: AAF-996 Signed-off-by: Tomasz Wrobel Change-Id: Iecac5c31b7c7177abe3ef7e598d8cec3262c8d34 --- .../src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java | 2 +- .../org/onap/aaf/certservice/client/configuration/EnvsForClient.java | 3 --- .../org/onap/aaf/certservice/client/configuration/EnvsForCsr.java | 2 -- .../certservice/client/configuration/model/ClientConfiguration.java | 4 ++-- .../client/httpclient/exception/CertServiceApiResponseException.java | 2 +- .../certservice/client/httpclient/exception/HttpClientException.java | 2 +- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java index 3e33a48b..e29142e8 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java @@ -25,7 +25,7 @@ public class AppExitHandler { public static final Logger LOGGER = LoggerFactory.getLogger(AppExitHandler.class); public void exit(int exitCode) { - LOGGER.debug("Application exits with following exit code: " + exitCode); + LOGGER.debug("Application exits with following exit code: {}", exitCode); System.exit(exitCode); } } \ No newline at end of file diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java index 1ce76370..59fd5efc 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java @@ -24,9 +24,6 @@ import java.util.Optional; public class EnvsForClient { private final EnvProvider envProvider = new EnvProvider(); - public EnvsForClient() { - } - public Optional getUrlToCertService() { return readEnv(ClientConfigurationEnvs.REQUEST_URL); } diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java index 77efc198..5a1d33bd 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java @@ -24,8 +24,6 @@ import java.util.Optional; public class EnvsForCsr { private final EnvProvider envProvider = new EnvProvider(); - public EnvsForCsr() {} - public Optional getCommonName() { return readEnv(CsrConfigurationEnvs.COMMON_NAME); } diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java index d6496b7a..58d3f6b1 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java @@ -22,8 +22,8 @@ package org.onap.aaf.certservice.client.configuration.model; public class ClientConfiguration implements ConfigurationModel { - Integer DEFAULT_TIMEOUT_MS = 30000; - String DEFAULT_REQUEST_URL = "http://cert-service:8080/v1/certificate/"; + private static final Integer DEFAULT_TIMEOUT_MS = 30000; + private static final String DEFAULT_REQUEST_URL = "http://cert-service:8080/v1/certificate/"; private String urlToCertService; private Integer requestTimeout; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java index 40470af3..7286318f 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java @@ -24,7 +24,7 @@ import org.onap.aaf.certservice.client.api.ExitCode; import org.onap.aaf.certservice.client.api.ExitableException; public class CertServiceApiResponseException extends ExitableException { - private final ExitCode EXIT_CODE = ExitCode.CERT_SERVICE_API_CONNECTION_EXCEPTION; + private static final ExitCode EXIT_CODE = ExitCode.CERT_SERVICE_API_CONNECTION_EXCEPTION; public CertServiceApiResponseException(String url, int responseCode, String messageFromAPI) { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java index d6fb1461..28f83073 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java @@ -24,7 +24,7 @@ import org.onap.aaf.certservice.client.api.ExitCode; import org.onap.aaf.certservice.client.api.ExitableException; public class HttpClientException extends ExitableException { - private final ExitCode EXIT_CODE = ExitCode.HTTP_CLIENT_EXCEPTION; + private static final ExitCode EXIT_CODE = ExitCode.HTTP_CLIENT_EXCEPTION; public HttpClientException(Throwable e) { super(e); -- cgit 1.2.3-korg