X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fcontrollers%2FRicRepositoryController.java;h=7c63dcd815ac6b2fc12e28540e4795654acfba62;hb=ce1713127bd5445b3890efddf4609cb8b8d58054;hp=34fc4c1edf35e9310ebfbb6a8934e4e41846658c;hpb=3ed724aaef96d30347f9a60ca111627b28133721;p=nonrtric.git

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 34fc4c1e..7c63dcd8 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
@@ -17,20 +17,20 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
+
 package org.oransc.policyagent.controllers;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import java.util.Optional;
 import java.util.Vector;
-
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.configuration.RicConfig;
+import org.oransc.policyagent.repository.Ric;
+import org.oransc.policyagent.repository.Rics;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -42,13 +42,17 @@ import org.springframework.web.bind.annotation.RestController;
 public class RicRepositoryController {
 
     private final ApplicationConfig appConfig;
+
+    @Autowired
+    private Rics rics;
+
     private static Gson gson = new GsonBuilder() //
         .serializeNulls() //
         .create(); //
 
     @Autowired
-    RicRepositoryController(ApplicationConfig config) {
-        this.appConfig = config;
+    RicRepositoryController(ApplicationConfig appConfig) {
+        this.appConfig = appConfig;
     }
 
     /**
@@ -84,14 +88,14 @@ public class RicRepositoryController {
             @ApiResponse(code = 200, message = "OK") //
         })
     public ResponseEntity<String> getRics() {
-        Vector<RicInfo> result = new Vector<RicInfo>();
-        for (RicConfig ricConfig : this.appConfig.getRicConfigs()) {
-            RicInfo ric = ImmutableRicInfo.builder() //
-                .managedElementIds(ricConfig.managedElementIds()) //
-                .name(ricConfig.name()) //
-                .build();
-            result.add(ric);
+        Vector<RicInfo> result = new Vector<>();
+        for (Ric ric : rics.getRics()) {
+            result.add(ImmutableRicInfo.builder() //
+                .name(ric.name()) //
+                .managedElementIds(ric.getManagedNodes()) //
+                .build());
         }
+
         return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
     }