RFC 8040 API Support in SO

-Support for RFC8040 APIs
-Changes in SelfLink at SO while querying
-Allow rpc GENERIC-RESOURCE-API in SDNC output
-RFC OOM Changes- https://gerrit.onap.org/r/c/oom/+/139164
-SDNC-Northbound-3.0.2 version
-SO Compliance RFC8040-Successful Migration

Issue-ID: SO-4127
Change-ID: I93f84f909a814d488f62f8b36606b0644d8b8608
Signed-off-by: sx00562924 <SX00562924@techmahindra.com>

2 files changed, 11 insertions, 2 deletions

diff --git a/so-sdn-clients/pom.xml b/so-sdn-clients/pom.xml
index 7871db2558..a93adf9a09 100644
--- a/so-sdn-clients/pom.xml
+++ b/so-sdn-clients/pom.xml
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>so-sdn-clients</artifactId>
   <properties>
-    <sdnc.northbound.version>1.5.2</sdnc.northbound.version>
+    <sdnc.northbound.version>3.0.2</sdnc.northbound.version>
   </properties>
   <build>
     <plugins>
@@ -130,6 +130,14 @@
       <artifactId>aai-client</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- RFC Supporting Dependencies -->
+    <dependency>
+      <groupId>org.onap.sdnc.northbound</groupId>
+      <artifactId>generic-resource-api-model-swagger</artifactId>
+      <version>3.0.2</version>
+      <type>yaml</type>
+    </dependency>
+    <!-- RFC Supporting Dependencies -->
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
diff --git a/so-sdn-clients/src/main/java/org/onap/so/client/sdnc/SDNCClient.java b/so-sdn-clients/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
index e29d65857c..ab0f354994 100644
--- a/so-sdn-clients/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
+++ b/so-sdn-clients/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
@@ -81,10 +81,11 @@ public class SDNCClient {
      * @throws MapperException
      * @throws BadResponseException
      */
+    // Build TargetUrl as per RFC-8040 standards
     public String get(String queryLink) throws MapperException, BadResponseException {
         String request = "";
         String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
-        String targetUrl = UriBuilder.fromUri(properties.getHost()).path(queryLink).build().toString();
+        String targetUrl = properties.getHost() + "/" + queryLink;
         BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
         STOClient.setTargetUrl(targetUrl);
         HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth(), false);