X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fportal%2Fnonrtric%2Fcontrolpanel%2Fcontroller%2FEnrichmentController.java;h=c874dc13c6d940756ca4f98ab600012b584311c2;hb=b36108a6b4f18c5620ed120184bdd8c86c85c70e;hp=57019cead728f76f2c67a4e5fb5af8df8bd29c23;hpb=714fa4fa439de489c7ddec02a46ac8d2543ec7f2;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java
index 57019ce..c874dc1 100644
--- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java
+++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java
@@ -19,7 +19,6 @@
  */
 package org.oransc.portal.nonrtric.controlpanel.controller;
 
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
@@ -34,6 +33,9 @@ import org.oransc.portal.nonrtric.controlpanel.ControlPanelConstants;
 import org.oransc.portal.nonrtric.controlpanel.eiproducerapi.EiProducerApi;
 import org.oransc.portal.nonrtric.controlpanel.model.JobInfo;
 import org.oransc.portal.nonrtric.controlpanel.model.ProducerInfo;
+import org.oransc.portal.nonrtric.controlpanel.model.ProducerRegistrationInfo;
+import org.oransc.portal.nonrtric.controlpanel.model.ProducerRegistrationInfo.ProducerEiTypeRegistrationInfo;
+import org.oransc.portal.nonrtric.controlpanel.model.ProducerStatusInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +61,6 @@ public class EnrichmentController {
 
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-    private static com.google.gson.Gson gson = new GsonBuilder().create();
-
     // Publish paths in constants so tests are easy to write
     public static final String CONTROLLER_PATH = ControlPanelConstants.ENDPOINT_PREFIX + "/enrichment";
     // Endpoints
@@ -95,14 +95,9 @@ public class EnrichmentController {
     }
 
     private List<JobInfo> getJobs(JsonElement producerId) {
-        List<JobInfo> jobs = new ArrayList<>();
-        ResponseEntity<String> jobsResponse = this.eiProducerApi.getEiJobsForOneEiProducer(producerId.getAsString());
-        JsonArray jobsJson = JsonParser.parseString(jobsResponse.getBody()).getAsJsonArray();
-        for (JsonElement jobJson : jobsJson) {
-            JobInfo jobInfo = gson.fromJson(jobJson, JobInfo.class);
-            jobs.add(jobInfo);
-        }
-        return jobs;
+        ResponseEntity<List<JobInfo>> jobsResponse =
+            this.eiProducerApi.getEiJobsForOneEiProducer(producerId.getAsString());
+        return jobsResponse.getBody();
     }
 
     @ApiOperation(value = "Get EI producers")
@@ -125,19 +120,18 @@ public class EnrichmentController {
     }
 
     private String[] getSupportedTypes(JsonElement producerId) {
-        ResponseEntity<String> producerResponse = this.eiProducerApi.getEiProducer(producerId.getAsString());
-        JsonArray supportedTypesJson = JsonParser.parseString(producerResponse.getBody()).getAsJsonObject()
-            .get("supported_ei_types").getAsJsonArray();
+        ResponseEntity<ProducerRegistrationInfo> producerResponse =
+            this.eiProducerApi.getEiProducer(producerId.getAsString());
         List<String> supportedTypes = new ArrayList<>();
-        for (JsonElement typeJson : supportedTypesJson) {
-            supportedTypes.add(typeJson.getAsJsonObject().get("ei_type_identity").getAsString());
+        for (ProducerEiTypeRegistrationInfo type : producerResponse.getBody().types) {
+            supportedTypes.add(type.eiTypeId);
         }
         return supportedTypes.toArray(new String[0]);
     }
 
     private String getProducerStatus(JsonElement producerId) {
-        ResponseEntity<String> statusResponse = this.eiProducerApi.getEiProducerStatus(producerId.getAsString());
-        return JsonParser.parseString(statusResponse.getBody()).getAsJsonObject().get("operational_state")
-            .getAsString();
+        ResponseEntity<ProducerStatusInfo> statusResponse =
+            this.eiProducerApi.getEiProducerStatus(producerId.getAsString());
+        return statusResponse.getBody().opState.toString();
     }
 }