From ffa2b75513bac0ac7aa39bdb6d0b77f751735c5e Mon Sep 17 00:00:00 2001 From: kjaniak Date: Wed, 17 Jun 2020 09:31:08 +0200 Subject: Move ArtifcatsCreationProvider one level higher Code style cleanup (warnings from checkstyle). Issue-ID: AAF-1152 Signed-off-by: kjaniak Change-Id: I0a8bbd998cd6aed4cf818ffe10c7fbffe99e9d22 --- .../onap/aaf/certservice/client/configuration/EnvProvider.java | 1 + .../aaf/certservice/client/configuration/EnvsForClient.java | 1 + .../onap/aaf/certservice/client/configuration/EnvsForCsr.java | 1 + .../configuration/exception/ClientConfigurationException.java | 1 + .../configuration/exception/CsrConfigurationException.java | 1 + .../configuration/factory/AbstractConfigurationFactory.java | 10 +++++----- 6 files changed, 10 insertions(+), 5 deletions(-) (limited to 'certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration') diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java index 1b8c3606..15339bbd 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaf.certservice.client.configuration; import java.util.Optional; 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 dedd4d6b..9321964c 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 @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaf.certservice.client.configuration; import java.util.Optional; 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 06225d68..9a892b24 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 @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaf.certservice.client.configuration; import java.util.Optional; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java index f9360d73..ea280736 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaf.certservice.client.configuration.exception; import org.onap.aaf.certservice.client.api.ExitStatus; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java index a7cf4f7a..cf785a71 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaf.certservice.client.configuration.exception; import org.onap.aaf.certservice.client.api.ExitStatus; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java index a54c9263..24ed8b0d 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java @@ -21,7 +21,7 @@ package org.onap.aaf.certservice.client.configuration.factory; -import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreatorProvider; +import org.onap.aaf.certservice.client.certification.ArtifactsCreatorProvider; import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException; import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException; import org.onap.aaf.certservice.client.configuration.model.ConfigurationModel; @@ -43,10 +43,10 @@ public abstract class AbstractConfigurationFactory } public boolean isCommonNameValid(String commonName) { - return !isSpecialCharsPresent(commonName) && - !isHttpProtocolsPresent(commonName) && - !isIpAddressPresent(commonName) && - !isPortNumberPresent(commonName); + return !isSpecialCharsPresent(commonName) + && !isHttpProtocolsPresent(commonName) + && !isIpAddressPresent(commonName) + && !isPortNumberPresent(commonName); } public boolean isSpecialCharsPresent(String stringToCheck) { -- cgit 1.2.3-korg