gerrit.onap Code Review - aai/model-loader.git/commit

Code Review / aai / model-loader.git / commit

author	mark.j.leonard <mark.j.leonard@gmail.com>
	Wed, 6 Jun 2018 13:47:42 +0000 (14:47 +0100)
committer	mark.j.leonard <mark.j.leonard@gmail.com>
	Wed, 6 Jun 2018 14:37:53 +0000 (15:37 +0100)
commit	c5aea4a8bc398fc1c6220875e55b9520fd7f7524
tree	b0aeef15bed28487c5827990d60fc3bdcf95b67e	tree \| snapshot
parent	ce332032dd208c5c769a2297409d8aca3f780fa8	commit \| diff

Refactor for Sonar smells and code coverage

Various code formatting and style fixes (to address Sonar code smells).

Introduce a BabelServiceClientException to replace the use of the base
Exception class.

Make both the BabelServiceClient class and its Factory class use an
interface, to allow for Spring injection (using annotations) and for
simplified mocking.

Refactor the Notification Publishing by making this the responsibility
of the main Service classes and not the deployment manager.

Issue-ID: AAI-1207
Change-Id: I6bf8a504fa7b98e9158c9976fd1d88c6c54027c1
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

66 files changed:

Readme.md		diff \| blob \| history
appconfig-local/auth/README.txt	[new file with mode: 0644]	blob
appconfig-local/model-loader.properties	[new file with mode: 0644]	blob
pom.xml		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/ModelLoaderApplication.java	[moved from src/main/java/org/onap/aai/modelloader/service/ModelLoaderApplication.java with 91% similarity]	diff \| blob \| history
src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/entity/Artifact.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifact.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/entity/model/BabelArtifactParsingException.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactParser.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifact.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/notification/ArtifactDownloadManager.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/notification/CompDoneStatusMessageBuilder.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/notification/DistributionStatusMessageBuilder.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/notification/EventCallback.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/notification/NotificationDataImpl.java	[moved from src/main/java/org/onap/aai/modelloader/service/NotificationDataImpl.java with 96% similarity]	diff \| blob \| history
src/main/java/org/onap/aai/modelloader/notification/NotificationPublisher.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClient.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientException.java	[new file with mode: 0644]	blob
src/main/java/org/onap/aai/modelloader/restclient/HttpsBabelServiceClient.java	[new file with mode: 0644]	blob
src/main/java/org/onap/aai/modelloader/service/ArtifactDeploymentManager.java	[moved from src/main/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManager.java with 67% similarity]	diff \| blob \| history
src/main/java/org/onap/aai/modelloader/service/BabelServiceClientFactory.java	[new file with mode: 0644]	blob
src/main/java/org/onap/aai/modelloader/service/HttpsBabelServiceClientFactory.java	[new file with mode: 0644]	blob
src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java		diff \| blob \| history
src/main/java/org/onap/aai/modelloader/util/JsonXmlConverter.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/TestModelLoaderApplication.java	[moved from src/test/java/org/onap/aai/modelloader/service/TestModelLoaderApplication.java with 82% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/config/TestModelLoaderConfig.java	[moved from src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java with 93% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfCatalogArtifactHandler.java	[moved from src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java with 63% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfImageException.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java	[deleted file]	blob \| history
src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactParser.java	[new file with mode: 0644]	blob
src/test/java/org/onap/aai/modelloader/entity/model/TestNamedQueryArtifactParser.java	[moved from src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java with 84% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/extraction/TestArtifactInfoExtractor.java	[moved from src/test/java/org/onap/aai/modelloader/extraction/ArtifactInfoExtractorTest.java with 93% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/fixture/ArtifactInfoBuilder.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/fixture/MockNotificationDataImpl.java	[moved from src/test/java/org/onap/aai/modelloader/fixture/TestNotificationDataImpl.java with 86% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/fixture/NotificationDataFixtureBuilder.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/fixture/ResourceInstanceBuilder.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/fixture/TestResourceInstanceImpl.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/notification/TestArtifactDeploymentManager.java	[moved from src/test/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManagerTest.java with 60% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/notification/TestArtifactDownloadManager.java	[moved from src/test/java/org/onap/aai/modelloader/notification/ArtifactDownloadManagerTest.java with 71% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/notification/TestBabelArtifactConverter.java	[moved from src/test/java/org/onap/aai/modelloader/notification/BabelArtifactConverterTest.java with 68% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java	[moved from src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java with 88% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/notification/TestNotificationDataImpl.java	[moved from src/test/java/org/onap/aai/modelloader/service/TestNotificationDataImpl.java with 95% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/notification/TestNotificationPublisher.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/restclient/MockBabelServiceClient.java	[new file with mode: 0644]	blob
src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java	[new file with mode: 0644]	blob
src/test/java/org/onap/aai/modelloader/restclient/TestAaiServiceClient.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/restclient/TestBabelServiceClient.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/service/MockBabelServiceClientFactory.java	[moved from src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientFactory.java with 63% similarity]	diff \| blob \| history
src/test/java/org/onap/aai/modelloader/service/TestArtifactInfoImpl.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/service/TestModelLoaderService.java	[new file with mode: 0644]	blob
src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java	[new file with mode: 0644]	blob
src/test/java/org/onap/aai/modelloader/util/ArtifactTestUtils.java		diff \| blob \| history
src/test/java/org/onap/aai/modelloader/util/TestJsonXmlConverter.java	[moved from src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java with 65% similarity]	diff \| blob \| history
src/test/resources/auth/aai-client-dummy.p12	[new file with mode: 0644]	blob
src/test/resources/convertedYmls/AAI-SCP-Test-VSP-resource-1.0.xml	[new file with mode: 0644]	blob
src/test/resources/model-loader-empty-auth-password.properties		diff \| blob \| history
src/test/resources/model-loader-no-auth-password.properties		diff \| blob \| history
src/test/resources/model-loader.properties		diff \| blob \| history
src/test/resources/sdc_test/model-loader.properties	[new file with mode: 0644]	blob

Loads SDC Models into A&AI

RSS Atom