From 6b978b5e222daa3cd3ea402fa100a1fde78f3f10 Mon Sep 17 00:00:00 2001 From: Lathish Date: Wed, 19 Aug 2020 15:26:41 +0100 Subject: Update Sli Version to release version Set DG response to A1 response Issue-ID: CCSDK-2604 Change-Id: I6b3f5e80e452fd754f8157336b795dbc2d40e586 Signed-off-by: Lathish --- .../ccsdk/features/a1/adapter/A1AdapterProvider.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'a1-adapter/a1-adapter-api/provider') diff --git a/a1-adapter/a1-adapter-api/provider/src/main/java/org/onap/ccsdk/features/a1/adapter/A1AdapterProvider.java b/a1-adapter/a1-adapter-api/provider/src/main/java/org/onap/ccsdk/features/a1/adapter/A1AdapterProvider.java index ed7bc95e..42cd5000 100644 --- a/a1-adapter/a1-adapter-api/provider/src/main/java/org/onap/ccsdk/features/a1/adapter/A1AdapterProvider.java +++ b/a1-adapter/a1-adapter-api/provider/src/main/java/org/onap/ccsdk/features/a1/adapter/A1AdapterProvider.java @@ -129,7 +129,8 @@ public class A1AdapterProvider implements AutoCloseable, A1ADAPTERAPIService { if (a1AdapterClient.hasGraph("A1-ADAPTER-API", svcOperation, null, "sync")) { log.info("A1AdapterClient has a Directed Graph for '" + svcOperation + "'"); try { - a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", deleteResponse, parms); + Properties responseParms = a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", deleteResponse, parms); + log.info("responseParms::"+responseParms.getProperty("body")); deleteResponse.setHttpStatus(200); } catch (Exception e) { log.error("Caught exception executing service logic for " + svcOperation, e); @@ -170,7 +171,9 @@ public class A1AdapterProvider implements AutoCloseable, A1ADAPTERAPIService { if (a1AdapterClient.hasGraph("A1-ADAPTER-API", svcOperation, null, "sync")) { log.info("A1AdapterClient has a Directed Graph for '" + svcOperation + "'"); try { - a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyResponse, parms); + Properties responseParms = a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyResponse, parms); + log.info("responseParms::"+responseParms.getProperty("body")); + policyResponse.setBody(responseParms.getProperty("body")); policyResponse.setHttpStatus(200); } catch (Exception e) { log.error("Caught exception executing service logic for " + svcOperation, e); @@ -211,7 +214,9 @@ public class A1AdapterProvider implements AutoCloseable, A1ADAPTERAPIService { if (a1AdapterClient.hasGraph("A1-ADAPTER-API", svcOperation, null, "sync")) { log.info("A1AdapterClient has a Directed Graph for '" + svcOperation + "'"); try { - a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyStatusResponse, parms); + Properties responseParms = a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyStatusResponse, parms); + log.info("responseParms::"+responseParms.getProperty("body")); + policyStatusResponse.setBody(responseParms.getProperty("body")); policyStatusResponse.setHttpStatus(200); } catch (Exception e) { log.error("Caught exception executing service logic for " + svcOperation, e); @@ -252,7 +257,9 @@ public class A1AdapterProvider implements AutoCloseable, A1ADAPTERAPIService { if (a1AdapterClient.hasGraph("A1-ADAPTER-API", svcOperation, null, "sync")) { log.info("A1AdapterClient has a Directed Graph for '" + svcOperation + "'"); try { - a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyTypeResponse, parms); + Properties responseParms = a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyTypeResponse, parms); + log.info("responseParms::"+responseParms.getProperty("body")); + policyTypeResponse.setBody(responseParms.getProperty("body")); policyTypeResponse.setHttpStatus(200); } catch (Exception e) { log.error("Caught exception executing service logic for " + svcOperation, e); @@ -293,7 +300,9 @@ public class A1AdapterProvider implements AutoCloseable, A1ADAPTERAPIService { if (a1AdapterClient.hasGraph("A1-ADAPTER-API", svcOperation, null, "sync")) { log.info("A1AdapterClient has a Directed Graph for '" + svcOperation + "'"); try { - a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyResponse, parms); + Properties responseParms = a1AdapterClient.execute("A1-ADAPTER-API", svcOperation, null, "sync", policyResponse, parms); + log.info("responseParms::"+responseParms.getProperty("body")); + policyResponse.setBody(responseParms.getProperty("body")); policyResponse.setHttpStatus(200); } catch (Exception e) { log.error("Caught exception executing service logic for " + svcOperation, e); -- cgit 1.2.3-korg