diff options
author | 2020-07-29 16:01:27 +0200 | |
---|---|---|
committer | 2020-08-05 14:18:54 +0200 | |
commit | b8c4e6867d6b26652f4382e93665c220769cdc9f (patch) | |
tree | bb60a44b012731e3ee6fdffe2466f5ed7d6b5c7b /certService/src | |
parent | fc31c9e47b3e08f8914dcd1f0c5b6d18aa625567 (diff) |
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 <pawel.baniewski@nokia.com>
Change-Id: I675f7485160b9b8e46e9ea573550e62ed28ca607
Diffstat (limited to 'certService/src')
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java | 61 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java | 157 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/CertServiceApplication.java (renamed from certService/src/main/java/org/onap/aaf/certservice/CertServiceApplication.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java (renamed from certService/src/main/java/org/onap/aaf/certservice/api/CertificationController.java) | 12 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/api/ReadinessController.java (renamed from certService/src/main/java/org/onap/aaf/certservice/api/ReadinessController.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/api/ReloadConfigController.java (renamed from certService/src/main/java/org/onap/aaf/certservice/api/ReloadConfigController.java) | 8 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdvice.java (renamed from certService/src/main/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdvice.java) | 16 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdvice.java (renamed from certService/src/main/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdvice.java) | 6 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/api/configuration/OpenApiConfig.java (renamed from certService/src/main/java/org/onap/aaf/certservice/api/configuration/OpenApiConfig.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/CertificateFactoryProvider.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/CertificateFactoryProvider.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/CertificationData.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/CertificationData.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/CertificationModelFactory.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/CertificationModelFactory.java) | 14 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/CertificationProvider.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/CertificationProvider.java) | 14 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/CsrModelFactory.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/CsrModelFactory.java) | 10 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/PemObjectFactory.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/PemObjectFactory.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/Pkcs10CertificationRequestFactory.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/Pkcs10CertificationRequestFactory.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/RsaContentSignerBuilder.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilder.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/X509CertificateBuilder.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/X509CertificateBuilder.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpClientConfig.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpClientConfig.java) | 6 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfig.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoader.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoader.java) | 8 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoadingException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoadingException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProvider.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java) | 6 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Authentication.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CaMode.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/CmpServers.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CmpServers.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/model/Cmpv2Server.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2Url.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2Url.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidator.java) | 8 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolation.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolation.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/UrlServerViolation.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ClientAdapterException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ClientAdapterException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/exception/Cmpv2ServerNotFoundException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/exception/Cmpv2ServerNotFoundException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/exception/CsrDecryptionException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/exception/CsrDecryptionException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/exception/DecryptionException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/exception/DecryptionException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/exception/ErrorResponseModel.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/exception/ErrorResponseModel.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/exception/KeyDecryptionException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/exception/KeyDecryptionException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/model/CertificationModel.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/model/CertificationModel.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/certification/model/CsrModel.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/model/CsrModel.java) | 8 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/api/CmpClient.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java) | 10 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/CmpClientException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/CmpClientException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/exceptions/PkiErrorException.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/exceptions/PkiErrorException.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpClientImpl.java) | 26 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageBuilder.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java) | 2 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpMessageHelper.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java) | 6 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelper.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelper.java) | 8 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseValidationHelper.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseValidationHelper.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpUtil.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpUtil.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/Cmpv2HttpClient.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/Cmpv2HttpClient.java) | 4 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CreateCertRequest.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java) | 10 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/oom/certservice/cmpv2client/model/Cmpv2CertificationModel.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/model/Cmpv2CertificationModel.java) | 2 | ||||
-rw-r--r-- | certService/src/main/resources/application.properties | 8 | ||||
-rw-r--r-- | certService/src/main/resources/log4j2.xml | 6 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/aaf/certservice/cmpv2client/external/RdnTest.java | 96 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/CertServiceApplicationTests.java (renamed from certService/src/test/java/org/onap/aaf/certservice/CertServiceApplicationTests.java) | 2 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/api/CertificationControllerTest.java) | 18 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/api/ReadinessControllerTest.java) | 4 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/api/ReloadConfigControllerTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java) | 6 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/api/advice/CertificationExceptionAdviceTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/api/advice/CertificationExceptionAdviceTest.java) | 14 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/api/advice/ReloadConfigExceptionAdviceTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/api/advice/ReloadConfigExceptionAdviceTest.java) | 4 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/CertificationModelFactoryTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java) | 36 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/CertificationProviderTest.java) | 16 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/CsrModelFactoryTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/CsrModelFactoryTest.java) | 20 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/PemObjectFactoryTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/PemObjectFactoryTest.java) | 10 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/RsaContentSignerBuilderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/RsaContentSignerBuilderTest.java) | 10 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/TestData.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/TestData.java) | 2 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/TestUtils.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/TestUtils.java) | 12 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/X509CertificateBuilderTest.java) | 8 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigLoaderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java) | 6 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/CmpServersConfigTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java) | 8 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/Cmpv2ServerProviderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java) | 10 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java) | 10 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java) | 2 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java) | 2 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java) | 2 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/certification/model/CsrModelTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java) | 18 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/cmpv2client/Cmpv2ClientTest.java) | 14 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/cmpv2client/impl/CmpResponseHelperTest.java) | 6 | ||||
-rw-r--r-- | certService/src/test/resources/application.properties | 6 |
81 files changed, 259 insertions, 573 deletions
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<String> 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<String> 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<Rdn> parse(final char delim, final String dnString) throws CertException { - List<Rdn> 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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}"/> </Console> - <RollingFile fileName="var/log/onap/aaf/certservice/error.log" filePattern="logs/error-%d{yyyy-MM-dd}-%i.log" name="ERROR_LOG"> + <RollingFile fileName="var/log/onap/oom/certservice/error.log" filePattern="logs/error-%d{yyyy-MM-dd}-%i.log" name="ERROR_LOG"> <LevelRangeFilter maxLevel="ERROR" minLevel="ERROR"/> <PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/> <Policies> @@ -19,7 +19,7 @@ <DefaultRolloverStrategy max="10"/> </RollingFile> - <RollingFile fileName="var/log/onap/aaf/certservice/debug.log" filePattern="logs/debug-%d{yyyy-MM-dd}-%i.log" name="DEBUG_LOG"> + <RollingFile fileName="var/log/onap/oom/certservice/debug.log" filePattern="logs/debug-%d{yyyy-MM-dd}-%i.log" name="DEBUG_LOG"> <LevelRangeFilter maxLevel="DEBUG" minLevel="ERROR"/> <PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/> <Policies> @@ -27,7 +27,7 @@ </Policies> </RollingFile> - <RollingFile fileName="var/log/onap/aaf/certservice/audit.log" filePattern="logs/audit-%d{yyyy-MM-dd}-%i.log" name="AUDIT_LOG"> + <RollingFile fileName="var/log/onap/oom/certservice/audit.log" filePattern="logs/audit-%d{yyyy-MM-dd}-%i.log" name="AUDIT_LOG"> <LevelRangeFilter maxLevel="INFO" minLevel="INFO"/> <PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/> <Policies> 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<String> expected1 = Arrays.asList("T", "Test"); - - String value2 = "This 123 is 99 tested 12345 string"; - List<String> expected2 = Arrays.asList("This", "is 99 tested", "string"); - - //when - List<String> actual1 = Rdn.parseRdn("=", value1); - List<String> 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 |