Use more dependency injection in model-loader 85/137585/1
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Tue, 26 Mar 2024 10:28:49 +0000 (11:28 +0100)
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Tue, 26 Mar 2024 10:28:49 +0000 (11:28 +0100)
commit19f034b2554895285f12979b0f36c1629f9af984
tree21384448dfb9fd91a2cbb4d499897230e73c1bb7
parent277fb3d9331b8a5c7fbdd8cf72cb623963a1ff4b
Use more dependency injection in model-loader

- use more dependency injection
- make class variables final if possible
- simplify mock creation in some tests using @Mock

Issue-ID: AAI-3811
Change-Id: I7a7ccba02df78e6fd3bf082c23aac0968137661b
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
19 files changed:
src/main/java/org/onap/aai/modelloader/config/BeanConfig.java
src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java
src/main/java/org/onap/aai/modelloader/extraction/VnfCatalogExtractor.java
src/main/java/org/onap/aai/modelloader/notification/ArtifactDownloadManager.java
src/main/java/org/onap/aai/modelloader/notification/BabelArtifactConverter.java
src/main/java/org/onap/aai/modelloader/notification/EventCallback.java
src/main/java/org/onap/aai/modelloader/notification/NotificationPublisher.java
src/main/java/org/onap/aai/modelloader/restclient/HttpsBabelServiceClient.java
src/main/java/org/onap/aai/modelloader/service/ArtifactDeploymentManager.java
src/main/java/org/onap/aai/modelloader/service/ModelController.java
src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java
src/test/java/org/onap/aai/modelloader/notification/ArtifactDownloadManagerVnfcTest.java
src/test/java/org/onap/aai/modelloader/notification/TestArtifactDeploymentManager.java
src/test/java/org/onap/aai/modelloader/notification/TestArtifactDownloadManager.java
src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java
src/test/java/org/onap/aai/modelloader/notification/TestNotificationPublisher.java
src/test/java/org/onap/aai/modelloader/service/TestModelController.java [moved from src/test/java/org/onap/aai/modelloader/service/TestModelLoaderService.java with 51% similarity]
src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java