X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sdnc-a1-controller%2Fnorthbound%2Fnonrt-ric-api%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fsdnc%2Fnorthbound%2Frestadapter%2FNearRicUrlProvider.java;h=df83226b8e4e60177736a1901f04c755f8f69070;hb=refs%2Fchanges%2F31%2F2831%2F3;hp=bb73dbadc1a5a3d59afc3d5c8440dc6462d9b56e;hpb=444d11bb9de7be056d7609c395f3ef191c3c1702;p=nonrtric.git

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java
index bb73dbad..df83226b 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java
@@ -31,9 +31,6 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 public class NearRicUrlProvider {
 
-  public NearRicUrlProvider() {
-  }
-
   /**
    * Retrieve the base url of the Near-RIC
    *
@@ -41,8 +38,7 @@ public class NearRicUrlProvider {
    * @return the base url
    */
   public String getBaseUrl(final String nearRtRicUrl) {
-    String baseUrl = nearRtRicUrl + "/A1-P/v1";
-    return UriComponentsBuilder.fromUriString(baseUrl).build().toString();
+    return nearRtRicUrl + "/A1-P/v1";
   }
 
   /**
@@ -52,8 +48,7 @@ public class NearRicUrlProvider {
    * @return the policytypes url
    */
   public String policyTypesUrl(final String nearRtRicUrl) {
-    return UriComponentsBuilder.fromUriString(getBaseUrl(nearRtRicUrl)).pathSegment("policytypes")
-            .build().toString();
+    return UriComponentsBuilder.fromUriString(getBaseUrl(nearRtRicUrl)).pathSegment("policytypes").build().toString();
   }
 
   /**
@@ -63,8 +58,7 @@ public class NearRicUrlProvider {
    * @return the policies url
    */
   public String policiesUrl(final String nearRtRicUrl) {
-    return UriComponentsBuilder.fromUriString(getBaseUrl(nearRtRicUrl)).pathSegment("policies")
-            .build().toString();
+    return getBaseUrl(nearRtRicUrl) + "/policies";
   }
 
   /**
@@ -75,32 +69,39 @@ public class NearRicUrlProvider {
    * @return the policy type url
    */
   public String getPolicyTypeUrl(final String nearRtRicUrl, final String policyTypeId) {
-    return UriComponentsBuilder.fromUriString(policyTypesUrl(nearRtRicUrl)).pathSegment(policyTypeId)
-        .build().toString();
+    return UriComponentsBuilder.fromUriString(policyTypesUrl(nearRtRicUrl)).pathSegment(policyTypeId).build()
+        .toString();
   }
 
   /**
    * Retrieve the url of putPolicy
    *
    * @param nearRtRicUrl the near-rt-ric url
-   * @param policyId Policy Id
+   * @param policyId     Policy Id
    * @param policyTypeId Policy Type Id
    * @return the putPolicy url
    */
   public String putPolicyUrl(final String nearRtRicUrl, final String policyId, final String policyTypeId) {
-    return UriComponentsBuilder.fromUriString(policiesUrl(nearRtRicUrl))
-            .pathSegment(policyId + "?policyTypeId=" + policyTypeId).build().toString();
+    UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(policiesUrl(nearRtRicUrl)).pathSegment(policyId);
+
+    if (!policyTypeId.isEmpty()) {
+      builder.queryParam("policyTypeId", policyTypeId);
+    }
+    return builder.build().toString();
   }
 
   /**
    * Retrieve the url of deletePolicy
    *
    * @param nearRtRicUrl the near-rt-ric url
-   * @param policyId Policy Id
+   * @param policyId     Policy Id
    * @return the deletePolicy url
    */
   public String deletePolicyUrl(final String nearRtRicUrl, final String policyId) {
-    return UriComponentsBuilder.fromUriString(policiesUrl(nearRtRicUrl)).pathSegment(policyId)
-            .build().toString();
+    return UriComponentsBuilder.fromUriString(policiesUrl(nearRtRicUrl)).pathSegment(policyId).build().toString();
+  }
+
+  public String getPolicyStatusUrl(String nearRtRicUrl, String policyId) {
+    return policiesUrl(nearRtRicUrl) + "/" + policyId + "/status";
   }
 }