From b8c4e6867d6b26652f4382e93665c220769cdc9f Mon Sep 17 00:00:00 2001 From: baniewsk Date: Wed, 29 Jul 2020 16:01:27 +0200 Subject: [PATCH] Removing AAF references from Cert-Service in OOM repo. Certificates regenerated External files (from legacy AAF) removed Still left: * Sonar link, * Link to documentation, * Names of K8s resources in RTD documentation, * Link to CSITs Issue-ID: OOM-2526 Signed-off-by: Pawel Baniewski Change-Id: I675f7485160b9b8e46e9ea573550e62ed28ca607 --- Makefile | 12 +- README.md | 14 +- certService/Dockerfile | 4 +- certService/README.md | 19 +-- certService/pom.xml | 14 +- .../certservice/cmpv2client/external/Factory.java | 61 -------- .../aaf/certservice/cmpv2client/external/Rdn.java | 157 --------------------- .../certservice/CertServiceApplication.java | 2 +- .../certservice/api/CertificationController.java | 12 +- .../certservice/api/ReadinessController.java | 4 +- .../certservice/api/ReloadConfigController.java | 8 +- .../api/advice/CertificationExceptionAdvice.java | 16 +-- .../api/advice/ReloadConfigExceptionAdvice.java | 6 +- .../api/configuration/OpenApiConfig.java | 2 +- .../certification/CertificateFactoryProvider.java | 2 +- .../certification/CertificationData.java | 2 +- .../certification/CertificationModelFactory.java | 14 +- .../certification/CertificationProvider.java | 14 +- .../certservice/certification/CsrModelFactory.java | 10 +- .../certification/PemObjectFactory.java | 2 +- .../Pkcs10CertificationRequestFactory.java | 2 +- .../certification/RsaContentSignerBuilder.java | 2 +- .../certification/X509CertificateBuilder.java | 2 +- .../configuration/CmpClientConfig.java | 6 +- .../configuration/CmpServersConfig.java | 4 +- .../configuration/CmpServersConfigLoader.java | 8 +- .../CmpServersConfigLoadingException.java | 2 +- .../configuration/Cmpv2ServerProvider.java | 6 +- .../configuration/model/Authentication.java | 2 +- .../certification/configuration/model/CaMode.java | 2 +- .../configuration/model/CmpServers.java | 2 +- .../configuration/model/Cmpv2Server.java | 4 +- .../Cmpv2ServersConfigurationValidator.java | 4 +- .../validation/constraints/Cmpv2Url.java | 2 +- .../validation/constraints/Cmpv2UrlValidator.java | 8 +- .../violations/PortNumberViolation.java | 2 +- .../violations/RequestTypeViolation.java | 2 +- .../constraints/violations/UrlServerViolation.java | 2 +- .../exception/Cmpv2ClientAdapterException.java | 2 +- .../exception/Cmpv2ServerNotFoundException.java | 2 +- .../exception/CsrDecryptionException.java | 2 +- .../exception/DecryptionException.java | 2 +- .../exception/ErrorResponseModel.java | 2 +- .../exception/KeyDecryptionException.java | 2 +- .../certification/model/CertificationModel.java | 2 +- .../certservice/certification/model/CsrModel.java | 8 +- .../certservice/cmpv2client/api/CmpClient.java | 10 +- .../cmpv2client/exceptions/CmpClientException.java | 2 +- .../cmpv2client/exceptions/PkiErrorException.java | 2 +- .../cmpv2client/impl/CmpClientImpl.java | 26 ++-- .../cmpv2client/impl/CmpMessageBuilder.java | 2 +- .../cmpv2client/impl/CmpMessageHelper.java | 6 +- .../cmpv2client/impl/CmpResponseHelper.java | 8 +- .../impl/CmpResponseValidationHelper.java | 4 +- .../certservice/cmpv2client/impl/CmpUtil.java | 4 +- .../cmpv2client/impl/Cmpv2HttpClient.java | 4 +- .../cmpv2client/impl/CreateCertRequest.java | 10 +- .../cmpv2client/model/Cmpv2CertificationModel.java | 2 +- .../src/main/resources/application.properties | 8 +- certService/src/main/resources/log4j2.xml | 6 +- .../certservice/cmpv2client/external/RdnTest.java | 96 ------------- .../certservice/CertServiceApplicationTests.java | 2 +- .../api/CertificationControllerTest.java | 18 +-- .../certservice/api/ReadinessControllerTest.java | 4 +- .../api/ReloadConfigControllerTest.java | 6 +- .../advice/CertificationExceptionAdviceTest.java | 14 +- .../advice/ReloadConfigExceptionAdviceTest.java | 4 +- .../CertificationModelFactoryTest.java | 36 ++--- .../certification/CertificationProviderTest.java | 16 +-- .../certification/CsrModelFactoryTest.java | 20 +-- .../certification/PemObjectFactoryTest.java | 10 +- .../certification/RsaContentSignerBuilderTest.java | 10 +- .../certservice/certification/TestData.java | 2 +- .../certservice/certification/TestUtils.java | 12 +- .../certification/X509CertificateBuilderTest.java | 8 +- .../configuration/CmpServersConfigLoaderTest.java | 6 +- .../configuration/CmpServersConfigTest.java | 8 +- .../configuration/Cmpv2ServerProviderTest.java | 10 +- .../Cmpv2ServersConfigurationValidatorTest.java | 10 +- .../constraints/Cmpv2UrlValidatorTest.java | 2 +- .../violations/PortNumberViolationTest.java | 2 +- .../violations/RequestTypeViolationTest.java | 2 +- .../certification/model/CsrModelTest.java | 18 +-- .../certservice/cmpv2client/Cmpv2ClientTest.java | 14 +- .../cmpv2client/impl/CmpResponseHelperTest.java | 6 +- .../src/test/resources/application.properties | 6 +- certServiceClient/Dockerfile | 4 +- certServiceClient/README.md | 6 +- certServiceClient/pom.xml | 16 +-- .../certservice/client/AppExitHandler.java | 6 +- .../certservice/client/CertServiceClient.java | 44 +++--- .../{aaf => oom}/certservice/client/MainApp.java | 4 +- .../certservice/client/api/ExitStatus.java | 4 +- .../certservice/client/api/ExitableException.java | 4 +- .../certification/ArtifactsCreatorProvider.java | 12 +- .../client/certification/CsrFactory.java | 22 +-- .../EncryptionAlgorithmConstants.java | 4 +- .../client/certification/KeyPairFactory.java | 6 +- .../certification/PrivateKeyToPemEncoder.java | 6 +- .../certification/conversion/ArtifactsCreator.java | 6 +- .../conversion/ConvertedArtifactsCreator.java | 10 +- .../ConvertedArtifactsCreatorFactory.java | 6 +- .../client/certification/conversion/Password.java | 4 +- .../conversion/PemArtifactsCreator.java | 12 +- .../certification/conversion/PemConverter.java | 6 +- .../conversion/RandomPasswordGenerator.java | 4 +- .../conversion/StoreEntryOperation.java | 4 +- .../exception/CertFileWriterException.java | 8 +- .../exception/CsrGenerationException.java | 8 +- .../exception/KeyPairGenerationException.java | 8 +- .../exception/PemConversionException.java | 8 +- .../exception/PkEncodingException.java | 8 +- .../certification/writer/CertFileWriter.java | 6 +- .../certservice/client/common/Base64Encoder.java | 4 +- .../configuration/ClientConfigurationEnvs.java | 4 +- .../client/configuration/CsrConfigurationEnvs.java | 4 +- .../client/configuration/EnvProvider.java | 4 +- .../client/configuration/EnvsForClient.java | 4 +- .../client/configuration/EnvsForCsr.java | 4 +- .../client/configuration/EnvsForTls.java | 4 +- .../client/configuration/TlsConfigurationEnvs.java | 4 +- .../exception/ClientConfigurationException.java | 8 +- .../exception/CsrConfigurationException.java | 8 +- .../exception/TlsConfigurationException.java | 8 +- .../factory/AbstractConfigurationFactory.java | 12 +- .../factory/ClientConfigurationFactory.java | 12 +- .../factory/CsrConfigurationFactory.java | 12 +- .../configuration/factory/SslContextFactory.java | 10 +- .../configuration/model/ClientConfiguration.java | 8 +- .../configuration/model/ConfigurationModel.java | 4 +- .../configuration/model/CsrConfiguration.java | 6 +- .../httpclient/CloseableHttpsClientProvider.java | 4 +- .../certservice/client/httpclient/HttpClient.java | 12 +- .../exception/CertServiceApiResponseException.java | 8 +- .../httpclient/exception/HttpClientException.java | 8 +- .../httpclient/model/CertServiceResponse.java | 4 +- .../httpclient/model/ErrorCertServiceResponse.java | 4 +- certServiceClient/src/main/resources/log4j2.xml | 2 +- .../client/CerServiceRequestTestData.java | 4 +- .../certservice/client/CertServiceClientTest.java | 8 +- .../ArtifactsCreatorProviderTest.java | 10 +- .../client/certification/CsrFactoryTest.java | 10 +- .../client/certification/KeyPairFactoryTest.java | 6 +- .../certification/PrivateKeyToPemEncoderTest.java | 6 +- .../conversion/ConvertedArtifactsCreatorTest.java | 10 +- .../conversion/PemArtifactsCreatorTest.java | 10 +- .../certification/conversion/PemConverterTest.java | 8 +- .../conversion/RandomPasswordGeneratorTest.java | 4 +- .../certification/writer/CertFileWriterTest.java | 6 +- .../client/configuration/EnvProviderTest.java | 4 +- .../client/configuration/EnvsForCsrTest.java | 4 +- .../client/configuration/EnvsForTlsTest.java | 4 +- .../exception/TlsConfigurationExceptionTest.java | 6 +- .../factory/AbstractConfigurationFactoryTest.java | 4 +- .../factory/ClientConfigurationFactoryTest.java | 22 +-- .../factory/CsrConfigurationFactoryTest.java | 14 +- .../factory/SslContextFactoryTest.java | 8 +- .../client/httpclient/HttpClientTest.java | 24 ++-- certs/Makefile | 8 +- certs/certServiceClient-keystore.jks | Bin 4066 -> 4065 bytes certs/certServiceServer-keystore.jks | Bin 4111 -> 4110 bytes certs/certServiceServer-keystore.p12 | Bin 4683 -> 4683 bytes certs/root.crt | 52 +++---- certs/truststore.jks | Bin 1730 -> 1730 bytes compose-resources/client-configuration.env | 6 +- compose-resources/cmpServers.json | 4 +- docker-compose.yml | 20 +-- docs/README.md | 2 +- docs/index.rst | 2 +- docs/sections/build.rst | 12 +- docs/sections/configuration.rst | 14 +- docs/sections/introduction.rst | 2 + docs/sections/logging.rst | 8 +- docs/sections/offeredapis.rst | 2 +- docs/sections/resources/OpenAPI.yaml | 2 +- docs/sections/usage.rst | 30 ++-- pom.xml | 14 +- 177 files changed, 666 insertions(+), 977 deletions(-) delete mode 100644 certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java delete mode 100644 certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java rename certService/src/main/java/org/onap/{aaf => oom}/certservice/CertServiceApplication.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/api/CertificationController.java (93%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/api/ReadinessController.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/api/ReloadConfigController.java (92%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/api/advice/CertificationExceptionAdvice.java (89%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/api/advice/ReloadConfigExceptionAdvice.java (91%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/api/configuration/OpenApiConfig.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/CertificateFactoryProvider.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/CertificationData.java (99%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/CertificationModelFactory.java (86%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/CertificationProvider.java (87%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/CsrModelFactory.java (92%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/PemObjectFactory.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/Pkcs10CertificationRequestFactory.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/RsaContentSignerBuilder.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/X509CertificateBuilder.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/CmpClientConfig.java (90%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/CmpServersConfig.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/CmpServersConfigLoader.java (90%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/CmpServersConfigLoadingException.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/Cmpv2ServerProvider.java (89%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/model/Authentication.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/model/CaMode.java (94%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/model/CmpServers.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/model/Cmpv2Server.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java (94%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/Cmpv2Url.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java (88%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java (94%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/exception/Cmpv2ClientAdapterException.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/exception/Cmpv2ServerNotFoundException.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/exception/CsrDecryptionException.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/exception/DecryptionException.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/exception/ErrorResponseModel.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/exception/KeyDecryptionException.java (95%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/model/CertificationModel.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/certification/model/CsrModel.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/api/CmpClient.java (91%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/exceptions/CmpClientException.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/exceptions/PkiErrorException.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpClientImpl.java (93%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpMessageBuilder.java (97%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpMessageHelper.java (98%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpResponseHelper.java (98%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpResponseValidationHelper.java (98%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpUtil.java (98%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/Cmpv2HttpClient.java (96%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CreateCertRequest.java (93%) rename certService/src/main/java/org/onap/{aaf => oom}/certservice/cmpv2client/model/Cmpv2CertificationModel.java (96%) delete mode 100644 certService/src/test/java/org/onap/aaf/certservice/cmpv2client/external/RdnTest.java rename certService/src/test/java/org/onap/{aaf => oom}/certservice/CertServiceApplicationTests.java (97%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/api/CertificationControllerTest.java (91%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/api/ReadinessControllerTest.java (95%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/api/ReloadConfigControllerTest.java (94%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/api/advice/CertificationExceptionAdviceTest.java (92%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/api/advice/ReloadConfigExceptionAdviceTest.java (94%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/CertificationModelFactoryTest.java (87%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/CertificationProviderTest.java (91%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/CsrModelFactoryTest.java (89%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/PemObjectFactoryTest.java (89%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/RsaContentSignerBuilderTest.java (88%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/TestData.java (99%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/TestUtils.java (85%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/X509CertificateBuilderTest.java (92%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/CmpServersConfigLoaderTest.java (96%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/CmpServersConfigTest.java (97%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/Cmpv2ServerProviderTest.java (91%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java (94%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java (96%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java (97%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java (96%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/certification/model/CsrModelTest.java (92%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/cmpv2client/Cmpv2ClientTest.java (96%) rename certService/src/test/java/org/onap/{aaf => oom}/certservice/cmpv2client/impl/CmpResponseHelperTest.java (99%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/AppExitHandler.java (91%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/CertServiceClient.java (72%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/MainApp.java (94%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/api/ExitStatus.java (96%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/api/ExitableException.java (94%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/ArtifactsCreatorProvider.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/CsrFactory.java (90%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/EncryptionAlgorithmConstants.java (94%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/KeyPairFactory.java (94%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/PrivateKeyToPemEncoder.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/ArtifactsCreator.java (88%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/ConvertedArtifactsCreator.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java (90%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/Password.java (94%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/PemArtifactsCreator.java (88%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/PemConverter.java (97%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/RandomPasswordGenerator.java (95%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/StoreEntryOperation.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/exception/CertFileWriterException.java (85%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/exception/CsrGenerationException.java (85%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/exception/KeyPairGenerationException.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/exception/PemConversionException.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/exception/PkEncodingException.java (85%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/certification/writer/CertFileWriter.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/common/Base64Encoder.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/ClientConfigurationEnvs.java (92%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/CsrConfigurationEnvs.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvProvider.java (94%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvsForClient.java (95%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvsForCsr.java (96%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvsForTls.java (95%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/TlsConfigurationEnvs.java (92%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/exception/ClientConfigurationException.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/exception/CsrConfigurationException.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/exception/TlsConfigurationException.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/AbstractConfigurationFactory.java (89%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/ClientConfigurationFactory.java (89%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/CsrConfigurationFactory.java (89%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/SslContextFactory.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/model/ClientConfiguration.java (92%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/model/ConfigurationModel.java (91%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/configuration/model/CsrConfiguration.java (95%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/httpclient/CloseableHttpsClientProvider.java (96%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/httpclient/HttpClient.java (93%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/httpclient/exception/CertServiceApiResponseException.java (87%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/httpclient/exception/HttpClientException.java (86%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/httpclient/model/CertServiceResponse.java (95%) rename certServiceClient/src/main/java/org/onap/{aaf => oom}/certservice/client/httpclient/model/ErrorCertServiceResponse.java (93%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/CerServiceRequestTestData.java (97%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/CertServiceClientTest.java (90%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/ArtifactsCreatorProviderTest.java (90%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/CsrFactoryTest.java (88%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/KeyPairFactoryTest.java (93%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/PrivateKeyToPemEncoderTest.java (95%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java (95%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/PemArtifactsCreatorTest.java (89%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/PemConverterTest.java (97%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java (93%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/certification/writer/CertFileWriterTest.java (94%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvProviderTest.java (96%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvsForCsrTest.java (98%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/EnvsForTlsTest.java (98%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java (91%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java (97%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java (92%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java (94%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/configuration/factory/SslContextFactoryTest.java (97%) rename certServiceClient/src/test/java/org/onap/{aaf => oom}/certservice/client/httpclient/HttpClientTest.java (88%) diff --git a/Makefile b/Makefile index 778b94d7..d0017e1e 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ start-backend: @echo "##### Start Cert Service #####" docker-compose up -d @echo "## Configure ejbca ##" - docker exec aafcert-ejbca /opt/primekey/scripts/ejbca-configuration.sh + docker exec oomcert-ejbca /opt/primekey/scripts/ejbca-configuration.sh @echo "##### DONE #####" run-client: @@ -20,13 +20,13 @@ run-client: @echo "##### Start Cert Service Client #####" docker run \ --rm \ - --name aafcert-client \ + --name oomcert-client \ --env-file ./compose-resources/client-configuration.env \ - --network certservice_certservice \ + --network cert-service_certservice \ --mount type=bind,src=`pwd`/compose-resources/client-volume/,dst=/var/certs \ - --volume `pwd`/certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks \ - --volume `pwd`/certs/certServiceClient-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks \ - onap/org.onap.aaf.certservice.aaf-certservice-client:latest + --volume `pwd`/certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks \ + --volume `pwd`/certs/certServiceClient-keystore.jks:/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks \ + onap/org.onap.oom.certservice.oom-certservice-client:latest stop-backend: @echo "##### Stop Cert Service #####" diff --git a/README.md b/README.md index c3a30ce0..bb564665 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ More information about the project and all its functionalities you can find under the wiki page: ``` - https://wiki.onap.org/display/DW/AAF+Certification+Service + https://wiki.onap.org/display/DW/OOM+Certification+Service ``` Project consists of two submodules: -1. aaf-certservice-api -2. aaf-certservice-client +1. oom-certservice-api +2. oom-certservice-client Detailed information about submodules can be found in ```README.md``` in their directories. @@ -52,7 +52,7 @@ make run-client make stop-backend ``` -### AAF CertService CSITs +### OOM CertService CSITs #### CSIT repository ``` https://gerrit.onap.org/r/admin/repos/integration/csit @@ -67,7 +67,7 @@ sudo ./run-csit.sh plans/aaf/certservice ``` ####Jenkins build -https://jenkins.onap.org/view/CSIT/job/aaf-master-csit-certservice/ +https://jenkins.onap.org/view/CSIT/job/oom-platform-cert-service-master-csit-certservice/ ### Sonar results ``` @@ -77,13 +77,13 @@ https://sonarcloud.io/dashboard?id=onap_aaf-certservice ### Maven artifacts All maven artifacts are deployed under nexus uri: ``` -https://nexus.onap.org/content/repositories/snapshots/org/onap/aaf/certservice/ +https://nexus.onap.org/content/repositories/snapshots/org/onap/oom/certservice/ ``` ### Docker artifacts All docker images are hosted under nexus3 uri: ``` -https://nexus3.onap.org/repository/docker.snapshot/v2/onap/org.onap.aaf.certservice.aaf-certservice-api/ +https://nexus3.onap.org/repository/docker.snapshot/v2/onap/org.onap.oom.certservice.oom-certservice-api/ ``` ### How to release containers diff --git a/certService/Dockerfile b/certService/Dockerfile index 770dab97..d74b692d 100644 --- a/certService/Dockerfile +++ b/certService/Dockerfile @@ -10,6 +10,6 @@ RUN chown -R certService:certService /var/log USER certService:certService -COPY target/aaf-certservice-api-${VERSION}.jar ./opt/onap/aaf/certservice/aaf-certservice-api.jar +COPY target/oom-certservice-api-${VERSION}.jar ./opt/onap/oom/certservice/oom-certservice-api.jar -ENTRYPOINT ["java","-jar","./opt/onap/aaf/certservice/aaf-certservice-api.jar"] +ENTRYPOINT ["java","-jar","./opt/onap/oom/certservice/oom-certservice-api.jar"] diff --git a/certService/README.md b/certService/README.md index 645ca061..1b24747a 100644 --- a/certService/README.md +++ b/certService/README.md @@ -3,18 +3,18 @@ ### General description More information about the project and all its functionalities you can find under the wiki page: ``` - https://wiki.onap.org/display/DW/AAF+Certification+Service + https://wiki.onap.org/display/DW/OOM+Certification+Service ``` ### For developers - * AAF Cert Service Api is a Spring Boot application + * OOM Cert Service Api is a Spring Boot application * Code style Use Google code formatter in your IDE. For IntelliJ use [https://plugins.jetbrains.com/plugin/8527-google-java-format] For other IDEs use []https://github.com/google/google-java-format] ### Local project configuration - * Create directory on your system /etc/onap/aaf/certservice + * Create directory on your system /etc/onap/oom/certservice * Copy sample configuration test/resources/cmpServers.json to that directory ### Running Locally @@ -37,7 +37,7 @@ mvn clean package ### Building Docker image manually Go to the certService subfolder and execute following statement (1.0.0-SNAPSHOT is related to a current project.version parameter): ``` -docker build --build-arg VERSION=1.0.0-SNAPSHOT -t onap/org.onap.aaf.certservice.aaf-certservice-api . +docker build --build-arg VERSION=1.0.0-SNAPSHOT -t onap/org.onap.oom.certservice.oom-certservice-api . ``` ### Install the package into the local repository @@ -52,12 +52,13 @@ mvn clean install -P docker ### Running Docker container local ``` -docker run -p 8080:8080 --name aaf-certservice-api --mount type=bind,source=//cmpServers.json,target=/etc/onap/aaf/certservice/cmpServers.json onap/org.onap.aaf.certservice.aaf-certservice-api +docker run -p 8080:8080 --name oom-certservice-api --mount type=bind,source=//cmpServers.json,target=/etc/onap/ +oom/certservice/cmpServers.json onap/org.onap.oom.certservice.oom-certservice-api ``` ### Running Docker container from nexus ``` -docker run -p 8080:8080 --name aaf-certservice-api --mount type=bind,source=//cmpServers.json,target=/etc/onap/aaf/certservice/cmpServers.json nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api:1.0.0 +docker run -p 8080:8080 --name oom-certservice-api --mount type=bind,source=//cmpServers.json,target=/etc/onap/oom/certservice/cmpServers.json nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-api:1.0.0 ``` ### Health Check @@ -76,16 +77,16 @@ curl localhost:8080/actuator/health path: ``` -var/log/onap/aaf/certservice/ +var/log/onap/oom/certservice/ ``` ### Logs in Docker container ``` -docker exec -it aaf-certservice-api bash +docker exec -it oom-certservice-api bash ``` path: ``` -cd /var/log/onap/aaf/certservice +cd /var/log/onap/oom/certservice ``` You should see: audit.log error.log debug.log diff --git a/certService/pom.xml b/certService/pom.xml index 9febd167..4d75fe90 100644 --- a/certService/pom.xml +++ b/certService/pom.xml @@ -16,14 +16,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.aaf.certservice - aaf-certservice + org.onap.oom.platform.cert-service + oom-certservice 1.2.0-SNAPSHOT - aaf-certservice-api + oom-certservice-api 1.2.0-SNAPSHOT - aaf-certservice-api - AAF Certification Service Api + oom-certservice-api + OOM Certification Service Api jar @@ -182,12 +182,12 @@ ecomp-releases - AAF Release Repository + OOM Release Repository ${nexusproxy}${releaseNexusPath} ecomp-snapshots - AAF Snapshot Repository + OOM Snapshot Repository ${nexusproxy}${snapshotNexusPath} diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java deleted file mode 100644 index 9e95ab2f..00000000 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * ============LICENSE_START==================================================== - * org.onap.aaf - * =========================================================================== - * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. - * - * Modifications Copyright (C) 2019 IBM. - * =========================================================================== - * 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.cmpv2client.external; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; - -public final class Factory { - - private static final Logger LOGGER = LoggerFactory.getLogger(Factory.class); - private static final KeyPairGenerator KEY_PAIR_GENERATOR; - private static final SecureRandom SECURE_RANDOM; - private static final String KEY_ALGORITHM = "RSA"; - private static final int KEY_LENGTH = 2048; - - static { - SECURE_RANDOM = new SecureRandom(); - KeyPairGenerator tempKeygen; - try { - tempKeygen = KeyPairGenerator.getInstance(KEY_ALGORITHM); - tempKeygen.initialize(KEY_LENGTH, SECURE_RANDOM); - } catch (NoSuchAlgorithmException e) { - tempKeygen = null; - LOGGER.error("Given KEY_ALGORITHM is invalid.", e); - } - KEY_PAIR_GENERATOR = tempKeygen; - } - - private Factory() { - } - - public static KeyPair generateKeyPair() { - return KEY_PAIR_GENERATOR.generateKeyPair(); - } -} diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java deleted file mode 100644 index 25017b8a..00000000 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * ============LICENSE_START==================================================== - * org.onap.aaf - * =========================================================================== - * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. - * - * Modifications Copyright (C) 2019 IBM. - * =========================================================================== - * 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.cmpv2client.external; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.x500.style.BCStyle; -import org.bouncycastle.cert.CertException; - -public class Rdn { - - private String tag; - private String value; - private ASN1ObjectIdentifier aoi; - - public String getValue() { - return value; - } - - public Rdn(final String tag, final String value) throws CertException { - this.tag = tag; - this.value = value; - this.aoi = getAoi(tag); - } - - public Rdn(final String tagValue) throws CertException { - List tv = parseRdn("=", tagValue); - this.tag = tv.get(0); - this.value = tv.get(1); - this.aoi = getAoi(this.tag); - } - - /** - * Splits RDN as string by given delimiter, then trims every part. - * - * @param splitBy Delimiter which splits value - * @param value Value to be splitted - * @return List of splitted and trimmed strings - */ - static List parseRdn(String splitBy, String value) { - String[] splitted = value.split(splitBy); - return Arrays.stream(splitted) - .map(String::trim) - .collect(Collectors.toList()); - } - /** - * Parse various forms of DNs into appropriate RDNs, which have the ASN1ObjectIdentifier - * - * @param delim - * @param dnString - * @return - * @throws CertException - */ - - public static List parse(final char delim, final String dnString) throws CertException { - List lrnd = new ArrayList<>(); - StringBuilder sb = new StringBuilder(); - boolean inQuotes = false; - for (int i = 0; i < dnString.length(); ++i) { - char currentCharacter = dnString.charAt(i); - if (inQuotes) { - if ('"' == currentCharacter) { - inQuotes = false; - } else { - sb.append(dnString.charAt(i)); - } - } else { - if ('"' == currentCharacter) { - inQuotes = true; - } else if (delim == currentCharacter) { - if (sb.length() > 0) { - lrnd.add(new Rdn(sb.toString())); - sb.setLength(0); - } - } else { - sb.append(dnString.charAt(i)); - } - } - } - if (sb.indexOf("=") > 0) { - lrnd.add(new Rdn(sb.toString())); - } - return lrnd; - } - - @Override - public String toString() { - return tag + '=' + value; - } - - ASN1ObjectIdentifier getAoi() { - return aoi; - } - - ASN1ObjectIdentifier getAoi(String tag) throws CertException { - switch (tag.toLowerCase()) { - case "cn": - return BCStyle.CN; - case "c": - return BCStyle.C; - case "st": - return BCStyle.ST; - case "l": - return BCStyle.L; - case "o": - return BCStyle.O; - case "ou": - return BCStyle.OU; - case "dc": - return BCStyle.DC; - case "gn": - return BCStyle.GIVENNAME; - case "sn": - return BCStyle.SN; - case "email": - case "e": - case "emailaddress": - return BCStyle.EmailAddress; - case "initials": - return BCStyle.INITIALS; - case "pseudonym": - return BCStyle.PSEUDONYM; - case "generationqualifier": - return BCStyle.GENERATION; - case "serialnumber": - return BCStyle.SERIALNUMBER; - default: - throw new CertException( - "Unknown ASN1ObjectIdentifier for tag " + tag); - } - } -} diff --git a/certService/src/main/java/org/onap/aaf/certservice/CertServiceApplication.java b/certService/src/main/java/org/onap/oom/certservice/CertServiceApplication.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/CertServiceApplication.java rename to certService/src/main/java/org/onap/oom/certservice/CertServiceApplication.java index 11478965..c320d461 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/CertServiceApplication.java +++ b/certService/src/main/java/org/onap/oom/certservice/CertServiceApplication.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice; +package org.onap.oom.certservice; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/CertificationController.java b/certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java similarity index 93% rename from certService/src/main/java/org/onap/aaf/certservice/api/CertificationController.java rename to certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java index c440ec34..d3a83ed1 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/api/CertificationController.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api; +package org.onap.oom.certservice.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -27,11 +27,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import org.onap.aaf.certservice.certification.CertificationModelFactory; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.ErrorResponseModel; -import org.onap.aaf.certservice.certification.model.CertificationModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.certification.CertificationModelFactory; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.ErrorResponseModel; +import org.onap.oom.certservice.certification.model.CertificationModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java b/certService/src/main/java/org/onap/oom/certservice/api/ReadinessController.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java rename to certService/src/main/java/org/onap/oom/certservice/api/ReadinessController.java index 9c8e1bf0..3be54fd2 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/ReadinessController.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api; +package org.onap.oom.certservice.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfig; +import org.onap.oom.certservice.certification.configuration.CmpServersConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java b/certService/src/main/java/org/onap/oom/certservice/api/ReloadConfigController.java similarity index 92% rename from certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java rename to certService/src/main/java/org/onap/oom/certservice/api/ReloadConfigController.java index 14bff8dd..b510d4f0 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/ReloadConfigController.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api; +package org.onap.oom.certservice.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -26,9 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfig; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException; -import org.onap.aaf.certservice.certification.exception.ErrorResponseModel; +import org.onap.oom.certservice.certification.configuration.CmpServersConfig; +import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException; +import org.onap.oom.certservice.certification.exception.ErrorResponseModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdvice.java b/certService/src/main/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdvice.java similarity index 89% rename from certService/src/main/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdvice.java rename to certService/src/main/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdvice.java index a40fea8f..5fb9d2ad 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdvice.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdvice.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api.advice; +package org.onap.oom.certservice.api.advice; -import org.onap.aaf.certservice.api.CertificationController; -import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException; -import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.ErrorResponseModel; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.api.CertificationController; +import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException; +import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.ErrorResponseModel; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdvice.java b/certService/src/main/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdvice.java similarity index 91% rename from certService/src/main/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdvice.java rename to certService/src/main/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdvice.java index 4a4073ff..b52111de 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdvice.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdvice.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api.advice; +package org.onap.oom.certservice.api.advice; -import org.onap.aaf.certservice.api.ReloadConfigController; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException; +import org.onap.oom.certservice.api.ReloadConfigController; +import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/certService/src/main/java/org/onap/aaf/certservice/api/configuration/OpenApiConfig.java b/certService/src/main/java/org/onap/oom/certservice/api/configuration/OpenApiConfig.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/api/configuration/OpenApiConfig.java rename to certService/src/main/java/org/onap/oom/certservice/api/configuration/OpenApiConfig.java index f946598a..9a5840ab 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/api/configuration/OpenApiConfig.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/configuration/OpenApiConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api.configuration; +package org.onap.oom.certservice.api.configuration; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificateFactoryProvider.java b/certService/src/main/java/org/onap/oom/certservice/certification/CertificateFactoryProvider.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/certification/CertificateFactoryProvider.java rename to certService/src/main/java/org/onap/oom/certservice/certification/CertificateFactoryProvider.java index b633f905..93fa4c21 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificateFactoryProvider.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/CertificateFactoryProvider.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import java.io.InputStream; import java.security.NoSuchProviderException; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificationData.java b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationData.java similarity index 99% rename from certService/src/main/java/org/onap/aaf/certservice/certification/CertificationData.java rename to certService/src/main/java/org/onap/oom/certservice/certification/CertificationData.java index bce72977..11e81807 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificationData.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationData.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; final class CertificationData { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificationModelFactory.java b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationModelFactory.java similarity index 86% rename from certService/src/main/java/org/onap/aaf/certservice/certification/CertificationModelFactory.java rename to certService/src/main/java/org/onap/oom/certservice/certification/CertificationModelFactory.java index 631d56ef..23440ac5 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificationModelFactory.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationModelFactory.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; -import org.onap.aaf.certservice.certification.configuration.Cmpv2ServerProvider; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.model.CertificationModel; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.certification.configuration.Cmpv2ServerProvider; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.model.CertificationModel; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificationProvider.java b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationProvider.java similarity index 87% rename from certService/src/main/java/org/onap/aaf/certservice/certification/CertificationProvider.java rename to certService/src/main/java/org/onap/oom/certservice/certification/CertificationProvider.java index 2478cc58..91148a22 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/CertificationProvider.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationProvider.java @@ -18,17 +18,17 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator; import org.bouncycastle.util.io.pem.PemObjectGenerator; import org.bouncycastle.util.io.pem.PemWriter; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.model.CertificationModel; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.api.CmpClient; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.model.CertificationModel; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.api.CmpClient; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java b/certService/src/main/java/org/onap/oom/certservice/certification/CsrModelFactory.java similarity index 92% rename from certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java rename to certService/src/main/java/org/onap/oom/certservice/certification/CsrModelFactory.java index b4f94b93..758427f6 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/CsrModelFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import java.util.Base64; import java.util.Objects; @@ -26,10 +26,10 @@ import java.util.Optional; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.util.io.pem.PemObject; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; -import org.onap.aaf.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.certification.model.CsrModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java b/certService/src/main/java/org/onap/oom/certservice/certification/PemObjectFactory.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java rename to certService/src/main/java/org/onap/oom/certservice/certification/PemObjectFactory.java index 1eb5270f..24d32bdd 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/PemObjectFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import java.io.IOException; import java.io.StringReader; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/Pkcs10CertificationRequestFactory.java b/certService/src/main/java/org/onap/oom/certservice/certification/Pkcs10CertificationRequestFactory.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/certification/Pkcs10CertificationRequestFactory.java rename to certService/src/main/java/org/onap/oom/certservice/certification/Pkcs10CertificationRequestFactory.java index 1b00a815..c38eb0a1 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/Pkcs10CertificationRequestFactory.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/Pkcs10CertificationRequestFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.util.encoders.DecoderException; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilder.java b/certService/src/main/java/org/onap/oom/certservice/certification/RsaContentSignerBuilder.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilder.java rename to certService/src/main/java/org/onap/oom/certservice/certification/RsaContentSignerBuilder.java index 12f00f9c..741b20ab 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilder.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/RsaContentSignerBuilder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import java.io.IOException; import java.security.PrivateKey; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/X509CertificateBuilder.java b/certService/src/main/java/org/onap/oom/certservice/certification/X509CertificateBuilder.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/certification/X509CertificateBuilder.java rename to certService/src/main/java/org/onap/oom/certservice/certification/X509CertificateBuilder.java index 5b24c653..67aecb7c 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/X509CertificateBuilder.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/X509CertificateBuilder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import java.io.IOException; import java.math.BigInteger; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpClientConfig.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpClientConfig.java similarity index 90% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpClientConfig.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpClientConfig.java index 329098ac..9cf6fd15 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpClientConfig.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpClientConfig.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.onap.aaf.certservice.cmpv2client.api.CmpClient; -import org.onap.aaf.certservice.cmpv2client.impl.CmpClientImpl; +import org.onap.oom.certservice.cmpv2client.api.CmpClient; +import org.onap.oom.certservice.cmpv2client.impl.CmpClientImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.context.annotation.RequestScope; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfig.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfig.java index cea228c1..727f685d 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfig.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; import java.io.File; import java.util.Collections; import java.util.List; import javax.annotation.PostConstruct; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoader.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoader.java similarity index 90% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoader.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoader.java index 101712e2..72795b03 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoader.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoader.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; @@ -26,9 +26,9 @@ import java.io.IOException; import java.security.InvalidParameterException; import java.util.List; -import org.onap.aaf.certservice.certification.configuration.model.CmpServers; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.configuration.validation.Cmpv2ServersConfigurationValidator; +import org.onap.oom.certservice.certification.configuration.model.CmpServers; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.configuration.validation.Cmpv2ServersConfigurationValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoadingException.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoadingException.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoadingException.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoadingException.java index b7c3638d..de0a0729 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoadingException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoadingException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; public class CmpServersConfigLoadingException extends Exception { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProvider.java similarity index 89% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProvider.java index 190bb28a..a8d43fe8 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProvider.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Authentication.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Authentication.java index e4c15518..e354ca60 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Authentication.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.model; +package org.onap.oom.certservice.certification.configuration.model; import javax.validation.constraints.NotNull; import org.hibernate.validator.constraints.Length; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CaMode.java similarity index 94% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CaMode.java index 374feb3b..9980ef50 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CaMode.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.model; +package org.onap.oom.certservice.certification.configuration.model; public enum CaMode { RA("RA"), CLIENT("Client"); diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CmpServers.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CmpServers.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CmpServers.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CmpServers.java index 7fac1887..9fbe0eaf 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CmpServers.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CmpServers.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.model; +package org.onap.oom.certservice.certification.configuration.model; import java.util.List; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Cmpv2Server.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Cmpv2Server.java index 51d91966..b27f2888 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Cmpv2Server.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.model; +package org.onap.oom.certservice.certification.configuration.model; import javax.validation.Valid; import javax.validation.constraints.NotNull; import org.bouncycastle.asn1.x500.X500Name; import org.hibernate.validator.constraints.Length; -import org.onap.aaf.certservice.certification.configuration.validation.constraints.Cmpv2Url; +import org.onap.oom.certservice.certification.configuration.validation.constraints.Cmpv2Url; public class Cmpv2Server { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java similarity index 94% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java index 3cf7fdf7..59014b45 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation; +package org.onap.oom.certservice.certification.configuration.validation; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2Url.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2Url.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2Url.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2Url.java index a5450a25..36e880e3 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2Url.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2Url.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints; +package org.onap.oom.certservice.certification.configuration.validation.constraints; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java similarity index 88% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java index 7ce3bb6c..67031682 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java @@ -19,11 +19,11 @@ */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints; +package org.onap.oom.certservice.certification.configuration.validation.constraints; -import org.onap.aaf.certservice.certification.configuration.validation.constraints.violations.PortNumberViolation; -import org.onap.aaf.certservice.certification.configuration.validation.constraints.violations.RequestTypeViolation; -import org.onap.aaf.certservice.certification.configuration.validation.constraints.violations.UrlServerViolation; +import org.onap.oom.certservice.certification.configuration.validation.constraints.violations.PortNumberViolation; +import org.onap.oom.certservice.certification.configuration.validation.constraints.violations.RequestTypeViolation; +import org.onap.oom.certservice.certification.configuration.validation.constraints.violations.UrlServerViolation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java index 96f30149..362a2bb8 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations; +package org.onap.oom.certservice.certification.configuration.validation.constraints.violations; import java.net.MalformedURLException; import java.net.URL; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java index 67a5c3c4..7f7c5169 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java @@ -19,7 +19,7 @@ */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations; +package org.onap.oom.certservice.certification.configuration.validation.constraints.violations; import java.net.MalformedURLException; import java.net.URL; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java similarity index 94% rename from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java rename to certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java index 5452beb4..96d1688a 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations; +package org.onap.oom.certservice.certification.configuration.validation.constraints.violations; public interface UrlServerViolation { boolean validate(String url); diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ClientAdapterException.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ClientAdapterException.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ClientAdapterException.java rename to certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ClientAdapterException.java index 1b26da7b..25ea7eb4 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ClientAdapterException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ClientAdapterException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.exception; +package org.onap.oom.certservice.certification.exception; public class Cmpv2ClientAdapterException extends Exception { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ServerNotFoundException.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ServerNotFoundException.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ServerNotFoundException.java rename to certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ServerNotFoundException.java index 35acb0cd..304b52a1 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ServerNotFoundException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ServerNotFoundException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.exception; +package org.onap.oom.certservice.certification.exception; public class Cmpv2ServerNotFoundException extends RuntimeException { public Cmpv2ServerNotFoundException(String message) { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/CsrDecryptionException.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/CsrDecryptionException.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/exception/CsrDecryptionException.java rename to certService/src/main/java/org/onap/oom/certservice/certification/exception/CsrDecryptionException.java index ed434e07..80e1b912 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/CsrDecryptionException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/CsrDecryptionException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.exception; +package org.onap.oom.certservice.certification.exception; public class CsrDecryptionException extends DecryptionException { public CsrDecryptionException(String message, Throwable cause) { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/DecryptionException.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/DecryptionException.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/exception/DecryptionException.java rename to certService/src/main/java/org/onap/oom/certservice/certification/exception/DecryptionException.java index 6d8f7073..784009fb 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/DecryptionException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/DecryptionException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.exception; +package org.onap.oom.certservice.certification.exception; public class DecryptionException extends Exception { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/ErrorResponseModel.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/ErrorResponseModel.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/exception/ErrorResponseModel.java rename to certService/src/main/java/org/onap/oom/certservice/certification/exception/ErrorResponseModel.java index 8899f77c..db659412 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/ErrorResponseModel.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/ErrorResponseModel.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.exception; +package org.onap.oom.certservice.certification.exception; public class ErrorResponseModel { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/KeyDecryptionException.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/KeyDecryptionException.java similarity index 95% rename from certService/src/main/java/org/onap/aaf/certservice/certification/exception/KeyDecryptionException.java rename to certService/src/main/java/org/onap/oom/certservice/certification/exception/KeyDecryptionException.java index d4814d6a..eeb21da4 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/exception/KeyDecryptionException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/KeyDecryptionException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.exception; +package org.onap.oom.certservice.certification.exception; public class KeyDecryptionException extends DecryptionException { public KeyDecryptionException(String message, Throwable cause) { diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/model/CertificationModel.java b/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificationModel.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/model/CertificationModel.java rename to certService/src/main/java/org/onap/oom/certservice/certification/model/CertificationModel.java index b851d0d9..08a09a75 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/model/CertificationModel.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificationModel.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.model; +package org.onap.oom.certservice.certification.model; import java.util.Collections; import java.util.List; diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/model/CsrModel.java b/certService/src/main/java/org/onap/oom/certservice/certification/model/CsrModel.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/certification/model/CsrModel.java rename to certService/src/main/java/org/onap/oom/certservice/certification/model/CsrModel.java index d81da10a..7cba1949 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/model/CsrModel.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/model/CsrModel.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.model; +package org.onap.oom.certservice.certification.model; import java.io.IOException; import java.security.KeyFactory; @@ -42,9 +42,9 @@ import org.bouncycastle.asn1.x509.GeneralNames; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.util.io.pem.PemObject; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; public class CsrModel { diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/api/CmpClient.java similarity index 91% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/api/CmpClient.java index cccb744d..d525c6e3 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/api/CmpClient.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.api; +package org.onap.oom.certservice.cmpv2client.api; import java.util.Date; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; /** * This class represent CmpV2Client Interface for obtaining X.509 Digital Certificates in a Public diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/CmpClientException.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/CmpClientException.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/CmpClientException.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/CmpClientException.java index 2a04306a..866377fc 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/CmpClientException.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/CmpClientException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.exceptions; +package org.onap.oom.certservice.cmpv2client.exceptions; /** * The CmpClientException wraps all exceptions occur internally to Cmpv2Client Api code. diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/PkiErrorException.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/PkiErrorException.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/PkiErrorException.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/PkiErrorException.java index 62411fbd..5dabf064 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/PkiErrorException.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/PkiErrorException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.exceptions; +package org.onap.oom.certservice.cmpv2client.exceptions; public class PkiErrorException extends Exception { diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpClientImpl.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java similarity index 93% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpClientImpl.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java index 87991132..f5eddb58 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpClientImpl.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java @@ -18,17 +18,17 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import java.security.KeyPair; import java.security.PublicKey; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseHelper.checkIfCmpResponseContainsError; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseHelper.getCertFromByteArray; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseHelper.verifyAndReturnCertChainAndTrustSTore; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseValidationHelper.checkImplicitConfirm; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifyPasswordBasedProtection; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifySignature; +import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseHelper.checkIfCmpResponseContainsError; +import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseHelper.getCertFromByteArray; +import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseHelper.verifyAndReturnCertChainAndTrustSTore; +import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.checkImplicitConfirm; +import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifyPasswordBasedProtection; +import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifySignature; import java.io.IOException; import java.security.cert.CertificateParsingException; @@ -46,12 +46,12 @@ import org.bouncycastle.asn1.cmp.PKIBody; import org.bouncycastle.asn1.cmp.PKIHeader; import org.bouncycastle.asn1.cmp.PKIMessage; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.onap.aaf.certservice.certification.configuration.model.CaMode; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.api.CmpClient; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.certification.configuration.model.CaMode; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.api.CmpClient; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageBuilder.java similarity index 97% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageBuilder.java index 1f370f93..8ef15a12 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageBuilder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import java.util.ArrayList; import java.util.List; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageHelper.java similarity index 98% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageHelper.java index 6fcc5f14..844f85be 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageHelper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.generateProtectedBytes; +import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.generateProtectedBytes; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -64,7 +64,7 @@ import org.bouncycastle.asn1.x509.GeneralNames; import org.bouncycastle.asn1.x509.KeyUsage; import org.bouncycastle.asn1.x509.Time; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelper.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelper.java similarity index 98% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelper.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelper.java index 3cb0b0c5..db508603 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelper.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelper.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -53,9 +53,9 @@ import org.bouncycastle.asn1.cmp.PKIBody; import org.bouncycastle.asn1.cmp.PKIMessage; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.exceptions.PkiErrorException; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.exceptions.PkiErrorException; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseValidationHelper.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseValidationHelper.java similarity index 98% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseValidationHelper.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseValidationHelper.java index 4b9f2cd1..c699b110 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseValidationHelper.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseValidationHelper.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -50,7 +50,7 @@ import org.bouncycastle.asn1.cmp.PKIMessage; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpUtil.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpUtil.java similarity index 98% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpUtil.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpUtil.java index ced0fed0..281f6f5e 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpUtil.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpUtil.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -40,7 +40,7 @@ import org.bouncycastle.asn1.cmp.PKIHeaderBuilder; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; import org.bouncycastle.asn1.x509.GeneralName; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/Cmpv2HttpClient.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/Cmpv2HttpClient.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/Cmpv2HttpClient.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/Cmpv2HttpClient.java index 68c743d2..0f32c668 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/Cmpv2HttpClient.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/Cmpv2HttpClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,7 +28,7 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.bouncycastle.asn1.cmp.PKIMessage; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CreateCertRequest.java similarity index 93% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CreateCertRequest.java index 74380d84..a0ba13d6 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CreateCertRequest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.createRandomBytes; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.createRandomInt; -import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.generatePkiHeader; +import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.createRandomBytes; +import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.createRandomInt; +import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.generatePkiHeader; import java.security.KeyPair; import java.util.Date; @@ -38,7 +38,7 @@ import org.bouncycastle.asn1.crmf.CertTemplateBuilder; import org.bouncycastle.asn1.crmf.ProofOfPossession; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; /** * Implementation of the CmpClient Interface conforming to RFC4210 (Certificate Management Protocol diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/model/Cmpv2CertificationModel.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/model/Cmpv2CertificationModel.java similarity index 96% rename from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/model/Cmpv2CertificationModel.java rename to certService/src/main/java/org/onap/oom/certservice/cmpv2client/model/Cmpv2CertificationModel.java index 5d48b978..a40a7708 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/model/Cmpv2CertificationModel.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/model/Cmpv2CertificationModel.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.model; +package org.onap.oom.certservice.cmpv2client.model; import java.security.cert.X509Certificate; import java.util.Collections; diff --git a/certService/src/main/resources/application.properties b/certService/src/main/resources/application.properties index c5d14370..a7f5eea8 100644 --- a/certService/src/main/resources/application.properties +++ b/certService/src/main/resources/application.properties @@ -7,16 +7,16 @@ management.endpoints.web.exposure.include=health springdoc.show-actuator=true springdoc.swagger-ui.path=/docs -# AAF CertService app specific configuration -app.config.path=/etc/onap/aaf/certservice +# OOM CertService app specific configuration +app.config.path=/etc/onap/oom/certservice # Mutual TLS configuration server.ssl.enabled=true server.ssl.client-auth=need server.port=${HTTPS_PORT:8443} -server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks} +server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/oom/certservice/certs/certServiceServer-keystore.jks} server.ssl.key-store-password=${KEYSTORE_PASSWORD:secret} -server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/aaf/certservice/certs/truststore.jks} +server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/oom/certservice/certs/truststore.jks} server.ssl.trust-store-password=${TRUSTSTORE_PASSWORD:secret} diff --git a/certService/src/main/resources/log4j2.xml b/certService/src/main/resources/log4j2.xml index f814b4bd..3a5b1f65 100644 --- a/certService/src/main/resources/log4j2.xml +++ b/certService/src/main/resources/log4j2.xml @@ -10,7 +10,7 @@ pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} %style{${sys:PID}}{magenta} [%15.15t] %style{%-40.40C{1.}}{cyan} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/> - + @@ -19,7 +19,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/external/RdnTest.java b/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/external/RdnTest.java deleted file mode 100644 index 6e42afe8..00000000 --- a/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/external/RdnTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * ============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.cmpv2client.external; - -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.x500.style.BCStyle; -import org.bouncycastle.cert.CertException; -import org.junit.jupiter.api.Test; - -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - -class RdnTest { - - @Test - void shouldCreateCorrectRdn() throws CertException { - // given - final String expectedValue = "ManagmentCA"; - final ASN1ObjectIdentifier expectedAoi = BCStyle.CN; - - //when - Rdn rdn1 = new Rdn("CN=ManagmentCA"); - Rdn rdn2 = new Rdn("CN = ManagmentCA "); - Rdn rdn3 = new Rdn("CN", "ManagmentCA"); - - //then - assertEquals(expectedValue, rdn1.getValue()); - assertEquals(expectedValue, rdn2.getValue()); - assertEquals(expectedValue, rdn3.getValue()); - assertEquals(expectedAoi, rdn1.getAoi()); - assertEquals(expectedAoi, rdn2.getAoi()); - assertEquals(expectedAoi, rdn3.getAoi()); - } - - @Test - void shouldCorrectlySplitAndTrimString() { - //given - String value1 = " T = Test"; - List expected1 = Arrays.asList("T", "Test"); - - String value2 = "This 123 is 99 tested 12345 string"; - List expected2 = Arrays.asList("This", "is 99 tested", "string"); - - //when - List actual1 = Rdn.parseRdn("=", value1); - List actual2 = Rdn.parseRdn("[0-9]{3,}", value2); - - //then - assertEquals(expected1, actual1); - assertEquals(expected2, actual2); - } - - @Test - void shouldConvertAoiStringToEnum() throws CertException { - Rdn rdn = new Rdn("CN", "ManagmentCA"); - - assertEquals(BCStyle.CN, rdn.getAoi("CN")); - assertEquals(BCStyle.C, rdn.getAoi("C")); - assertEquals(BCStyle.ST, rdn.getAoi("ST")); - assertEquals(BCStyle.L, rdn.getAoi("L")); - assertEquals(BCStyle.O, rdn.getAoi("O")); - assertEquals(BCStyle.OU, rdn.getAoi("OU")); - assertEquals(BCStyle.DC, rdn.getAoi("DC")); - assertEquals(BCStyle.GIVENNAME, rdn.getAoi("GN")); - assertEquals(BCStyle.SN, rdn.getAoi("SN")); - assertEquals(BCStyle.E, rdn.getAoi("E")); - assertEquals(BCStyle.E, rdn.getAoi("EMAIL")); - assertEquals(BCStyle.E, rdn.getAoi("EMAILADDRESS")); - assertEquals(BCStyle.INITIALS, rdn.getAoi("INITIALS")); - assertEquals(BCStyle.PSEUDONYM, rdn.getAoi("PSEUDONYM")); - assertEquals(BCStyle.GENERATION, rdn.getAoi("GENERATIONQUALIFIER")); - assertEquals(BCStyle.SERIALNUMBER, rdn.getAoi("SERIALNUMBER")); - assertThrows(CertException.class, () -> rdn.getAoi("INVALIDTAG")); - } -} diff --git a/certService/src/test/java/org/onap/aaf/certservice/CertServiceApplicationTests.java b/certService/src/test/java/org/onap/oom/certservice/CertServiceApplicationTests.java similarity index 97% rename from certService/src/test/java/org/onap/aaf/certservice/CertServiceApplicationTests.java rename to certService/src/test/java/org/onap/oom/certservice/CertServiceApplicationTests.java index 0dc60aa5..abbcc3fa 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/CertServiceApplicationTests.java +++ b/certService/src/test/java/org/onap/oom/certservice/CertServiceApplicationTests.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice; +package org.onap.oom.certservice; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/CertificationControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java similarity index 91% rename from certService/src/test/java/org/onap/aaf/certservice/api/CertificationControllerTest.java rename to certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java index 449670c3..abd950e8 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/api/CertificationControllerTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api; +package org.onap.oom.certservice.api; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,14 +32,14 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.CertificationModelFactory; -import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException; -import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; -import org.onap.aaf.certservice.certification.model.CertificationModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.certification.CertificationModelFactory; +import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException; +import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.certification.model.CertificationModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/ReadinessControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java similarity index 95% rename from certService/src/test/java/org/onap/aaf/certservice/api/ReadinessControllerTest.java rename to certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java index d3ed7301..267a281b 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/api/ReadinessControllerTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api; +package org.onap.oom.certservice.api; import static org.assertj.core.api.Assertions.assertThat; @@ -27,7 +27,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfig; +import org.onap.oom.certservice.certification.configuration.CmpServersConfig; import org.springframework.http.HttpStatus; @ExtendWith(MockitoExtension.class) diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/ReloadConfigControllerTest.java similarity index 94% rename from certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java rename to certService/src/test/java/org/onap/oom/certservice/api/ReloadConfigControllerTest.java index 92c18e16..8b367e1a 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/ReloadConfigControllerTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api; +package org.onap.oom.certservice.api; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,8 +30,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfig; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException; +import org.onap.oom.certservice.certification.configuration.CmpServersConfig; +import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdviceTest.java b/certService/src/test/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdviceTest.java similarity index 92% rename from certService/src/test/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdviceTest.java rename to certService/src/test/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdviceTest.java index f3c4ec7f..081a01a0 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdviceTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdviceTest.java @@ -18,17 +18,17 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api.advice; +package org.onap.oom.certservice.api.advice; import com.google.gson.Gson; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException; -import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.ErrorResponseModel; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException; +import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.ErrorResponseModel; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdviceTest.java b/certService/src/test/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdviceTest.java similarity index 94% rename from certService/src/test/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdviceTest.java rename to certService/src/test/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdviceTest.java index 9abecec9..0a339879 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdviceTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdviceTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.api.advice; +package org.onap.oom.certservice.api.advice; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException; +import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationModelFactoryTest.java similarity index 87% rename from certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/CertificationModelFactoryTest.java index a63c8e0e..8d28148b 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationModelFactoryTest.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.configuration.Cmpv2ServerProvider; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException; -import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.model.CertificationModel; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.certification.configuration.Cmpv2ServerProvider; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException; +import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.model.CertificationModel; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; import java.util.Arrays; import java.util.Base64; @@ -46,14 +46,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.onap.aaf.certservice.certification.CertificationData.CA_CERT; -import static org.onap.aaf.certservice.certification.CertificationData.ENTITY_CERT; -import static org.onap.aaf.certservice.certification.CertificationData.INTERMEDIATE_CERT; -import static org.onap.aaf.certservice.certification.CertificationData.EXTRA_CA_CERT; -import static org.onap.aaf.certservice.certification.TestData.TEST_CSR; -import static org.onap.aaf.certservice.certification.TestData.TEST_PK; -import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_CSR; -import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_PEM; +import static org.onap.oom.certservice.certification.CertificationData.CA_CERT; +import static org.onap.oom.certservice.certification.CertificationData.ENTITY_CERT; +import static org.onap.oom.certservice.certification.CertificationData.INTERMEDIATE_CERT; +import static org.onap.oom.certservice.certification.CertificationData.EXTRA_CA_CERT; +import static org.onap.oom.certservice.certification.TestData.TEST_CSR; +import static org.onap.oom.certservice.certification.TestData.TEST_PK; +import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_CSR; +import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_PEM; @ExtendWith(MockitoExtension.class) class CertificationModelFactoryTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationProviderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java similarity index 91% rename from certService/src/test/java/org/onap/aaf/certservice/certification/CertificationProviderTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java index a590c5ea..54744ba0 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationProviderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * AAF Certification Service + * OOM Certification Service * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeEach; @@ -26,12 +26,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.model.CertificationModel; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.api.CmpClient; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.model.CertificationModel; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.api.CmpClient; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; import java.io.IOException; import java.io.InputStream; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/CsrModelFactoryTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/CsrModelFactoryTest.java similarity index 89% rename from certService/src/test/java/org/onap/aaf/certservice/certification/CsrModelFactoryTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/CsrModelFactoryTest.java index d2c3c54c..75a6e81c 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/CsrModelFactoryTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/CsrModelFactoryTest.java @@ -18,23 +18,23 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.util.encoders.Base64; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.CsrModelFactory.StringBase64; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; -import org.onap.aaf.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.certification.CsrModelFactory.StringBase64; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.certification.model.CsrModel; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.onap.aaf.certservice.certification.TestData.TEST_CSR; -import static org.onap.aaf.certservice.certification.TestData.TEST_PK; -import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_CSR; -import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_PEM; +import static org.onap.oom.certservice.certification.TestData.TEST_CSR; +import static org.onap.oom.certservice.certification.TestData.TEST_PK; +import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_CSR; +import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_PEM; class CsrModelFactoryTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/PemObjectFactoryTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/PemObjectFactoryTest.java similarity index 89% rename from certService/src/test/java/org/onap/aaf/certservice/certification/PemObjectFactoryTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/PemObjectFactoryTest.java index 90151b6d..68cfa1a1 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/PemObjectFactoryTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/PemObjectFactoryTest.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.util.io.pem.PemObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.onap.aaf.certservice.certification.TestData.TEST_PEM; -import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_PEM; -import static org.onap.aaf.certservice.certification.TestUtils.pemObjectToString; +import static org.onap.oom.certservice.certification.TestData.TEST_PEM; +import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_PEM; +import static org.onap.oom.certservice.certification.TestUtils.pemObjectToString; class PemObjectFactoryTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/RsaContentSignerBuilderTest.java similarity index 88% rename from certService/src/test/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilderTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/RsaContentSignerBuilderTest.java index 0083968d..eebe1815 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/RsaContentSignerBuilderTest.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.RsaContentSignerBuilder; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.certification.RsaContentSignerBuilder; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.model.CsrModel; import java.io.IOException; import java.security.PrivateKey; import static org.assertj.core.api.Assertions.assertThat; -import static org.onap.aaf.certservice.certification.TestUtils.createCsrModel; +import static org.onap.oom.certservice.certification.TestUtils.createCsrModel; class RsaContentSignerBuilderTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/TestData.java b/certService/src/test/java/org/onap/oom/certservice/certification/TestData.java similarity index 99% rename from certService/src/test/java/org/onap/aaf/certservice/certification/TestData.java rename to certService/src/test/java/org/onap/oom/certservice/certification/TestData.java index 6fea5b5a..81c16128 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/TestData.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/TestData.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; public final class TestData { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/TestUtils.java b/certService/src/test/java/org/onap/oom/certservice/certification/TestUtils.java similarity index 85% rename from certService/src/test/java/org/onap/aaf/certservice/certification/TestUtils.java rename to certService/src/test/java/org/onap/oom/certservice/certification/TestUtils.java index a6e55c57..7c69bd52 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/TestUtils.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/TestUtils.java @@ -18,20 +18,20 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.util.encoders.Base64; import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemWriter; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; -import org.onap.aaf.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.certification.model.CsrModel; import java.io.IOException; import java.io.StringWriter; -import static org.onap.aaf.certservice.certification.TestData.TEST_CSR; -import static org.onap.aaf.certservice.certification.TestData.TEST_PK; +import static org.onap.oom.certservice.certification.TestData.TEST_CSR; +import static org.onap.oom.certservice.certification.TestData.TEST_PK; public final class TestUtils { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/X509CertificateBuilderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java similarity index 92% rename from certService/src/test/java/org/onap/aaf/certservice/certification/X509CertificateBuilderTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java index 067f2f5f..e980aa2c 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/X509CertificateBuilderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification; +package org.onap.oom.certservice.certification; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.cert.X509v3CertificateBuilder; @@ -27,14 +27,14 @@ import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.model.CsrModel; import java.io.IOException; import java.security.PrivateKey; import static org.assertj.core.api.Assertions.assertThat; -import static org.onap.aaf.certservice.certification.TestUtils.createCsrModel; +import static org.onap.oom.certservice.certification.TestUtils.createCsrModel; public class X509CertificateBuilderTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoaderTest.java similarity index 96% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoaderTest.java index 87964295..b755b977 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoaderTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -28,8 +28,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.onap.aaf.certservice.CertServiceApplication; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.CertServiceApplication; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigTest.java similarity index 97% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigTest.java index 511c3966..e938fdde 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -34,9 +34,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.configuration.model.Authentication; -import org.onap.aaf.certservice.certification.configuration.model.CaMode; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.configuration.model.Authentication; +import org.onap.oom.certservice.certification.configuration.model.CaMode; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; @ExtendWith(MockitoExtension.class) class CmpServersConfigTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProviderTest.java similarity index 91% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProviderTest.java index b83fb9aa..dc6de3ba 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProviderTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration; +package org.onap.oom.certservice.certification.configuration; import org.bouncycastle.asn1.x500.X500Name; import org.junit.jupiter.api.BeforeEach; @@ -26,10 +26,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.certification.configuration.model.Authentication; -import org.onap.aaf.certservice.certification.configuration.model.CaMode; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException; +import org.onap.oom.certservice.certification.configuration.model.Authentication; +import org.onap.oom.certservice.certification.configuration.model.CaMode; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException; import java.util.Collections; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java similarity index 94% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java index 6db77753..b07c9035 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java @@ -18,17 +18,17 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation; +package org.onap.oom.certservice.certification.configuration.validation; import org.bouncycastle.asn1.x500.X500Name; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.onap.aaf.certservice.CertServiceApplication; -import org.onap.aaf.certservice.certification.configuration.model.Authentication; -import org.onap.aaf.certservice.certification.configuration.model.CaMode; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.CertServiceApplication; +import org.onap.oom.certservice.certification.configuration.model.Authentication; +import org.onap.oom.certservice.certification.configuration.model.CaMode; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java similarity index 96% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java index 7082626f..5022342f 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java @@ -19,7 +19,7 @@ */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints; +package org.onap.oom.certservice.certification.configuration.validation.constraints; import org.junit.jupiter.api.Test; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java similarity index 97% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java index e729c738..59bf40aa 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations; +package org.onap.oom.certservice.certification.configuration.validation.constraints.violations; import org.junit.jupiter.api.Test; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java similarity index 96% rename from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java index dce66d52..90475f84 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations; +package org.onap.oom.certservice.certification.configuration.validation.constraints.violations; import org.junit.jupiter.api.Test; diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/model/CsrModelTest.java similarity index 92% rename from certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java rename to certService/src/test/java/org/onap/oom/certservice/certification/model/CsrModelTest.java index 08bc3368..7981b271 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/model/CsrModelTest.java @@ -18,17 +18,17 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.certification.model; +package org.onap.oom.certservice.certification.model; import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.util.io.pem.PemObject; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.certification.Pkcs10CertificationRequestFactory; -import org.onap.aaf.certservice.certification.PemObjectFactory; -import org.onap.aaf.certservice.certification.exception.CsrDecryptionException; -import org.onap.aaf.certservice.certification.exception.DecryptionException; -import org.onap.aaf.certservice.certification.exception.KeyDecryptionException; +import org.onap.oom.certservice.certification.Pkcs10CertificationRequestFactory; +import org.onap.oom.certservice.certification.PemObjectFactory; +import org.onap.oom.certservice.certification.exception.CsrDecryptionException; +import org.onap.oom.certservice.certification.exception.DecryptionException; +import org.onap.oom.certservice.certification.exception.KeyDecryptionException; import java.io.IOException; @@ -37,9 +37,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.onap.aaf.certservice.certification.TestData.TEST_CSR; -import static org.onap.aaf.certservice.certification.TestData.TEST_PEM; -import static org.onap.aaf.certservice.certification.TestData.TEST_PK; +import static org.onap.oom.certservice.certification.TestData.TEST_CSR; +import static org.onap.oom.certservice.certification.TestData.TEST_PEM; +import static org.onap.oom.certservice.certification.TestData.TEST_PK; class CsrModelTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/Cmpv2ClientTest.java b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java similarity index 96% rename from certService/src/test/java/org/onap/aaf/certservice/cmpv2client/Cmpv2ClientTest.java rename to certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java index 05bda54b..984e8c77 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/Cmpv2ClientTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java @@ -14,7 +14,7 @@ * limitations under the License */ -package org.onap.aaf.certservice.cmpv2client; +package org.onap.oom.certservice.cmpv2client; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -57,12 +57,12 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.onap.aaf.certservice.certification.configuration.model.Authentication; -import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; -import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.impl.CmpClientImpl; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.certification.configuration.model.Authentication; +import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; +import org.onap.oom.certservice.certification.model.CsrModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.impl.CmpClientImpl; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; class Cmpv2ClientTest { diff --git a/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelperTest.java b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java similarity index 99% rename from certService/src/test/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelperTest.java rename to certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java index c41d6364..6686191f 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelperTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.cmpv2client.impl; +package org.onap.oom.certservice.cmpv2client.impl; import org.bouncycastle.asn1.cmp.CMPCertificate; import org.bouncycastle.asn1.cmp.CertRepMessage; @@ -27,8 +27,8 @@ import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemReader; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel; +import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException; +import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/certService/src/test/resources/application.properties b/certService/src/test/resources/application.properties index b70ab3b4..0bd9b36f 100644 --- a/certService/src/test/resources/application.properties +++ b/certService/src/test/resources/application.properties @@ -1,4 +1,4 @@ -# AAF CertService app specific configuration +# OOM CertService app specific configuration app.config.path=./src/test/resources # Mutual TLS configuration @@ -6,8 +6,8 @@ server.ssl.enabled=true server.ssl.client-auth=need server.port=${HTTPS_PORT:8443} -server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks} +server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/oom/certservice/certs/certServiceServer-keystore.jks} server.ssl.key-store-password=${KEYSTORE_PASSWORD:secret} -server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/aaf/certservice/certs/truststore.jks} +server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/oom/certservice/certs/truststore.jks} server.ssl.trust-store-password=${TRUSTSTORE_PASSWORD:secret} \ No newline at end of file diff --git a/certServiceClient/Dockerfile b/certServiceClient/Dockerfile index 9da47295..f6d96dfd 100644 --- a/certServiceClient/Dockerfile +++ b/certServiceClient/Dockerfile @@ -8,6 +8,6 @@ RUN chown -R certServiceClient:certServiceClient /var/log USER certServiceClient:certServiceClient -COPY target/aaf-certservice-client-${VERSION}.jar ./opt/onap/aaf/certservice/aaf-certservice-client.jar +COPY target/oom-certservice-client-${VERSION}.jar ./opt/onap/oom/certservice/oom-certservice-client.jar -ENTRYPOINT ["java","-jar","./opt/onap/aaf/certservice/aaf-certservice-client.jar"] +ENTRYPOINT ["java","-jar","./opt/onap/oom/certservice/oom-certservice-client.jar"] diff --git a/certServiceClient/README.md b/certServiceClient/README.md index b3005345..277f7a1c 100644 --- a/certServiceClient/README.md +++ b/certServiceClient/README.md @@ -18,7 +18,7 @@ mvn clean install -P docker ### Nexus container image ``` -nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:latest +nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:latest ``` ### Running local client application as standalone docker container @@ -33,11 +33,11 @@ Information how to run you can find in CertService main README and official docu path: ``` -var/log/onap/aaf/certservice-client/certservice-client.log +var/log/onap/oom/certservice-client/certservice-client.log ``` ### Logs in Docker container ``` -docker logs aaf-certservice-client +docker logs oom-certservice-client ``` ###Exit codes ``` diff --git a/certServiceClient/pom.xml b/certServiceClient/pom.xml index e176b18e..c05ecc46 100644 --- a/certServiceClient/pom.xml +++ b/certServiceClient/pom.xml @@ -3,16 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - aaf-certservice - org.onap.aaf.certservice + oom-certservice + org.onap.oom.platform.cert-service 1.2.0-SNAPSHOT 4.0.0 - aaf-certservice-client + oom-certservice-client 1.2.0-SNAPSHOT - aaf-certservice-client - AAF Certification Service Api Client + oom-certservice-client + OOM Certification Service Api Client jar @@ -70,7 +70,7 @@ - org.onap.aaf.certservice.client.MainApp + org.onap.oom.certservice.client.MainApp @@ -125,12 +125,12 @@ ecomp-releases - AAF Release Repository + OOM Release Repository ${nexusproxy}${releaseNexusPath} ecomp-snapshots - AAF Snapshot Repository + OOM Snapshot Repository ${nexusproxy}${snapshotNexusPath} diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/AppExitHandler.java similarity index 91% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/AppExitHandler.java index af30ff3e..16636fa6 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/AppExitHandler.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,9 +17,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; -import org.onap.aaf.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/CertServiceClient.java similarity index 72% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/CertServiceClient.java index 56c355e4..d115380f 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/CertServiceClient.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,34 +17,34 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; -import org.onap.aaf.certservice.client.api.ExitableException; -import org.onap.aaf.certservice.client.certification.ArtifactsCreatorProvider; -import org.onap.aaf.certservice.client.certification.CsrFactory; -import org.onap.aaf.certservice.client.certification.KeyPairFactory; -import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder; -import org.onap.aaf.certservice.client.common.Base64Encoder; -import org.onap.aaf.certservice.client.configuration.EnvsForClient; -import org.onap.aaf.certservice.client.configuration.EnvsForCsr; -import org.onap.aaf.certservice.client.configuration.EnvsForTls; -import org.onap.aaf.certservice.client.configuration.factory.ClientConfigurationFactory; -import org.onap.aaf.certservice.client.configuration.factory.CsrConfigurationFactory; -import org.onap.aaf.certservice.client.configuration.factory.SslContextFactory; -import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; -import org.onap.aaf.certservice.client.httpclient.CloseableHttpsClientProvider; -import org.onap.aaf.certservice.client.httpclient.HttpClient; -import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse; +import org.onap.oom.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.certification.ArtifactsCreatorProvider; +import org.onap.oom.certservice.client.certification.CsrFactory; +import org.onap.oom.certservice.client.certification.KeyPairFactory; +import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder; +import org.onap.oom.certservice.client.common.Base64Encoder; +import org.onap.oom.certservice.client.configuration.EnvsForClient; +import org.onap.oom.certservice.client.configuration.EnvsForCsr; +import org.onap.oom.certservice.client.configuration.EnvsForTls; +import org.onap.oom.certservice.client.configuration.factory.ClientConfigurationFactory; +import org.onap.oom.certservice.client.configuration.factory.CsrConfigurationFactory; +import org.onap.oom.certservice.client.configuration.factory.SslContextFactory; +import org.onap.oom.certservice.client.configuration.model.ClientConfiguration; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.httpclient.CloseableHttpsClientProvider; +import org.onap.oom.certservice.client.httpclient.HttpClient; +import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.net.ssl.SSLContext; import java.security.KeyPair; -import static org.onap.aaf.certservice.client.api.ExitStatus.SUCCESS; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.KEY_SIZE; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM; +import static org.onap.oom.certservice.client.api.ExitStatus.SUCCESS; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.KEY_SIZE; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM; public class CertServiceClient { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/MainApp.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/MainApp.java similarity index 94% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/MainApp.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/MainApp.java index 6a29241f..e0d0fec1 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/MainApp.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/MainApp.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; public class MainApp { public static void main(String[] args) { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/api/ExitStatus.java similarity index 96% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/api/ExitStatus.java index a84485eb..1b1cc066 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/api/ExitStatus.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.api; +package org.onap.oom.certservice.client.api; public enum ExitStatus { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitableException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/api/ExitableException.java similarity index 94% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitableException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/api/ExitableException.java index 3a7a542b..ab7a308b 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitableException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/api/ExitableException.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.api; +package org.onap.oom.certservice.client.api; public abstract class ExitableException extends Exception { public ExitableException(Throwable cause) { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProvider.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProvider.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProvider.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProvider.java index 954f3d30..dabd808d 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProvider.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProvider.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; -import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreator; -import org.onap.aaf.certservice.client.certification.conversion.ConvertedArtifactsCreatorFactory; -import org.onap.aaf.certservice.client.certification.conversion.PemArtifactsCreator; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.certification.conversion.ArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.ConvertedArtifactsCreatorFactory; +import org.onap.oom.certservice.client.certification.conversion.PemArtifactsCreator; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; public enum ArtifactsCreatorProvider { P12("PKCS12") { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/CsrFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/CsrFactory.java similarity index 90% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/CsrFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/CsrFactory.java index 0faf5cab..ac517be4 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/CsrFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/CsrFactory.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.asn1.x509.Extension; @@ -31,8 +31,8 @@ import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; -import org.onap.aaf.certservice.client.certification.exception.CsrGenerationException; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.certification.exception.CsrGenerationException; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,13 +42,13 @@ import java.io.StringWriter; import java.security.KeyPair; import java.util.Optional; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.COMMON_NAME; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.COUNTRY; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.LOCATION; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION_UNIT; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.SIGN_ALGORITHM; -import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.STATE; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.COMMON_NAME; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.COUNTRY; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.LOCATION; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION_UNIT; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.SIGN_ALGORITHM; +import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.STATE; public class CsrFactory { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/EncryptionAlgorithmConstants.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/EncryptionAlgorithmConstants.java similarity index 94% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/EncryptionAlgorithmConstants.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/EncryptionAlgorithmConstants.java index 63ede568..cbd05e51 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/EncryptionAlgorithmConstants.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/EncryptionAlgorithmConstants.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; public final class EncryptionAlgorithmConstants { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/KeyPairFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/KeyPairFactory.java similarity index 94% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/KeyPairFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/KeyPairFactory.java index e997cd0d..d0c56139 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/KeyPairFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/KeyPairFactory.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,9 +17,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; -import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException; +import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoder.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoder.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoder.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoder.java index fa6485e5..7d94bd23 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoder.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoder.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.bouncycastle.openssl.jcajce.JcaPEMWriter; import org.bouncycastle.util.io.pem.PemObject; -import org.onap.aaf.certservice.client.certification.exception.PkEncodingException; +import org.onap.oom.certservice.client.certification.exception.PkEncodingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreator.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ArtifactsCreator.java similarity index 88% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreator.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ArtifactsCreator.java index 428b85aa..4098b37b 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreator.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ArtifactsCreator.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,9 +17,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitableException; import java.security.PrivateKey; import java.util.List; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreator.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreator.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreator.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreator.java index 4826732c..8c7c679b 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreator.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreator.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,11 +17,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; -import org.onap.aaf.certservice.client.certification.exception.PemConversionException; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.PemConversionException; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java similarity index 90% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java index bda796eb..183e66bc 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,9 +17,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; public class ConvertedArtifactsCreatorFactory { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/Password.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/Password.java similarity index 94% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/Password.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/Password.java index 6ea1a219..7a8d5c3d 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/Password.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/Password.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; class Password { // We are excluding this line in Sonar due to fact that diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreator.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreator.java similarity index 88% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreator.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreator.java index 4bec222f..0136e796 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreator.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreator.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; -import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; -import org.onap.aaf.certservice.client.certification.exception.PkEncodingException; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.PkEncodingException; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemConverter.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/PemConverter.java similarity index 97% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemConverter.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/PemConverter.java index 5e82c177..b8f6719c 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemConverter.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/PemConverter.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openssl.PEMParser; -import org.onap.aaf.certservice.client.certification.exception.PemConversionException; +import org.onap.oom.certservice.client.certification.exception.PemConversionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGenerator.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGenerator.java similarity index 95% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGenerator.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGenerator.java index 8ad85d2c..c65aa21d 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGenerator.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGenerator.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.apache.commons.lang3.RandomStringUtils; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/StoreEntryOperation.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/StoreEntryOperation.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/StoreEntryOperation.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/StoreEntryOperation.java index 7a41d1fe..aea6a7f5 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/StoreEntryOperation.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/conversion/StoreEntryOperation.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import java.io.IOException; import java.security.KeyStore; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertFileWriterException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/CertFileWriterException.java similarity index 85% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertFileWriterException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/CertFileWriterException.java index 7912f6d7..2cbf330b 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertFileWriterException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/CertFileWriterException.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.exception; +package org.onap.oom.certservice.client.certification.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class CertFileWriterException extends ExitableException { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CsrGenerationException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/CsrGenerationException.java similarity index 85% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CsrGenerationException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/CsrGenerationException.java index ba501cd6..edf13570 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CsrGenerationException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/CsrGenerationException.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.exception; +package org.onap.oom.certservice.client.certification.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class CsrGenerationException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.CSR_GENERATION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/KeyPairGenerationException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/KeyPairGenerationException.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/KeyPairGenerationException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/KeyPairGenerationException.java index 11030ff3..fc344d4d 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/KeyPairGenerationException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/KeyPairGenerationException.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.exception; +package org.onap.oom.certservice.client.certification.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class KeyPairGenerationException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.KEY_PAIR_GENERATION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PemConversionException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/PemConversionException.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PemConversionException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/PemConversionException.java index cad3388b..17928350 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PemConversionException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/PemConversionException.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.exception; +package org.onap.oom.certservice.client.certification.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class PemConversionException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.PEM_CONVERSION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PkEncodingException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/PkEncodingException.java similarity index 85% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PkEncodingException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/PkEncodingException.java index 89976bf3..c0b8ebdc 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PkEncodingException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/exception/PkEncodingException.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.exception; +package org.onap.oom.certservice.client.certification.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class PkEncodingException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.PK_TO_PEM_ENCODING_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriter.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/writer/CertFileWriter.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriter.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/writer/CertFileWriter.java index fec3ebd3..0e6d0508 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriter.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/certification/writer/CertFileWriter.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,9 +17,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.writer; +package org.onap.oom.certservice.client.certification.writer; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/common/Base64Encoder.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/common/Base64Encoder.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/common/Base64Encoder.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/common/Base64Encoder.java index bfa43071..ddb9c7b8 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/common/Base64Encoder.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/common/Base64Encoder.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.common; +package org.onap.oom.certservice.client.common; import org.bouncycastle.util.encoders.Base64; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/ClientConfigurationEnvs.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/ClientConfigurationEnvs.java similarity index 92% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/ClientConfigurationEnvs.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/ClientConfigurationEnvs.java index f8a0e91a..c29f5d97 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/ClientConfigurationEnvs.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/ClientConfigurationEnvs.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; public enum ClientConfigurationEnvs { REQUEST_URL, diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/CsrConfigurationEnvs.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/CsrConfigurationEnvs.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/CsrConfigurationEnvs.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/CsrConfigurationEnvs.java index d1cfcd5a..27b4aa22 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/CsrConfigurationEnvs.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/CsrConfigurationEnvs.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; public enum CsrConfigurationEnvs { COMMON_NAME, diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvProvider.java similarity index 94% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvProvider.java index 15339bbd..b86b0eca 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvProvider.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.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/oom/certservice/client/configuration/EnvsForClient.java similarity index 95% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForClient.java index 9321964c..26d508fe 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForClient.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.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/oom/certservice/client/configuration/EnvsForCsr.java similarity index 96% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForCsr.java index 9a892b24..5873bf10 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForCsr.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import java.util.Optional; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForTls.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForTls.java similarity index 95% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForTls.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForTls.java index 55b536a7..8e1333e6 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForTls.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/EnvsForTls.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import java.util.Optional; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/TlsConfigurationEnvs.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/TlsConfigurationEnvs.java similarity index 92% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/TlsConfigurationEnvs.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/TlsConfigurationEnvs.java index 4009a088..de5050b5 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/TlsConfigurationEnvs.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/TlsConfigurationEnvs.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; public enum TlsConfigurationEnvs { KEYSTORE_PATH, diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/ClientConfigurationException.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/ClientConfigurationException.java index ea280736..b75c9e13 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/ClientConfigurationException.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.exception; +package org.onap.oom.certservice.client.configuration.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class ClientConfigurationException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.CLIENT_CONFIGURATION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/CsrConfigurationException.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/CsrConfigurationException.java index cf785a71..85fda772 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/CsrConfigurationException.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.exception; +package org.onap.oom.certservice.client.configuration.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class CsrConfigurationException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.CSR_CONFIGURATION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationException.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationException.java index 91f164e3..6372c0b6 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationException.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.exception; +package org.onap.oom.certservice.client.configuration.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class TlsConfigurationException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.TLS_CONFIGURATION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactory.java similarity index 89% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactory.java index 24ed8b0d..293ac2d1 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactory.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; -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; +import org.onap.oom.certservice.client.certification.ArtifactsCreatorProvider; +import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException; +import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException; +import org.onap.oom.certservice.client.configuration.model.ConfigurationModel; import java.util.Arrays; import java.util.Locale; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java similarity index 89% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java index d8498d84..17cb2cc4 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; -import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.EnvsForClient; -import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException; -import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration; +import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.EnvsForClient; +import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException; +import org.onap.oom.certservice.client.configuration.model.ClientConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactory.java similarity index 89% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactory.java index 1d4cf2b2..0a88252c 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactory.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; -import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.EnvsForCsr; -import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.EnvsForCsr; +import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactory.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactory.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactory.java index 7da8fa58..9fac626e 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactory.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.apache.http.ssl.SSLContexts; -import org.onap.aaf.certservice.client.configuration.EnvsForTls; -import org.onap.aaf.certservice.client.configuration.TlsConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException; +import org.onap.oom.certservice.client.configuration.EnvsForTls; +import org.onap.oom.certservice.client.configuration.TlsConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.exception.TlsConfigurationException; import javax.net.ssl.SSLContext; import java.io.File; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/ClientConfiguration.java similarity index 92% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/ClientConfiguration.java index 78fa1b4b..cd8a5c1e 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/ClientConfiguration.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.model; +package org.onap.oom.certservice.client.configuration.model; -import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs; public class ClientConfiguration implements ConfigurationModel { private static final Integer DEFAULT_TIMEOUT_MS = 30000; - private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/"; + private static final String DEFAULT_REQUEST_URL = "https://oom-cert-service:8443/v1/certificate/"; private static final String DEFAULT_OUTPUT_TYPE = "P12"; private String urlToCertService; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/ConfigurationModel.java similarity index 91% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/ConfigurationModel.java index 15c22233..2c058d74 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/ConfigurationModel.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.model; +package org.onap.oom.certservice.client.configuration.model; public interface ConfigurationModel { } diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/CsrConfiguration.java similarity index 95% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/CsrConfiguration.java index 55f33c9f..c5aefd97 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/model/CsrConfiguration.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.model; +package org.onap.oom.certservice.client.configuration.model; -import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs; public class CsrConfiguration implements ConfigurationModel { diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/CloseableHttpsClientProvider.java similarity index 96% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/CloseableHttpsClientProvider.java index 3b7a46ab..6b6690b6 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/CloseableHttpsClientProvider.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient; +package org.onap.oom.certservice.client.httpclient; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/HttpClient.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/HttpClient.java index 0780afad..7dba6b59 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/HttpClient.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient; +package org.onap.oom.certservice.client.httpclient; import com.google.gson.Gson; import org.apache.http.HttpEntity; @@ -27,10 +27,10 @@ import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.onap.aaf.certservice.client.httpclient.exception.CertServiceApiResponseException; -import org.onap.aaf.certservice.client.httpclient.exception.HttpClientException; -import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse; -import org.onap.aaf.certservice.client.httpclient.model.ErrorCertServiceResponse; +import org.onap.oom.certservice.client.httpclient.exception.CertServiceApiResponseException; +import org.onap.oom.certservice.client.httpclient.exception.HttpClientException; +import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse; +import org.onap.oom.certservice.client.httpclient.model.ErrorCertServiceResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/exception/CertServiceApiResponseException.java similarity index 87% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/exception/CertServiceApiResponseException.java index ad5a5f1c..30ca0db3 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/exception/CertServiceApiResponseException.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient.exception; +package org.onap.oom.certservice.client.httpclient.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class CertServiceApiResponseException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.CERT_SERVICE_API_CONNECTION_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/exception/HttpClientException.java similarity index 86% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/exception/HttpClientException.java index e9f0f0ad..ff286619 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/exception/HttpClientException.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient.exception; +package org.onap.oom.certservice.client.httpclient.exception; -import org.onap.aaf.certservice.client.api.ExitStatus; -import org.onap.aaf.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitableException; public class HttpClientException extends ExitableException { private static final ExitStatus EXIT_STATUS = ExitStatus.HTTP_CLIENT_EXCEPTION; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/CertServiceResponse.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/model/CertServiceResponse.java similarity index 95% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/CertServiceResponse.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/model/CertServiceResponse.java index 4ca17999..453dfd53 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/CertServiceResponse.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/model/CertServiceResponse.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient.model; +package org.onap.oom.certservice.client.httpclient.model; import java.util.Collections; import java.util.List; diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/model/ErrorCertServiceResponse.java similarity index 93% rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/model/ErrorCertServiceResponse.java index 4a9efcb4..2304ddcd 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/httpclient/model/ErrorCertServiceResponse.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient.model; +package org.onap.oom.certservice.client.httpclient.model; public class ErrorCertServiceResponse { diff --git a/certServiceClient/src/main/resources/log4j2.xml b/certServiceClient/src/main/resources/log4j2.xml index bf4b6239..a641a4e0 100644 --- a/certServiceClient/src/main/resources/log4j2.xml +++ b/certServiceClient/src/main/resources/log4j2.xml @@ -8,7 +8,7 @@ pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} %style{%pid}{magenta} [%15.15t] %style{%-40.40C{1.}}{cyan} : %m%n%throwable"/> - diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CerServiceRequestTestData.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CerServiceRequestTestData.java similarity index 97% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/CerServiceRequestTestData.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/CerServiceRequestTestData.java index 8f252c31..0e5ec191 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CerServiceRequestTestData.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CerServiceRequestTestData.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CertServiceClientTest.java similarity index 90% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/CertServiceClientTest.java index 9e256f98..0a5806fd 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CertServiceClientTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -26,8 +26,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verify; -import static org.onap.aaf.certservice.client.api.ExitStatus.CLIENT_CONFIGURATION_EXCEPTION; -import static org.onap.aaf.certservice.client.api.ExitStatus.SUCCESS; +import static org.onap.oom.certservice.client.api.ExitStatus.CLIENT_CONFIGURATION_EXCEPTION; +import static org.onap.oom.certservice.client.api.ExitStatus.SUCCESS; @ExtendWith(MockitoExtension.class) class CertServiceClientTest { diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProviderTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProviderTest.java similarity index 90% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProviderTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProviderTest.java index 46bacef8..503ed70f 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProviderTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProviderTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,15 +17,15 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; -import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreator; -import org.onap.aaf.certservice.client.certification.conversion.ConvertedArtifactsCreator; -import org.onap.aaf.certservice.client.certification.conversion.PemArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.ArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.ConvertedArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.PemArtifactsCreator; import static org.assertj.core.api.Assertions.assertThat; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/CsrFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/CsrFactoryTest.java similarity index 88% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/CsrFactoryTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/CsrFactoryTest.java index ae18e6fb..e2bfa976 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/CsrFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/CsrFactoryTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.CsrGenerationException; -import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.certification.exception.CsrGenerationException; +import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; import java.security.KeyPair; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/KeyPairFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/KeyPairFactoryTest.java similarity index 93% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/KeyPairFactoryTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/KeyPairFactoryTest.java index 3d3d3c17..765a58ca 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/KeyPairFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/KeyPairFactoryTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException; +import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException; import java.security.KeyPair; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoderTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoderTest.java similarity index 95% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoderTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoderTest.java index 41f15bb7..6424611e 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoderTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoderTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemReader; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.PkEncodingException; +import org.onap.oom.certservice.client.certification.exception.PkEncodingException; import java.io.IOException; import java.io.StringReader; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java similarity index 95% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java index e13f8be8..3a4d3419 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; -import org.onap.aaf.certservice.client.certification.exception.PemConversionException; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.PemConversionException; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; import java.security.PrivateKey; import java.util.List; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreatorTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreatorTest.java similarity index 89% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreatorTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreatorTest.java index 5e79b96f..fd6d95c5 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreatorTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreatorTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.api.ExitableException; -import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; import java.security.PrivateKey; import java.util.List; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemConverterTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemConverterTest.java similarity index 97% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemConverterTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemConverterTest.java index e3a58c3f..c5adec08 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemConverterTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemConverterTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,14 +17,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants; -import org.onap.aaf.certservice.client.certification.exception.PemConversionException; +import org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants; +import org.onap.oom.certservice.client.certification.exception.PemConversionException; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java similarity index 93% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java index 483e35e0..3457f32a 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriterTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/writer/CertFileWriterTest.java similarity index 94% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriterTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/writer/CertFileWriterTest.java index c45876ec..11259368 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriterTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/writer/CertFileWriterTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.writer; +package org.onap.oom.certservice.client.certification.writer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; import java.io.File; import java.io.IOException; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvProviderTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvProviderTest.java similarity index 96% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvProviderTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvProviderTest.java index 74c8c2a1..3181ec9f 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvProviderTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvProviderTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForCsrTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java similarity index 98% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForCsrTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java index d6af20c6..ade13f75 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForCsrTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForTlsTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForTlsTest.java similarity index 98% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForTlsTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForTlsTest.java index 7f599aa5..54ed56b7 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForTlsTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForTlsTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java similarity index 91% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java index e9e5c3bf..6ebc3f2a 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.exception; +package org.onap.oom.certservice.client.configuration.exception; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitStatus; import static org.assertj.core.api.Assertions.assertThat; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java similarity index 97% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java index e4d71b31..e55e55b6 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java similarity index 92% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java index 20a6c7ef..44827494 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.EnvsForClient; -import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException; -import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration; +import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.EnvsForClient; +import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException; +import org.onap.oom.certservice.client.configuration.model.ClientConfiguration; import java.util.Optional; @@ -35,13 +35,13 @@ import static org.mockito.Mockito.when; public class ClientConfigurationFactoryTest { - private static final String CA_NAME_VALID = "caaaftest2"; + private static final String CA_NAME_VALID = "catest2"; private static final String TIME_OUT_VALID = "30000"; - private static final String OUTPUT_PATH_VALID = "/opt/app/osaaf"; + private static final String OUTPUT_PATH_VALID = "/opt/app/oom"; private static final String URL_TO_CERT_SERVICE_VALID = "https://cert-service:8443/v1/certificate/"; - private static final String URL_TO_CERT_SERVICE_DEFAULT = "https://aaf-cert-service:8443/v1/certificate/"; - private static final String CA_NAME_INVALID = "caaaftest2#$"; - private static final String OUTPUT_PATH_INVALID = "/opt//app/osaaf"; + private static final String URL_TO_CERT_SERVICE_DEFAULT = "https://oom-cert-service:8443/v1/certificate/"; + private static final String CA_NAME_INVALID = "catest2#$"; + private static final String OUTPUT_PATH_INVALID = "/opt//app/oom"; private static final String OUTPUT_TYPE_VALID = "JKS"; private static final String OUTPUT_TYPE_INVALID = "JKSS"; private static final String OUTPUT_TYPE_DEFAULT = "P12"; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java similarity index 94% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java index b9b9b078..e27cb57a 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.assertj.core.api.Condition; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.EnvsForCsr; -import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.EnvsForCsr; +import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; import java.util.Optional; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.onap.aaf.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION; +import static org.onap.oom.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION; public class CsrConfigurationFactoryTest { diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactoryTest.java similarity index 97% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactoryTest.java index 8e6e8369..923bc18d 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.client.configuration.EnvsForTls; -import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException; +import org.onap.oom.certservice.client.configuration.EnvsForTls; +import org.onap.oom.certservice.client.configuration.exception.TlsConfigurationException; import javax.net.ssl.SSLContext; import java.util.Optional; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/httpclient/HttpClientTest.java similarity index 88% rename from certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/httpclient/HttpClientTest.java index a109749b..553de25c 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/httpclient/HttpClientTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient; +package org.onap.oom.certservice.client.httpclient; import org.apache.http.HttpEntity; import org.apache.http.StatusLine; @@ -27,9 +27,9 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.httpclient.exception.CertServiceApiResponseException; -import org.onap.aaf.certservice.client.httpclient.exception.HttpClientException; -import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse; +import org.onap.oom.certservice.client.httpclient.exception.CertServiceApiResponseException; +import org.onap.oom.certservice.client.httpclient.exception.HttpClientException; +import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -42,13 +42,13 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CA_NAME; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CORRECT_RESPONSE; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CSR; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_CERTIFICATE_CHAIN; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_TRUSTED_CERTIFICATES; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.MISSING_PK_RESPONSE; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.PK; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.CA_NAME; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.CORRECT_RESPONSE; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.CSR; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_CERTIFICATE_CHAIN; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_TRUSTED_CERTIFICATES; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.MISSING_PK_RESPONSE; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.PK; class HttpClientTest { diff --git a/certs/Makefile b/certs/Makefile index de797a53..3dcb9cda 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -64,7 +64,7 @@ step_8: #Generate certService private and public keys step_9: @echo "Generate certService private and public keys" - keytool -genkeypair -v -alias aaf-cert-service -keyalg RSA -keysize 2048 -validity 365 \ + keytool -genkeypair -v -alias oom-cert-service -keyalg RSA -keysize 2048 -validity 365 \ -keystore certServiceServer-keystore.jks -storetype JKS \ -dname "CN=onap.org,OU=ONAP,O=Linux-Foundation,L=San-Francisco,ST=California,C=US" \ -keypass secret -storepass secret -ext BasicConstraints:critical="ca:false" @@ -73,7 +73,7 @@ step_9: #Generate certificate signing request for certService step_10: @echo "Generate certificate signing request for certService" - keytool -certreq -keystore certServiceServer-keystore.jks -alias aaf-cert-service -storepass secret -file certServiceServer.csr + keytool -certreq -keystore certServiceServer-keystore.jks -alias oom-cert-service -storepass secret -file certServiceServer.csr @echo "####done####" #Sign certService certificate by root CA @@ -81,7 +81,7 @@ step_11: @echo "Sign certService certificate by root CA" keytool -gencert -v -validity 365 -keystore root-keystore.jks -storepass secret -alias root \ -infile certServiceServer.csr -outfile certServiceServerByRoot.crt -rfc -ext bc=0 \ - -ext ExtendedkeyUsage="serverAuth,clientAuth" -ext SubjectAlternativeName:="DNS:aaf-cert-service,DNS:localhost" + -ext ExtendedkeyUsage="serverAuth,clientAuth" -ext SubjectAlternativeName:="DNS:oom-cert-service,DNS:localhost" @echo "####done####" #Import root certificate into server @@ -93,7 +93,7 @@ step_12: #Import signed certificate into certService step_13: @echo "Import signed certificate into certService" - keytool -importcert -file certServiceServerByRoot.crt -destkeystore certServiceServer-keystore.jks -alias aaf-cert-service \ + keytool -importcert -file certServiceServerByRoot.crt -destkeystore certServiceServer-keystore.jks -alias oom-cert-service \ -storepass secret -noprompt @echo "####done####" diff --git a/certs/certServiceClient-keystore.jks b/certs/certServiceClient-keystore.jks index e7da9a7d44e5825788e3cedb680ba21ea3182eaa..d91daa6ea4c62d77d4c25c5981710593e6ec4038 100644 GIT binary patch delta 3325 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 HeO=GEg{v|- delta 3326 zcmV#QUuLyxg(Z?a0_j_K1;8nAJrPLp|Ub;FlcfICPM-spRvjk7tW6YcUA|n>Nb=* z_MA?Ool`u!mB=AntZ-qkZ2B{iYbnmq6_UTi^Q2*y;Zuo3G=FCF3Px6C7?j}#i6lWy zp!lk8!>?eNb9{4KM94IE$?;8(sHTRIb2?hYmL32nC2zv^y2CkY15<+o2#mG*D~ot- zV-_9->()8${Dp!xETj=?uMq6zOCe*!>xu}T_*L{dRa?S46OYv(Igt>y_j~;ibKct- zuMTPTNWn+8;(wyq2W|Xo;AVN51=G@L1`hFkd()%SN%fzW;jTGMSIDb(91|8+Mf>>V zRVS`qZISwS>u8byBIY_qYarmQe&aVl2B{tT9c33eCK^*Ag~P!i;&{*W45+-~5{vn= z@O1toGslACtiQv7_|;@5vhxkYoj4^~B6gRT@94EIDSwQBm1Xew-{)e*?4H~#UCYT8 zm82chd2yJK4Rh|s&Tz_TM=J~Q24QRZljM5{Xv{0-x2IPal>usJe1sx&4k3*%PJ+Vl zWQcxHdK4Lxt1y{Vv9ba`4Gpz+1LI8?j~LY?k58UK3J!dL(UKB~J`a-E|3C7#5`Mn5 z5V5Pm*MEJJmuxbOG>nJg&v{3wzUV?uA^M79$($91@ATcra34P=@B0M|3$9@c$w@2h ziu{hlb8?RsTc)q_xQ4BVgRp>E5X(5)f9^Iot!YkJQxk6zi0`%sA~dWLYHG%^C^&|1 z7sd{4ld(_Samchm>1_iKhXO%ywTk(;Ie`o;qFIm zUlKM@TXzZwO`~i7hqb0t;u^%pYPHJ z?&F-j%yV#mM$w!A+sd&nupX4np} zw#O~?gUA@WjSTd;a87JnV4>s+iAACj@XVCq=@}DJ+pgGg_>xwXim%s4O+%3dTz|n` zQKezISn`j699DG?v`@Bwd=^_mnM#9!wnPeoegcs6kU&z)f&>t_77q^9FIH{X6iPsa zD1fx1$+Oq?hhOyC~lt-DtxI`q~b~k#O9)+jYmxz=Xx+)=; zAce}OV4phtCPK-G`@bG#!E3cN|FJqQcDd1U@U3!}*34MGEHbraJ|w43uJqErT9@#a zi;xOsg=?BQgVRK$4z!}=_hxbHcHfHTfj^LeGHZ@zx`uAlqfaNig?;+$2ov-T^$@Z# zLt=W~v1r?@jH_*E-;*x|9t3+@gsqcN1&|mpIWRadG%+_?7Y#BoFgGwcFgP$YF*jP1 zU{?>wv@>UgP5y0*aQsosD%!?{*TV=5 zP5#~1T4%`TEde4#$mosiYQ#nWt5SUFIMaNg=x+;P5Gt_nvtE%I z2#byHuRxoix`{_BIu_1a+qgEjIshm#ORc%mX{2hlePvgk-@(ak89G@H@PCgh3#S(< zP=>}T*dYP~0RRD`axic(9R>qc9S#H*1Qdh#6vZ>}-yKykoA!!VIS~3ke6W+d2OboC z|BsTNbjh1ou-nBN8oEdqOZoki?FTb|Z)oxhz@H*7KzG}uR`be`?fr%j_b@Tpm*!OO zKN>X#w0Z{QS#XW8Ef`(-J`&U=C2iSu@==RKAMqQz_sa`EiesIkaq~d(dGx6f6;{@T ziXFdU_}hx+MS8J=Rj}q5XOJM7YlLU-fEV+pGuIEhR%*LY9ja%k@CnmsX~+(L_DV`U zw}qk7UHJmlL(@mjn_YS?8Hk!n=d|!f)QiT>W^x2c1}9g(byq|3p2MiWZE;0gSdVO# zz4k<>IDaAHl=LRFy*(i47gG)mb1srTw=@%@o}faFr#xdh3J!W?(&aMla5FwM9{kG4 z!PIAGHqziBxDLSMwF{Sl!K9*peF(xedKp1&uyyDYFmg>m?exdQ)9dg21D^PT+Ckf> zOcdu-T{Nl(^p)=#GLs$RA?A~l@RQERym$7*n|^L2dQ=GPIvX zCxx4EhwQJXUhE1@=3$D})^;(A|XMqZNarJr`=}!$kpGZ=O%<2Ap1o&aUhfI3plj*0kAwCe! zZUw$)fMtOKIO({{T(rPa%ft++$j?_$$A~)iZ+xG0#@iX`dJVIm>D@!vbUDfq-D3IU zf03%b=?|Qkefx*=L}H!wFa zI50FZHCmHk1$vWU3m|`_#p!(;Z%2bKW9`8Z&=I9Rv;DJFh1>w%?f!a=IM8?a#Ztq1 z>^8oa(Cxo1a#I86PQB!=mChdo3Z`2w1T!dWMzTg4l%}4axht;!I0hu-2z#?-CLcv@ zhw5t`Cmio8w+DWCH3F(k6@1}Yq%m+uw5;!Te*0boo5bK2A}oJSP*v8(zr_`cPtr?D zsq50zB2bsGJF5ax$gKHJXY5 zzpoIwjpb(Ef^Om{V+^SESEIwoOLLCJkQUQE%d8-G-wMXxw3v0bnU-|;+i#Fwx*Ik5M`U_DCKZRJpHXZTfMwR27O^7C8Uvn6U1-+!KPecF zqv-HGSpHLz4Cpu81D5AOdTp3D%Oo=u?LI!h4=ek=Z^VDcM3`i4b}w)W1491%<)!Fp zttM6vvI6}2c8c7DnH7nnuToQG_%lr?Vq4Y~oGD_|)hb8qk5E|#1``oP&d4}g{e-M) zXq_q^a0$L3&9|C=--K%LzgqupURFo%x#o2U0kiV6J@P_>C6y}y1nO=|z>A|&kf{fd z#&qx(64C_F2sTTTfDIHBegBV=pLEHaSg_m08XCGt7fbp5lc)_Pe*tX3Ll}u~?beBT z)eAr#Lt%lQJ;^m1|KLAU-g_z0(2Gsx2!?qa9O z9WOub!7mH8lFnpwPRoqDyiQ;!oX&wTl+Bo+TXl66t@`)65ttKSFjAYoZKJVw9W5Pa zG+Gd>aySjnG*Q#Ee`pi>?)>Lki9+*L!85JrfV=$meKGEG_sb}P`qI^M=8jW|A*lU8@{(4{be1g;0g&AF)x9|s$(y#J1PEW%NAI= zBi+$t#y4q663-*P^@F>FG5z8t$rlg`cqHMj`TPg5xd(Z6K&Ihg4q z%+}+S+aSP`WVvvnO^$f|EPqH?cpbZ4d%{?N&W9@k<5!j5{67lp_ zU}sEv2SW07vI0kTM7Va}2n_rB;m+rEvY-7s)%m8WV}81(iH>^Jn z9)R@^yyJ%bGX!K-!JGjA79b)5bd2C;1uL=wK|lp2ULcSK0Ez%DfkV0sJnD>P*8hIS zwpA2~5$KHIH(0j)IYpG$o5zlypWlUptd>3-y(R)gNw+Hd zq&kBR`j-#fMIun|%!E|Ug=a~3k0#u`YY)E1Qr$xblEp55325MbDLeA*G?Gs-Sk<}+ zKx9*;zc04Ecc9+7P+B1==fWkT3g8CX1G7<&g2pO zjxG;$YDcZEysPKY;m%P>FeG|v2@fz0;naWhZyW>nJ&e8Lr0DGW&kyHPqm)EMi5RHVNjd-1%#P_0H=IItv#gFri zx;l`1Lxg>riBq-3)(c|lFE%?&`W=5{cspV9uohg(Mz<)hQ6T2l|yw&wZi(uv?y^6) zxmdM3cm^&lO2tE;|JdT6OzX3>Q~Y#n{@Byo*KPg@un&?R%|}d!4rE?IU*IwEwd-J% zL)DQFFKhAL*OEDL!j{gSupB=!nrV{K8RwHdkXze&yI3CH3p3bLo|{eQ9(83B6jdPE zwQnvI0B=J&MuIrE0O<^IXF;(u1{aIal1O+PUMo4R{J!arXn)-#uFi5<{mSQ-VpU}k zHIiDGl`RQ-5h7}`xhZUJPwzC9Ad2;|j6w9gk8ZrA;}l}BO=Zn=C$6%JhrW@nFr}By zK@u$Wu3B=*e|;h#L)Zc z=e7Na5Sv7LARgM4(@A}LgtIl3#hV!VjJnywn(mE<5<%5?e+qRsJ?V>6Cdv{R8*^ai zT5hpP7Qv-2(`~w`FnG13$h>=ZaCZ=(V>4_`lPpLiVctAjmQ)eCA;PSe) zzcw@yULBq0IgH|%$$a>=s;O%Yj5&AAWv9%4E)&U9@VJ=je|3it>~;UmV8+tX&}ANp z3yS10x)qg@KlMHqR!-C)%t#r!+1qy`cSWE04{Y=w?Ccp#{$h$Yr>5ZLO zhN*Pde4rp$#6fKAiis3&aFUSP1yyxbwe#m41i92y5nBJP6c?6Y3XWBh7~v26pkLL+ zjM|VL0iFV}iAVmkU_cjfL5>47e zS6FTj+E!v#Fb{^qUF#>HKx6*H&?gR2e^G&!}3A^5kQB?fF} zT|Ljw&g#1T6L%rlV8U&ZBe`Nf?yyagx|HHnM&Wy)`3(5Kdf3f6fj5`2^X$Dz5n)#+LM%`VDqO>_;MZh8wcwCJR=4h z{c_!6To);{wH@!))03<_Vfv4Ckn_7_hW(mzaYb2fA>Z!oD`^%+J=!o*FMv2Q^}UHt zSHc&4M_51f3Jf!^%QfI`N5a!Idal{%NgZP^G|9q`F*By4x_+s2YUC4*L8%5&qvQ^j zx+hTaGdk0uuqf)JR`IiU>DOk=2=E-y_P_aD!3)Qe9Y3xcA%cxKkD%gDEJ*Di*j|Jg zx7N=$n-PbC>{WLrIvtRkQpBcHsQ&I7V;{x4)*nJhxge6R52WZa&+fH*r#-;5gdWAhLf zJO93vvitRs-X+B>d`xo(|0lj4=?|3DK{bJeEN0Ql<$d?pe*3e~s@Ye$fcj};d4tDa z_T#+n5&{$~+E%zfE!S!k?0$68ijCCSaa4OA`<*(>IjD9W*l@So=V8h*1nZfQWVkH2 z;>WX6E%GhNRmCygv=T%%{gzKL2MdGH*DQVhmq)}O9@PttqdoZRm#e49wtoB>ah54Mfq&8pLImaD2FioE!q&=* zPJ+(}XAHhw<9;I>$ZU|E(t+~#oNK;(-UMkdbo@0e+xrEn*~2z?=WY`e<*Ru|12sf`-_WA7$yi_UF~9P zSQfnUNU&du-xf7K%q>|zF(vV7n-Q6JO3OS|22E--YQ3H}&hMsOaI5AtQOJI1X_g&u zXZmHIU&m}T$-)6Z+X2QlbC8FX`N`wm)S$bEX9ayFhR>Uu3rU`(wsW|uA| zZ#^b|#4Wt2a|tj1syzDgy?(~guau&EbTeum$7>949E@SJ(l{HeV#nRR7y=YYY0IRA zzS}^}XjgkY;i>Lx8)E>7pWg>KaD2*${j4c#pq<^`qD4+Q_->*Yg0>xr|(~` zz)ofQ7+kqL!)_LuXEB+bN)bL;f#0RTy9%AjQuX&eO$cPo+Ub`F4-x-lSgH_16Kf&q zGMEO#^h`wO8EfLb?v=%ewLk3{zS&xBG(%m@@iQ4>H|K3bNh&LW(SifG$ckpq$O)W81aA++eUrN&&L51M3J zz5*ug+t|+f>-;{H;clMJW0XEv^iuMUx};)thsZo188r7>9bXxT0wR9xS*zxj%H^^E ztTw5s9`bgp92biG+jv7!WTWAkfH;i#oY>HP4Xlrn2e0MF;pf8vL3KkigciQQY5+QU zOShJ%SF71N)^?C(QqgjUl*M{o8LY(yBW+cMO6^*UlmS`mzA=9gK@St68j+UvF?@9c8-c? z$7vt8+!hdCn0?t&GZtgsr%rYL-I83%&|*DhV^})M58kax{J09xGQo_%(;wh8rv1MC zy5$1fI~2HL8_>|mQNWp?09W3OzpsQP+Fc4ar}SwzyKdPL$gP-HG1eEKT`8iY8@C-A z)3k0`*%ky)@4rSTclm?A4v@0bGg2La7}kWlzH7I>Iz6O~)26YRx`v3p{ delta 3399 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 H0|ADhQJKoO delta 4521 zcmV;a5mxTYB+Dd_Xn#{ty$U?AWM+TCdVYB6yzQ-{Xbl1b0K-rOf&|E<)PsVWZMA&p zUS<6VIt142q2~4gFD-rSAMSTPcW2xs?iNVi%R}Irp%}`A@Kzu%GwE^J240UM&>zr= z&ZY<*8AgQMP@0-9z7W%Vz$_lyMK+{Vo;*hI#=kbwLrd&p*?&@_hLY!dpBt=5O?g|u zd@-Wg$jL^@8pXMn9>>TX>?18rgdE}M^mtFck{8%uj{R=m@%X+FtkE#3!y2545L>ICW79aRn z@XP#>t>|163V${6$eO2si7`smtWKN<9R7z?KdHgoNgwX4DwLU97LKPkIT<%Fq$~^; znPPG=5M&DOs&xydG1|u^zC%mY?u_0=B8Kq&5;9iKl{;1~Ui{Vn+tb@$v+l6e>%;^Oxyewi)qe+C4hwaqZYZt&fRN+ zxsi;?e6=U<1j z9-K`0Vt)w%n&{rZh=8J#@)B@H5TyD806-20gObJgYRR#0MGU3loggQ5oL>hDcHZ70 z>@Xqk_!dtGEoB42>ZN|K4z=$;>abTu)i;`z4?{|pV)?l?9CeYh@!g+|rt=kPLFC2X zUv5Zf?HV}E2*M6OcuuJDUexu3$}i>tsI3O%vwuk61IH_G0N`AU&u&Gj>|={vWVP1b z?}#he?za|?*um-Iq}K3D-%X$YYRM_x#fC zW3fkb^vz5o_s{`}V~%egXNF|SD6sOt2}>FuzVD%zs94NPliwt5^pungnp=6?z}AS^ z-+%r8TfrsB%-+dz$GcSrXPWc-9)Zb=!ic$ru4XJ9Kg-42e zU_(Hgomo;|L`84n))A=kx7?i&>}3JnrhnDs{Ikyt9{MCglJSaFj?j$eC^&NWd>KFe zTjp1s?+oYJLz04P=wzMi4uIf3h_BS9A2^QG22Kka=-g4=Zhu9O4|WhqTLSa2^DLqE z68xA<_pVCDhxw|Rj#`0dgorfj+(-Y5QMRn*Hq^zS=kIM!B4(!ndB)vu*taAlzJJJ5 zB{PrGVDhebrNqQfwS-3JF-6X}^!+3V#6HdovPnqG{u#SH_P1FaofA+dxXJ!=Jw{1l zvRM?VA3;mcu6JgwKs~WSq_jlIoHG0KUMY1VL_OAAfNoedqy%I#CH=jF=J5bo|@Wpr`MIbX#it7`GAm z7^ZkmD4@$t=D$pl9-CtLV)B9#akLU!WGct~78_#?pSPgb4**DPap8~o?W=NOG|7J^ zGm$bCDIf#Ke(KbVjRvW(FPSqw9#6*=za_uZF;p-w1_>&LNQUkfWM<%m`K?bP56k0K-s#f(#Hl z0Hm)SivBu+t$$~*&U{?tSb5qt0%=iG%0AO2wUBHnB63a$@|HCo{f~#(aCBrv<2?(V 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 H0|ADh{hPE9 diff --git a/certs/root.crt b/certs/root.crt index b5e75dad..54798de4 100644 --- a/certs/root.crt +++ b/certs/root.crt @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIFnjCCA4agAwIBAgIEDQtWKTANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV +MIIFnjCCA4agAwIBAgIES09RbTANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZyYW5jaXNjbzEZ MBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05BUDERMA8GA1UE -AxMIb25hcC5vcmcwHhcNMjAwNzA5MDgwNDE1WhcNMzAwNzA3MDgwNDE1WjB3MQsw +AxMIb25hcC5vcmcwHhcNMjAwNzI5MTMxMjQwWhcNMzAwNzI3MTMxMjQwWjB3MQsw CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZy YW5jaXNjbzEZMBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05B UDERMA8GA1UEAxMIb25hcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK -AoICAQCkxel9G29Hgy9j7cEQ0BGlPrP9s1SF3ADe7f56jTjQd/jFUsN67Da+l9Dt -vy1yUwPnTr3krpXOHwQKplsuBDMoa0ayRhqUpp6fuSuu/zgGJOQIe7NlJh9FbYfq -ax0nHO8qtwd+eTUCqkwVfOFZpDFwR7Ss73Z++14Em8TgFiIsTlBV1sa/xRWLT9JL -Sqnr0tQiUJewO6sCUsis+U7kEf+QCueJAktMxR70rQcAJ2gd/zlnIaoaL4rF+MU8 -xlbEfMK/rxC6jeVm3oJu4ihjDKj1V6PDyEtzjsWQFtM+y6wgd98Kxt+0mHW3mZZ0 -+Ul0fHSE0fRNp8qEMOUKYFbCffWBrMBZaOaUy6FSnnGi8frv7WqJXNiO2lClhsN1 -2yA1HgiorhK9sXjVdwsjTmJhOdvn5sla22+QXrobNflHZHo8JhWHpZ9RbBWAZdaa -FrEizBoDnkpdaNb2PykYjqPo8D1Y/lOSDOg32wOW50F6bZg3yyQzFe0+PsAPK/u+ -b8THRJhkbXYvcAoDQv785aXoaa0mVg+yAvz6dorchJkViaOvUlNl+DNNKGJb1hWc -KWLU1SpH7I9QWQYGExFEzsg4Wv2ErGponSoecAm+IM23mn/fhGrwv1r/bl5WR++5 -5nUIAbPysz3yQoMllSsBBOpuSsCLo1KQqQeQxnTwFxLS0Ag2SwIDAQABozIwMDAd -BgNVHQ4EFgQUff+Pkp90yZtYsNvFGhq6SBdL+f0wDwYDVR0TAQH/BAUwAwEB/zAN -BgkqhkiG9w0BAQwFAAOCAgEAAWzAQxiJb+3WiXnVC0AeQ2GBnj3JNWI13WE1VJ1a -+hsKAGHk6ACzsGfN0BiGp81Bt/4y+AinWTPI0xnuYqfJHS8/7sEvC7aSzmR0TsuM -u7xOYCiczoEwlM2YoFt1dRWt+ve6EZgTXzBSm75to7F3HS0dZzRaEKxyOA3ONFHT -tGgT+u7851qJQvNVwTOt54C7/PZ9Me5y98sosiGbp0USKroJbiMXHzIligp8s1uT -+Pm581C8YTVHKciR/4fhChu+tx39ZR2p4AoJFjEvgcWqYy+sOyn+Z8sWWLoj3dFk -xjdpSRLPI771ihGdV2JXwgzN1ei8OvUzrW1a1gLZkZ1ZWtK4rwpJteFh4YW/wuDb -dKElfqXJITmOEO+uT4cJ5+hGa3rl6asxbEJ6vhy7SZPOzgM1uAjRT1MpBtG/ZPY5 -mOkjzNbjlNsgwJNkuXCi4+3DWNC3QNrIqm825Wdr79TM3kYGfkK/ngargA0z0KYc -7sF6P0tGo6gLACbx+dO9KFpjBIqVaw9AUwb/IOGm1Yv+QutEISqgDQTKzT0iv2Pt -eSkR2IzaEvH0VmBnTHoHQwrV7x10cMxhwoA1mRvdt8L+gKC91CbVirIiRGCrJabO -GiKKZ+pD5kVi9gy7omrjw2kH6Vu4aQGySGBhzpIZ977oO9u+jaTdMHBtladqVvWd -sIM= +AoICAQCFkduZzAq9OCELD34x94FqVLtEjBqhuoc70vX1Ymcb9D+LFh4F3tZ+FN1S +C38EnXTRrnoNgO+upv56FhqY0rDvDq8ldgNBnJLHQHJn5L5HNEY4QdP934CcZOUA +6DEDu2CNUq3uuxBSezcQsRMtpCMahsDEL5MBo1OZcrez3vccV4/RuFwvjhRY6Gff +TLJTBnkMZtdjKi1XUS1dzO1R+o1xKH0928FZ+poJggU8ClB6K0rl66uL9mWbLRK6 +WuRCFPsfQ3IZQHec1GEjgEx3LbW1YVVCrXrseRfQIRRVQNrVDiC63N4fxfTbg6IP +N06UI0uOvETAV6LaFGM7pFy2EhhY0+njCABp8GiOC9Ti56gzT14oUXp1SMbvEfqH +S3YjS77AxPZLH9Nk4PCTGYsChVe4zBXZMryH99YdKVPZKfwOGug8Q3wpqK6GR27Q +2/z1kqajS75A5nQRRS280ocHUjUZei9WDsvoewEbksKazH2z8UDiO7VmihC1z8LZ +2wDGt3NaCcWYiMY2JUE7nMS/N4+S+uVGK3tLUn4VYCuTTBJwR7Fl3pptQUpH4ghJ +faJQ3ZyUkxr+7C1qky3KpWCPIbpwZ0Z+jza44KcwZhtykSiUGNs2ZVAgYdKWKEzN +3IaiRTZ8a26thx3Emc3VW8C1ROKV7Z1xRtMIThHCQCAuCosiqwIDAQABozIwMDAd +BgNVHQ4EFgQUrgR74ialS4IseMsG3HxOI1ZnzlswDwYDVR0TAQH/BAUwAwEB/zAN +BgkqhkiG9w0BAQwFAAOCAgEAgLlAXuD3EQpn5vn2wkUcF0yFLG5UzjaTwHQAAdZU +jtK+9IxcccOwMCaF3S17eqRxiVO6a+fxTsS5yXY8qsvmbJpeDStMUWgPUDVAf1XP +sZ0LI2c/V9R4JKYSUTXkpW1Ljkiu7AqO+VRV43I8//sjDr7gotusdehrLGyFQy9S +aQPmg3fk/zN8solAATD1+FMxoawmoQUAUvKVlGYpVu0JOaZywhF9QI9E1eJziUxO +5B3TcDVlbSxmEVHD1Z/Vc3e50yN+vxN2tQBLkfM9uBDON75TiFXSBd0rUfaOXjb+ +Zab5vMF4h4VeUocx+BJtA1SDuEF5JoKY+1QL8ZOIkWtsCaiQQ6psJDLP4GVic6k7 +FFh9nL4KFCGVKh7Q7RqUiyUhU69MYFNEHcEpZvBrksInlXwIdDv9v2gVGufjp7+2 +2YdOzzOVYP+/kbLbNwYPVEKs2BQK97SNw+0AN0ZM1y2XdXQ14HHh9VxhKPj7FUpV +c7u8CaQMjCotLvKLcCxlVkOBTpPPO75i81Z+j8BMqIdTOp5KptZLvPRavJY31VTs +OPULKA0vjdEmid/syLuta9BSNvyJkhvvJmQ43LCRpteOOQsB6MhHvYZqsubifsJE +SSe1GKF90FIPp6/P2ya5jwVl3KyLmOBMplJIbIekS8EVNvkEGIHhBS2AYr2VDsgK +YhM= -----END CERTIFICATE----- diff --git a/certs/truststore.jks b/certs/truststore.jks index 90dfcb937ce5094ae167bef38c50200fb884b6ea..3d8187f699088494fad4a6a7adc94963e30686ac 100644 GIT binary patch delta 1656 zcmV-;28a2=4Z;nOU4JP`9I$w#Zw(4?>O~iW3&E!?oyY)qfuU4Qxz50rb0sE#?Eh zL~jVo<0rv(2m98yGvgfb1dYYFteLRR#4ZvPVD*t+R+KAYfQKUIdu}Mm*+F-{V1Z*q zvD23>;#arh7CplZEN>e5fpPnxRepStv$WY^y$8AR>K+WLvvFTz@CqQGS96z>CYL!a5e{MoA3p zU}k6*=(|2ESHuiXP(c|Zy#^++-p_4L(?O|yHf`b0vVtN(IjIq?O3cfB};T>f%- z&)V9AD}RFzygsOdS-ESD2`9_&2Rp=|fqN(+Y|KYbGi!XwhsV&vS*muM+u8*z`I!3D z88EstnI0Y=J=@9jhZjR0jgeSf-98=E?5-Jy0Va?uQQjXM~*Nwgjc zVx{g%p8e&Hg2;SSZUWJ=PaMQOG>4)$kO2m2_{<&o)to7GB)tvsrQsMII{JsI1enixe0@5HMM89I<)?4un6hEY z$%X92af=~)$B+b<;>!kkgh%(TOzK2b(SM2gvO?&7hsstqhxC^Q)$B!#L6#7xOAe(G zdh7o8rICt~lHXfFY~o(j>*Lv6U@C8FkHwpya^+ceVI74FaFv=RXooxlTbQ`m)c=$0r+rh%p{p?0*p8gs;`t z(SGnemfq9DfsDzcb;OT678uo$CGqF591Qsm6SGIozW!x!l4LA0;#p@l%z>aGlTOzn zEKPRaG8PES;9~Zf=Vsjas?PyP6lTm?2u8!V{ySb=TNPpntw(D`MBe0Kk+hpI&uI=DjIvwId^G|!o#J_bTMc_!(D5v z8J2nERGCh>{dU{btBO#FS8%cMyWtlDT{D1vUjXFU4NiX-P(tAUAayzUBNG!hAOtee ze~vy6gfQUgHYLQ zQ2a7YtqRtVr#t+HYf4LS%hvm%k7miC3ZDF4JV($_1!F2PqKFJIJ}@CL2?hl#4g&%j z1povT#352i3>}=(XjwyV3LCb!L(<$p1Qc;*#44{%)MVjG1dy4>ACU!DvqS;|0fwML C4l^>z1ghX8r9SgMsvMDv_N>3qOXbizaC4i9|h! z2~O^^HvJEV-MSn2R>(FB4_@gBKiTj08dTx|>_Sj}#`Dl<@_#b_#h~uS93?Mvw`qzR zK2r_GR#B&+^FY@YdFZe1Mxhq0;p7hDuR$K|FZd1{#b^5kig^bgTY$7uIDVa-c>M>%pQp;W zMA$uURDa9j20(h_0kVcdoK$uz>6=+)f@0O4(hYn~beiFm$1J)afN`>Sk!DeeR4 zTyx(`44@G<<(SJ#&d8^`pb$9|PB+*(nywI*0pfZ^1If)j34h2SiEdK3e1%!Mc@)}0 zM}}sCxxeApuRppRnzcR7I6h8bc-VX#*zCpXlz$fe25JMiBv>9#z~YPP=-JB;iHnnB z=yZBTAry)@erorgxJciOOI174z(Tvb+xnltg)6_h*35<_2e6PGL@cAJZ(a*kx{Q+U zR!z2Ru--FUJ4MKv#z!Bk$J?b~TmYO>-$)OR7)XB#m4KDZ4!x98d?9M&V9CW7l`&3>2gKI)I?8gj<}lbYNPC^qJgk1n5$qnr8HjH$>FGN~eY7pT`j zQ6BDH(b2AV8x4jD64<{|(hO3Na(rtD>*dL?E+Sq?y$-E|!pMQj$8$xa}rf#NeB%Z2!=su_XC>vWx-90 zVv=Q!_W-YG(mHHO6=8oC+dk10Q+y(0?caQr8wnAaupA%f+X!wND-&&U~yz{4S$)~*xHTyUG+?elNj%?VnO-ZM&H$(;nVf<373y5 z?^~LZ#(1fw{fe*Wk=8}=d7}?NM#un^2_bBzVsZJ&%|$D)bQ}b$kok1L96@F9U=+=9erRDxYqA6OEzb(%TNISYv~7tc_UKb2tcJ}7V1I)^EBilz z4dK_o@7xrpFBKga^te~#ahT8}hqscJJL8sb#xGg0g`tfodg~RB21~Mi;N2JPUh{{& zA-5OQ0tP=}`dn~Hkd7mQtBtw++g+g57m)$aC}frv2I6lkJvhd;7tLP4_#$Lu<%SB% zotoJ0y^Jx2D(M$5MU1GOReysx6KCsA0xfyCy8$1QOKa)k2LeIN@E91}z`_>8O-bEm)2yqw=@;=oHbE3FL zqe0wEvojraHyy7{!&? bash e.g. - docker exec -it aafcert-service bash + docker exec -it oomcert-service bash 3. Edit *cmpServers.json* file:: - vim /etc/onap/aaf/certservice/cmpServers.json + vim /etc/onap/oom/certservice/cmpServers.json 4. Save the file. Note that this file is mounted as volume, so change will be persistent. 5. Reload configuration:: - curl -I https://localhost:8443/reload --cacert /etc/onap/aaf/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12 --pass $KEYSTORE_PASSWORD + curl -I https://localhost:8443/reload --cacert /etc/onap/oom/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/oom/certservice/certs/certServiceServer-keystore.p12 --pass $KEYSTORE_PASSWORD 6. Exit container:: @@ -99,7 +99,7 @@ Configuring in OOM deployment: Before OOM installation: """""""""""""""""""""""" -Note! This must be executed before calling *make all* (from OOM Installation) or needs remaking AAF charts. +Note! This must be executed before calling *make all* (from OOM Installation) or needs remaking OOM charts. 1. Edit *cmpServers.json* file. If OOM *global.addTestingComponents* flag is set to: @@ -233,7 +233,7 @@ Configuring EJBCA server for testing To instantiate an EJBCA server for testing purposes with an OOM deployment, cmpv2Enabled and cmpv2Testing have to be changed to true in oom/kubernetes/aaf/values.yaml. -cmpv2Enabled has to be true to enable aaf-cert-service to be instantiated and used with an external Certificate Authority to get certificates for secure communication. +cmpv2Enabled has to be true to enable oom-cert-service to be instantiated and used with an external Certificate Authority to get certificates for secure communication. If cmpv2Testing is enabled then an EJBCA test server will be instantiated in the OOM deployment as well, and will come pre-configured with a test CA to request a certificate from. diff --git a/docs/sections/introduction.rst b/docs/sections/introduction.rst index 9d6c7816..023066b8 100644 --- a/docs/sections/introduction.rst +++ b/docs/sections/introduction.rst @@ -12,6 +12,8 @@ Overview In Frankfurt release AAF was enhanced by Certificate Management Protocol ver. 2 (CMPv2) support. Such support is handled by new AAF's microservice called CertService. CertService provides certificates signed by external CMPv2 server - further on such certificates are called operators certificates. Operators certificates are meant to secure external ONAP traffic - traffic between network functions (xNFs) and ONAP. +In Guilin release CertService was moved from AAF repository to OOM repository. + Context View ------------ diff --git a/docs/sections/logging.rst b/docs/sections/logging.rst index dba8f3e6..92a87fb0 100644 --- a/docs/sections/logging.rst +++ b/docs/sections/logging.rst @@ -17,7 +17,7 @@ To see CertService console logs use: docker logs e.g. - docker logs aafcert-service + docker logs oomcert-service - Kubernetes: @@ -39,7 +39,7 @@ CertService logs for different logging levels are available in the container: docker exec -it bash e.g. - docker exec -it aafcert-service bash + docker exec -it oomcert-service bash - Kubernetes: @@ -52,7 +52,7 @@ CertService logs for different logging levels are available in the container: Path to logs: - /var/log/onap/aaf/certservice + /var/log/onap/oom/certservice Available log files: @@ -75,7 +75,7 @@ To see CertService client console logs use : docker logs e.g. - docker logs aafcert-client + docker logs oomcert-client - Kubernetes: CertService client is used as init container in other components. In the following example: diff --git a/docs/sections/offeredapis.rst b/docs/sections/offeredapis.rst index b757b3bd..21a4bb60 100644 --- a/docs/sections/offeredapis.rst +++ b/docs/sections/offeredapis.rst @@ -6,7 +6,7 @@ Offered APIs ============= -AAF Cert Service Api +OOM Cert Service Api -------------------- .. code-block:: yaml diff --git a/docs/sections/resources/OpenAPI.yaml b/docs/sections/resources/OpenAPI.yaml index 14f8b6bc..d20f833e 100644 --- a/docs/sections/resources/OpenAPI.yaml +++ b/docs/sections/resources/OpenAPI.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# aaf-certservice +# oom-certservice # ================================================================================ # Copyright (C) 2020 Nokia. All rights reserved. # ================================================================================ diff --git a/docs/sections/usage.rst b/docs/sections/usage.rst index 759284bd..b8bf7f69 100644 --- a/docs/sections/usage.rst +++ b/docs/sections/usage.rst @@ -12,7 +12,7 @@ CertService client needs the following configuration parameters to work properly 1. Parameters for generating certification artifacts and connecting to CertService API to obtain certificate and trust anchors - - REQUEST_URL *(default: https://aaf-cert-service:8443/v1/certificate/)* - URL to CertService API + - REQUEST_URL *(default: https://oom-cert-service:8443/v1/certificate/)* - URL to CertService API - REQUEST_TIMEOUT *(default: 30000[ms])* - Timeout in milliseconds for REST API calls - OUTPUT_PATH *(required)* - Path where client will output generated certificate and trust anchor - CA_NAME *(required)* - Name of CA which will enroll certificate. Must be same as configured on server side. Used in REST API calls @@ -44,12 +44,12 @@ CertService client image can be found on Nexus repository : .. code-block:: bash - nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:$VERSION + nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:$VERSION As standalone docker container ------------------------------ -You need certificate and trust anchors to connect to CertService API via HTTPS. Information how to generate truststore and keystore files you can find in project repository README `Gerrit GitWeb `__ +You need certificate and trust anchors to connect to CertService API via HTTPS. Information how to generate truststore and keystore files you can find in project repository README `Gerrit GitWeb `__ To run CertService client as standalone docker container execute following steps: @@ -74,9 +74,9 @@ To run CertService client as standalone docker container execute following steps SANS=test.onap.org:onap.com #TLS config envs - KEYSTORE_PATH=/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks + KEYSTORE_PATH=/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks KEYSTORE_PASSWORD= - TRUSTSTORE_PATH=/etc/onap/aaf/certservice/certs/certServiceClient-truststore.jks + TRUSTSTORE_PATH=/etc/onap/oom/certservice/certs/certServiceClient-truststore.jks TRUSTSTORE_PASSWORD= 2. Run docker container as in following example (API and client must be running in same network): @@ -85,13 +85,13 @@ To run CertService client as standalone docker container execute following steps docker run \ --rm \ - --name aafcert-client \ + --name oomcert-client \ --env-file <$PWD/client.env (same as in step1)> \ --network \ --mount type=bind,src=,dst= \ --volume : \ --volume : \ - nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:$VERSION + nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:$VERSION @@ -99,14 +99,14 @@ After successful creation of certifications, container exits with exit code 0, e .. code-block:: bash - INFO 1 [ main] o.o.a.c.c.c.f.ClientConfigurationFactory : Successful validation of Client configuration. Configuration data: REQUEST_URL: https://aaf-cert-service:8443/v1/certificate/, REQUEST_TIMEOUT: 10000, OUTPUT_PATH: /var/certs, CA_NAME: RA, OUTPUT_TYPE: P12 + INFO 1 [ main] o.o.a.c.c.c.f.ClientConfigurationFactory : Successful validation of Client configuration. Configuration data: REQUEST_URL: https://oom-cert-service:8443/v1/certificate/, REQUEST_TIMEOUT: 10000, OUTPUT_PATH: /var/certs, CA_NAME: RA, OUTPUT_TYPE: P12 INFO 1 [ main] o.o.a.c.c.c.f.CsrConfigurationFactory : Successful validation of CSR configuration. Configuration data: COMMON_NAME: onap.org, COUNTRY: US, STATE: California, ORGANIZATION: Linux-Foundation, ORGANIZATION_UNIT: ONAP, LOCATION: San-Francisco, SANS: test.onap.org:onap.org INFO 1 [ main] o.o.a.c.c.c.KeyPairFactory : KeyPair generation started with algorithm: RSA and key size: 2048 INFO 1 [ main] o.o.a.c.c.c.CsrFactory : Creation of CSR has been started with following parameters: COMMON_NAME: onap.org, COUNTRY: US, STATE: California, ORGANIZATION: Linux-Foundation, ORGANIZATION_UNIT: ONAP, LOCATION: San-Francisco, SANS: test.onap.org:onap.org INFO 1 [ main] o.o.a.c.c.c.CsrFactory : Creation of CSR has been completed successfully INFO 1 [ main] o.o.a.c.c.c.CsrFactory : Conversion of CSR to PEM has been started INFO 1 [ main] o.o.a.c.c.c.PrivateKeyToPemEncoder : Attempt to encode private key to PEM - INFO 1 [ main] o.o.a.c.c.h.HttpClient : Attempt to send request to API, on url: https://aaf-cert-service:8443/v1/certificate/RA + INFO 1 [ main] o.o.a.c.c.h.HttpClient : Attempt to send request to API, on url: https://oom-cert-service:8443/v1/certificate/RA INFO 1 [ main] o.o.a.c.c.h.HttpClient : Received response from API DEBUG 1 [ main] o.o.a.c.c.c.c.ConvertedArtifactsCreator : Attempt to create keystore files and saving data. File names: keystore.p12, keystore.pass INFO 1 [ main] o.o.a.c.c.c.c.PemConverter : Conversion of PEM certificates to PKCS12 keystore @@ -160,11 +160,11 @@ You can use the following deployment example as a reference: ... initContainers: - name: cert-service-client - image: nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:latest + image: nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:latest imagePullPolicy: Always env: - name: REQUEST_URL - value: https://aaf-cert-service:8443/v1/certificate/ + value: https://oom-cert-service:8443/v1/certificate/ - name: REQUEST_TIMEOUT value: "1000" - name: OUTPUT_PATH @@ -188,17 +188,17 @@ You can use the following deployment example as a reference: - name: SANS value: test.onap.org:onap.com - name: KEYSTORE_PATH - value: /etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks + value: /etc/onap/oom/certservice/certs/certServiceClient-keystore.jks - name: KEYSTORE_PASSWORD value: secret - name: TRUSTSTORE_PATH - value: /etc/onap/aaf/certservice/certs/truststore.jks + value: /etc/onap/oom/certservice/certs/truststore.jks - name: TRUSTSTORE_PASSWORD value: secret volumeMounts: - mountPath: /var/certs name: certs - - mountPath: /etc/onap/aaf/certservice/certs/ + - mountPath: /etc/onap/oom/certservice/certs/ name: tls-volume ... volumes: @@ -206,6 +206,6 @@ You can use the following deployment example as a reference: emptyDir: {} - name tls-volume secret: - secretName: aaf-cert-service-client-tls-secret # Value of global.aaf.certService.client.secret.name + secretName: oom-cert-service-client-tls-secret # Value of global.oom.certService.client.secret.name ... diff --git a/pom.xml b/pom.xml index 8126ee99..b0f25e62 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,11 @@ oparent 3.0.0 - org.onap.aaf.certservice - aaf-certservice + org.onap.oom.platform.cert-service + oom-certservice 1.2.0-SNAPSHOT - aaf-certservice - AAF Certification Service + oom-certservice + OOM Certification Service pom @@ -33,7 +33,7 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/org/onap/aaf/cert-service/${project.artifactId}/${project.version} + /content/sites/site/org/onap/oom/cert-service/${project.artifactId}/${project.version} 11 http://localhost:8080/v3/api-docs.yaml @@ -154,12 +154,12 @@ ecomp-releases - AAF Release Repository + OOM Release Repository ${nexusproxy}${releaseNexusPath} ecomp-snapshots - AAF Snapshot Repository + OOM Snapshot Repository ${nexusproxy}${snapshotNexusPath} -- 2.16.6