From 0a43a2a9fdbf7a524122384fdfea698d8eb9f523 Mon Sep 17 00:00:00 2001 From: tragait Date: Thu, 26 Nov 2020 13:49:12 +0000 Subject: Fix for globalSubscriberId and requestId Issue-ID: SO-3401 Signed-off-by: tragait Change-Id: I33a71dffe7c63a50c807aa206d638a6aea5f1210 --- .../src/main/java/org/onap/aaiclient/client/aai/AAIRestClientI.java | 2 +- .../main/java/org/onap/aaiclient/client/aai/AAIRestClientImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'graph-inventory/aai-client/src') diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientI.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientI.java index 3b08761568..0e404e138b 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientI.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientI.java @@ -45,6 +45,6 @@ public interface AAIRestClientI { Optional getServiceInstanceById(String serviceInstanceId, String serviceType, String globalSubscriberId); - void updateServiceInstance(String globalSubscriberId, String serviceType, String serviceInstanceId, + void updateServiceInstance(String serviceInstanceId, String serviceType, String globalSubscriberId, ServiceInstance serviceInstance); } diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientImpl.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientImpl.java index c31d393b36..bf9ad56da7 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientImpl.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClientImpl.java @@ -106,8 +106,8 @@ public class AAIRestClientImpl implements AAIRestClientI { } @Override - public Optional getServiceInstanceById(String globalSubscriberId, String serviceType, - String serviceInstanceId) { + public Optional getServiceInstanceById(String serviceInstanceId, String serviceType, + String globalSubscriberId) { Response response = new AAIResourcesClient().getFullResponse( AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business().customer(globalSubscriberId) .serviceSubscription(serviceType).serviceInstance(serviceInstanceId))); @@ -115,7 +115,7 @@ public class AAIRestClientImpl implements AAIRestClientI { } @Override - public void updateServiceInstance(String globalSubscriberId, String serviceType, String serviceInstanceId, + public void updateServiceInstance(String serviceInstanceId, String serviceType, String globalSubscriberId, ServiceInstance serviceInstance) { try { new AAIResourcesClient().update(AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business() -- cgit 1.2.3-korg