diff options
-rw-r--r-- | a1-adapter/a1-adapter-api/pom.xml | 6 | ||||
-rw-r--r-- | a1-adapter/a1-adapter-api/provider/src/main/java/org/onap/ccsdk/features/a1/adapter/A1AdapterProvider.java | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml index c1176eb2..2ee6b43f 100644 --- a/a1-adapter/a1-adapter-api/pom.xml +++ b/a1-adapter/a1-adapter-api/pom.xml @@ -34,6 +34,12 @@ <name>ccsdk-oran :: ${project.artifactId}</name> <properties> <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version> + <!-- Override the snapshot version from parent pom --> + <ccsdk.features.version>1.0.0</ccsdk.features.version> + <ccsdk.sli.core.version>1.0.0</ccsdk.sli.core.version> + <ccsdk.sli.adaptors.version>1.0.0</ccsdk.sli.adaptors.version> + <ccsdk.sli.northbound.version>1.0.0</ccsdk.sli.northbound.version> + <ccsdk.sli.plugins.version>1.0.0</ccsdk.sli.plugins.version> </properties> <modules> <module>model</module> 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); |