diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-12-09 20:06:15 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-12-09 21:18:49 +0200 |
commit | 5540d178ab3203ab2994b21ee3434cca73318aa3 (patch) | |
tree | a156a4c63e5f0ce1846ee1a20c5dd4fa12c626fd /vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java | |
parent | 299190fbe78defb71a717e446c0f394ea7404dfe (diff) |
Join ExistingElementsCounterMaps with ServiceInstantiation
This new pretty creature is called "ServiceInstantiationTemplate" :-)
Issue-ID: VID-724
Change-Id: I1437d76e79512920079b574844b19368c07f501f
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java b/vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java index c46266790..96e777a13 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java +++ b/vid-app-common/src/main/java/org/onap/vid/controller/AsyncInstantiationController.java @@ -36,6 +36,7 @@ import org.onap.vid.properties.Features; import org.onap.vid.roles.RoleProvider; import org.onap.vid.services.AsyncInstantiationBusinessLogic; import org.onap.vid.services.AuditService; +import org.onap.vid.services.InstantiationTemplatesService; import org.onap.vid.utils.SystemPropertiesWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -55,6 +56,7 @@ public class AsyncInstantiationController extends VidRestrictedBaseController { public static final String ASYNC_INSTANTIATION = "asyncInstantiation"; protected final AsyncInstantiationBusinessLogic asyncInstantiationBL; + protected final InstantiationTemplatesService instantiationTemplates; protected final AsyncInstantiationRepository asyncInstantiationRepository; private final SystemPropertiesWrapper systemPropertiesWrapper; @@ -62,18 +64,21 @@ public class AsyncInstantiationController extends VidRestrictedBaseController { private final FeatureManager featureManager; - @Autowired - protected AuditService auditService; + protected final AuditService auditService; @Autowired public AsyncInstantiationController(AsyncInstantiationBusinessLogic asyncInstantiationBL, + InstantiationTemplatesService instantiationTemplates, AsyncInstantiationRepository asyncInstantiationRepository, RoleProvider roleProvider, - FeatureManager featureManager, SystemPropertiesWrapper systemPropertiesWrapper) { + FeatureManager featureManager, SystemPropertiesWrapper systemPropertiesWrapper, + AuditService auditService) { this.asyncInstantiationBL = asyncInstantiationBL; + this.instantiationTemplates = instantiationTemplates; this.asyncInstantiationRepository = asyncInstantiationRepository; this.roleProvider = roleProvider; this.featureManager = featureManager; this.systemPropertiesWrapper = systemPropertiesWrapper; + this.auditService = auditService; } /** @@ -171,7 +176,7 @@ public class AsyncInstantiationController extends VidRestrictedBaseController { @GetMapping("templateTopology/{jobId}") public ServiceInstantiation getTemplateTopology(HttpServletRequest request, @PathVariable(value="jobId") UUID jobId) { - return asyncInstantiationBL.getJobRequestAsTemplate(jobId); + return instantiationTemplates.getJobRequestAsTemplate(jobId); } @RequestMapping(value = "/auditStatusForRetry/{trackById}", method = RequestMethod.GET) |