diff options
15 files changed, 27 insertions, 47 deletions
diff --git a/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java index 267a281b..2512458d 100644 --- a/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java @@ -31,29 +31,27 @@ import org.onap.oom.certservice.certification.configuration.CmpServersConfig; import org.springframework.http.HttpStatus; @ExtendWith(MockitoExtension.class) -public class ReadinessControllerTest { +class ReadinessControllerTest { @Mock private CmpServersConfig cmpServersConfig; @Test - public void shouldReturnStatusOkWhenConfigIsReady() { + void shouldReturnStatusOkWhenConfigIsReady() { // Given Mockito.when(cmpServersConfig.isReady()).thenReturn(true); // Then assertThat(new ReadinessController(cmpServersConfig).checkReady().getStatusCode()).isEqualTo(HttpStatus.OK); - ; } @Test - public void shouldReturnStatusServiceUnavailableWhenConfigIsNotReady() { + void shouldReturnStatusServiceUnavailableWhenConfigIsNotReady() { // Given Mockito.when(cmpServersConfig.isReady()).thenReturn(false); // Then assertThat(new ReadinessController(cmpServersConfig).checkReady().getStatusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE); - ; } } diff --git a/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java index e980aa2c..52ed99e7 100644 --- a/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java @@ -36,7 +36,7 @@ import java.security.PrivateKey; import static org.assertj.core.api.Assertions.assertThat; import static org.onap.oom.certservice.certification.TestUtils.createCsrModel; -public class X509CertificateBuilderTest { +class X509CertificateBuilderTest { private X509CertificateBuilder certificateBuilder; diff --git a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java index ade13f75..9212269c 100644 --- a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java @@ -99,7 +99,7 @@ class EnvsForCsrTest { } @Test - public void shouldReportThatSystemEnvOuVariableIsNotPresentWhenItWasNotDefined() { + void shouldReportThatSystemEnvOuVariableIsNotPresentWhenItWasNotDefined() { // when final Optional<String> testEnv = envsForCsr.getOrganizationUnit(); @@ -191,7 +191,7 @@ class EnvsForCsrTest { } @Test - public void shouldReportThatSystemEnvSansVariableIsNotPresentWhenItWasNotDefined() { + void shouldReportThatSystemEnvSansVariableIsNotPresentWhenItWasNotDefined() { // when final Optional<String> testEnv = envsForCsr.getSubjectAlternativesName(); diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java index 629397e4..3442621b 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java @@ -21,6 +21,8 @@ package org.onap.oom.certservice.postprocessor.api; public class CertificateConstants { + private CertificateConstants() { } + public static final String JKS_TYPE = "JKS"; public static final String PKCS12_TYPE = "PKCS12"; public static final String X_509_CERTIFICATE = "X.509"; diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java index 79e223c5..1e9ef8a9 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java @@ -29,7 +29,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; import org.onap.oom.certservice.postprocessor.configuration.path.env.EnvReader; -import org.onap.oom.certservice.postprocessor.configuration.exception.CertificatesPathsValidationException; import org.onap.oom.certservice.postprocessor.configuration.exception.ConfigurationException; import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration; import org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable; @@ -45,9 +44,7 @@ public class AppConfigurationProvider { this.pathsSplitter = pathsSplitter; } - public AppConfiguration createConfiguration() - throws ConfigurationException, CertificatesPathsValidationException { - + public AppConfiguration createConfiguration() { List<String> truststoresPaths = getPaths(TRUSTSTORES_PATHS); List<String> truststoresPasswordsPaths = getPaths(TRUSTSTORES_PASSWORDS_PATHS); List<String> sourceKeystorePaths = getPaths(KEYSTORE_SOURCE_PATHS); @@ -62,7 +59,7 @@ public class AppConfigurationProvider { destinationKeystorePaths); } - private List<String> getPaths(EnvVariable envVariable) throws ConfigurationException { + private List<String> getPaths(EnvVariable envVariable) { Optional<String> envValue = envReader.getEnv(envVariable.name()); isMandatoryEnvPresent(envVariable, envValue); return envValue.isPresent() ? pathsSplitter.getValidatedPaths(envVariable, envValue) : Collections.emptyList(); @@ -75,7 +72,7 @@ public class AppConfigurationProvider { } private void ensureSameSize(List<String> firstList, List<String> secondList, String firstListEnvName, - String secondListEnvName) throws ConfigurationException { + String secondListEnvName) { if (firstList.size() != secondList.size()) { throw new ConfigurationException( "Size of " + firstListEnvName diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java index 42028521..be49d39c 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java @@ -25,7 +25,6 @@ import static org.onap.oom.certservice.postprocessor.configuration.path.validati import java.util.List; import java.util.function.Predicate; -import org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions; public enum EnvVariable { TRUSTSTORES_PATHS(true, doesItContainValidCertificatesPaths()), diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java index eba59fd6..f5cea212 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java @@ -52,7 +52,7 @@ public class KeystoreCopier { } private void containsPaths(List<String> sources) { - if (sources.size() == 0) { + if (sources.isEmpty()) { LOGGER.info("No Keystore files to copy"); } } diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java index 59800b13..9e30bd44 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java @@ -21,10 +21,6 @@ package org.onap.oom.certservice.postprocessor.merger; import java.util.ArrayList; import java.util.List; -import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException; -import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException; -import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException; -import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException; import org.onap.oom.certservice.postprocessor.merger.model.Truststore; import org.onap.oom.certservice.postprocessor.merger.model.TruststoreFactory; @@ -35,8 +31,7 @@ public class TruststoreFilesProvider { } public static List<Truststore> getTruststoreFiles(List<String> truststoreFilePaths, - List<String> truststoreFilePasswordPaths) - throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException { + List<String> truststoreFilePasswordPaths) { List<Truststore> truststoreFiles = new ArrayList<>(); for (int i = 0; i < truststoreFilePaths.size(); i++) { String truststorePath = truststoreFilePaths.get(i); diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java index 9bc3dd82..3cf60da1 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java @@ -20,7 +20,6 @@ package org.onap.oom.certservice.postprocessor.merger; import java.util.List; -import org.onap.oom.certservice.postprocessor.api.ExitableException; import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration; import org.onap.oom.certservice.postprocessor.merger.model.Truststore; import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias; @@ -30,7 +29,7 @@ public class TruststoreMerger { private static final int FIRST_TRUSTSTORE_INDEX = 0; private static final int SECOND_TRUSTSTORE_INDEX = 1; - public void mergeTruststores(AppConfiguration configuration) throws ExitableException { + public void mergeTruststores(AppConfiguration configuration) { List<Truststore> truststoreFilesList = getTruststoreFiles(configuration); Truststore baseFile = truststoreFilesList.get(FIRST_TRUSTSTORE_INDEX); @@ -45,7 +44,7 @@ public class TruststoreMerger { baseFile.saveFile(); } - private List<Truststore> getTruststoreFiles(AppConfiguration configuration) throws ExitableException { + private List<Truststore> getTruststoreFiles(AppConfiguration configuration) { return TruststoreFilesProvider .getTruststoreFiles( configuration.getTruststoreFilePaths(), diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java index c36510c6..4740d0f6 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java @@ -23,8 +23,6 @@ import java.io.File; import java.security.KeyStore; import java.security.KeyStoreException; import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException; -import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException; -import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException; import org.onap.oom.certservice.postprocessor.common.PasswordReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,8 +34,7 @@ public class JavaTruststoreFactory { private JavaTruststoreFactory() { } - public static Truststore create(File certFile, String truststorePasswordPath, String keystoreType) - throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException { + public static Truststore create(File certFile, String truststorePasswordPath, String keystoreType) { String password = PasswordReader.readPassword(new File(truststorePasswordPath)); try { return JavaTruststore diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java index 51722d0e..058613a9 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java @@ -21,8 +21,6 @@ package org.onap.oom.certservice.postprocessor.merger.model; import java.io.File; import java.util.List; -import org.onap.oom.certservice.postprocessor.merger.exception.CreateBackupException; -import org.onap.oom.certservice.postprocessor.api.ExitableException; import org.onap.oom.certservice.postprocessor.common.FileTools; import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias; @@ -37,13 +35,13 @@ public abstract class Truststore { this.fileTools = fileTools; } - public void createBackup() throws CreateBackupException { + public void createBackup() { fileTools.createBackup(storeFile); } - public abstract List<CertificateWithAlias> getCertificates() throws ExitableException; + public abstract List<CertificateWithAlias> getCertificates(); - public abstract void addCertificates(List<CertificateWithAlias> certificates) throws ExitableException; + public abstract void addCertificates(List<CertificateWithAlias> certificates); - public abstract void saveFile() throws ExitableException; + public abstract void saveFile(); } diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java index b6984f36..5167c301 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java @@ -23,9 +23,6 @@ import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.JK import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.PKCS12_TYPE; import java.io.File; -import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException; -import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException; -import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException; import org.onap.oom.certservice.postprocessor.common.ExtensionResolver; import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException; @@ -41,8 +38,7 @@ public class TruststoreFactory { private TruststoreFactory() { } - public static Truststore create(String truststoreFilePath, String truststorePasswordPath) - throws TruststoreFileFactoryException, PasswordReaderException, KeystoreInstanceException, LoadTruststoreException { + public static Truststore create(String truststoreFilePath, String truststorePasswordPath) { File truststoreFile = new File(truststoreFilePath); if (!ExtensionResolver.checkIfFileExists(truststoreFile)) { throw new TruststoreFileFactoryException(String.format(FILE_DOES_NOT_EXIST_MSG_TEMPLATE, truststoreFile)); @@ -50,8 +46,7 @@ public class TruststoreFactory { return createTypedTruststore(truststoreFile, truststorePasswordPath); } - private static Truststore createTypedTruststore(File truststoreFile, String truststorePasswordPath) - throws KeystoreInstanceException, PasswordReaderException, LoadTruststoreException, TruststoreFileFactoryException { + private static Truststore createTypedTruststore(File truststoreFile, String truststorePasswordPath) { String extension = ExtensionResolver.get(truststoreFile); switch (extension) { case JKS_EXTENSION: diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java index 5c79f6e9..19833cb8 100644 --- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java +++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java @@ -35,7 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.onap.oom.certservice.postprocessor.merger.exception.AliasConflictException; @ExtendWith(MockitoExtension.class) -public class AppExecutorTest { +class AppExecutorTest { @Mock Runnable logic; diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java index 56f76e17..7b3b28ae 100644 --- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java +++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java @@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class FileToolsTest { +class FileToolsTest { public static final String BAK_EXTENSION = ".bak"; @@ -43,7 +43,7 @@ public class FileToolsTest { //when new FileTools().createBackup(fileToBackup); //then - assertThat(fileToBackup.equals(new File(backupFilePath))); + assertThat(fileToBackup).hasSameBinaryContentAs(new File(backupFilePath)); } @Test @@ -54,7 +54,7 @@ public class FileToolsTest { //when new FileTools().copy(sourceFile, destinationFile); //then - assertThat(sourceFile.equals(destinationFile)); + assertThat(sourceFile).hasSameBinaryContentAs(destinationFile); } diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java index bde23003..03989f6f 100644 --- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java +++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java @@ -37,7 +37,7 @@ class PemAliasGeneratorTest { //when String alias = pemAliasGenerator.getAlias(); //then - assertThat(alias.contains(PREFIX_ALIAS_NAME)).isTrue(); + assertThat(alias).contains(PREFIX_ALIAS_NAME); } @Test |