diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2022-12-20 09:55:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-12-20 09:55:45 +0000 |
| commit | e70bf5c909a4d5abcbc7adcbb4aa120c2e045660 (patch) | |
| tree | 2622919eb5c86d6400cab8ff35795bd8c75cd730 /runtime-acm/src/main | |
| parent | ba5988ab370f3dc5e5214823046e897d25aba0bf (diff) | |
| parent | e18a523f4fc8075dc5022871fa96ca8754c2c979 (diff) | |
Merge "Refactor instanceId as primary key in JpaAutomationComposition"
Diffstat (limited to 'runtime-acm/src/main')
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java index 374c94f5d..b723dba7f 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java @@ -201,10 +201,10 @@ public class AutomationCompositionInstantiationProvider { * @return the automation compositions */ @Transactional(readOnly = true) - public AutomationCompositions getAutomationCompositions(String name, String version) { + public AutomationCompositions getAutomationCompositions(UUID compositionId, String name, String version) { var automationCompositions = new AutomationCompositions(); - automationCompositions - .setAutomationCompositionList(automationCompositionProvider.getAutomationCompositions(name, version)); + automationCompositions.setAutomationCompositionList( + automationCompositionProvider.getAutomationCompositions(compositionId, name, version)); return automationCompositions; } diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java index e9f1eaac0..1ff7c019e 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/InstantiationController.java @@ -92,7 +92,7 @@ public class InstantiationController extends AbstractRestController implements A public ResponseEntity<AutomationCompositions> queryCompositionInstances(UUID compositionId, String name, String version, UUID requestId) { - return ResponseEntity.ok().body(provider.getAutomationCompositions(name, version)); + return ResponseEntity.ok().body(provider.getAutomationCompositions(compositionId, name, version)); } /** |