gerrit.onap Code Review - oom/platform/cert-service.git/commit

Code Review / oom / platform / cert-service.git / commit

author	Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
	Wed, 2 Sep 2020 12:35:32 +0000 (14:35 +0200)
committer	Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
	Wed, 9 Sep 2020 12:03:01 +0000 (14:03 +0200)
commit	a9fd6d0a175e647ac36932ce77b91f9e54e97084
tree	2c9c150c07162770be7629b0bd665185cff7f9b0	tree \| snapshot
parent	4014c7482b233bba9e344b9b3fbe6b7641ebdcfd	commit \| diff

Refactor truststore merger logic

- Merge PemTruststore and JavaTruststore into Truststore
- Rename controller classes to be consistent
- Remove duplicated methods

Issue-ID: DCAEGEN2-2253
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: I3270cd9811e5eaf360ceea0d0ca99be1155eaf00

44 files changed:

trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/TrustStoreMerger.java		diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/CertificateConstants.java		diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFileFactory.java	[deleted file]	blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/model/JavaTruststore.java	[deleted file]	blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/model/PemTruststore.java	[deleted file]	blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/CertificateStoreControllerFactory.java	[deleted file]	blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/BackupCreator.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/model/Truststore.java with 63% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/ExtensionResolver.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/FileManager.java with 85% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/PasswordReader.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/PasswordReader.java with 83% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/exception/MergerConfigurationException.java		diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/exception/TruststoresPathsProviderException.java		diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProvider.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java with 56% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/AliasConflictException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/AliasConflictException.java with 86% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/CreateBackupException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/CreateBackupException.java with 87% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/KeystoreInstanceException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/KeystoreInstanceException.java with 86% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/LoadTruststoreException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/LoadTruststoreException.java with 86% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/MissingTruststoreException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/MissingTruststoreException.java with 86% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/PasswordReaderException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/PasswordReaderException.java with 86% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/TruststoreDataOperationException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/TruststoreDataOperationException.java with 85% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/TruststoreFileFactoryException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/TruststoreFileFactoryException.java with 85% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/WriteTruststoreFileException.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/exception/WriteTruststoreFileException.java with 86% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/JavaTruststore.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/JavaCertificateStoreController.java with 76% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreFactory.java	[new file with mode: 0644]	blob
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/PemTruststore.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/PemCertificateController.java with 84% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/Truststore.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/CertificateController.java with 56% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactory.java	[new file with mode: 0644]	blob
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/CertificateWithAlias.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/entry/CertificateWithAlias.java with 95% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/CertificateWithAliasFactory.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/entry/CertificateWithAliasFactory.java with 95% similarity]	diff \| blob \| history
trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/PemAliasGenerator.java	[moved from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/entry/PemAliasGenerator.java with 95% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/model/JavaTruststoreTest.java	[deleted file]	blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/model/PemTruststoreTest.java	[deleted file]	blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/model/TruststoreTest.java	[deleted file]	blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFilesListProviderTest.java	[deleted file]	blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/BackupCreatorTest.java	[new file with mode: 0644]	blob
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/ExtensionResolverTest.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/FileManagerTest.java with 87% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/PasswordReaderTest.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/PasswordReaderTest.java with 79% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProviderTest.java	[new file with mode: 0644]	blob
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreTest.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/JavaCertificateStoreControllerTest.java with 58% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/PemTruststoreTest.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/PemCertificateControllerTest.java with 50% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TestCertificateProvider.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/TestCertificateProvider.java with 50% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactoryTest.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFactoryTest.java with 60% similarity]	diff \| blob \| history
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreTest.java	[new file with mode: 0644]	blob
trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/certificate/PemAliasGeneratorTest.java	[moved from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/entry/PemAliasGeneratorTest.java with 96% similarity]	diff \| blob \| history
trustStoreMerger/src/test/resources/keystore.pass	[new file with mode: 0644]	blob

"oom/platform/cert-service"

RSS Atom