Updates of the policy agent NBI

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / controllers / RicRepositoryController.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
index 0d49833..38369a8 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
@@ -57,14 +57,14 @@ public class RicRepositoryController {
     }
 
     /**
-     * Example: http://localhost:8080/rics?managedElementId=kista_1
+     * Example: http://localhost:8081/rics?managedElementId=kista_1
      */
     @GetMapping("/ric")
-    @ApiOperation(value = "Returns the name of a RIC managing one Mananged Element", response = String.class)
+    @ApiOperation(value = "Returns the name of a RIC managing one Mananged Element")
     @ApiResponses(
         value = { //
-            @ApiResponse(code = 200, message = "RIC is fond"), //
-            @ApiResponse(code = 404, message = "RIC is not fond") //
+            @ApiResponse(code = 200, message = "RIC is fond", response = String.class), //
+            @ApiResponse(code = 404, message = "RIC is not fond", response = String.class) //
         })
     public ResponseEntity<String> getRic(
         @RequestParam(name = "managedElementId", required = false, defaultValue = "") String managedElementId) {
@@ -80,13 +80,13 @@ public class RicRepositoryController {
 
     /**
      * @return a Json array of all RIC data
-     *         Example: http://localhost:8080/ric
+     *         Example: http://localhost:8081/ric
      */
     @GetMapping("/rics")
-    @ApiOperation(value = "Returns defined NearRT RIC:s as Json", response = RicInfo.class)
+    @ApiOperation(value = "Query NearRT RIC information")
     @ApiResponses(
         value = { //
-            @ApiResponse(code = 200, message = "OK", response = RicInfo.class) //
+            @ApiResponse(code = 200, message = "OK", response = RicInfo.class, responseContainer = "List") //
         })
     public ResponseEntity<String> getRics(
         @RequestParam(name = "policyType", required = false) String supportingPolicyType) {
@@ -95,11 +95,7 @@ public class RicRepositoryController {
         synchronized (rics) {
             for (Ric ric : rics.getRics()) {
                 if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
-                    result.add(ImmutableRicInfo.builder() //
-                        .name(ric.name()) //
-                        .managedElementIds(ric.getManagedElementIds()) //
-                        .policyTypes(ric.getSupportedPolicyTypeNames()) //
-                        .build());
+                    result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames()));
                 }
             }
         }