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=297f5bc73a0a9294ee184ab3086c73c92b4ba90b;hb=8d398eb56dc92917c7c461a5b21e2a27bffe0ba8;hp=0037c332b9d84f00562ea92138992a5ff94d3d1b;hpb=6b4c6ef963e37ebdff26337cd90684e3e2ff2a6c;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 0037c33..297f5bc 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 @@ -34,16 +34,17 @@ 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; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.annotation.Secured; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -61,12 +62,9 @@ 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 - public static final String VERSION_METHOD = ControlPanelConstants.VERSION_METHOD; public static final String EI_TYPES = "eitypes"; public static final String EI_PRODUCERS = "eiproducers"; public static final String EI_JOBS = "eijobs"; @@ -76,6 +74,7 @@ public class EnrichmentController { // Populated by the autowired constructor private final EiProducerApi eiProducerApi; + public static com.google.gson.Gson gson = new GsonBuilder().create(); @Autowired public EnrichmentController(final EiProducerApi eiProducerApi) { @@ -84,45 +83,9 @@ public class EnrichmentController { logger.debug("enrichment: configured with client type {}", eiProducerApi.getClass().getName()); } - /* - * The fields are defined in the Enrichment Control Typescript interface. - */ - @ApiOperation(value = "Get the EI type identifiers") - @GetMapping(EI_TYPES) - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity getAllEiTypeIds() { - logger.debug("getAllEiTypeIds"); - return this.eiProducerApi.getAllEiTypeIds(); - } - - @ApiOperation(value = "Get an individual EI type") - @GetMapping(EI_TYPES + "/{" + EI_TYPE_ID + "}") - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity getEiType(@PathVariable(EI_TYPE_ID) String eiTypeId) { - logger.debug("getEiType {}", eiTypeId); - return this.eiProducerApi.getEiType(eiTypeId); - } - - @ApiOperation(value = "Get an individual EI producer") - @GetMapping(EI_PRODUCERS + "/{" + EI_PRODUCER_ID + "}") - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity getEiProducer(@PathVariable(EI_PRODUCER_ID) String eiProducerId) { - logger.debug("getEiProducer {}", eiProducerId); - return this.eiProducerApi.getEiProducer(eiProducerId); - } - - @ApiOperation(value = "Get the EI job definitions for one EI producer") - @GetMapping(EI_PRODUCERS + "/{" + EI_PRODUCER_ID + "}/" + EI_JOBS) - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity getEiJobsForOneEiProducer(@PathVariable(EI_PRODUCER_ID) String eiProducerId) { - logger.debug("getEiJobsForOneEiProducer {}", eiProducerId); - return this.eiProducerApi.getEiJobsForOneEiProducer(eiProducerId); - } - @ApiOperation(value = "Get the EI job definitions for one EI producer") @GetMapping(EI_JOBS) - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity> getEiJobs() { + public ResponseEntity getEiJobs() { logger.debug("getEiJobs"); ResponseEntity response = this.eiProducerApi.getAllEiProducerIds(); JsonArray bodyJson = JsonParser.parseString(response.getBody()).getAsJsonArray(); @@ -130,24 +93,18 @@ public class EnrichmentController { for (JsonElement producerId : bodyJson) { allJobs.addAll(getJobs(producerId)); } - return new ResponseEntity<>(allJobs, HttpStatus.OK); + return new ResponseEntity<>(gson.toJson(allJobs), HttpStatus.OK); } private List getJobs(JsonElement producerId) { - List jobs = new ArrayList<>(); - ResponseEntity 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> jobsResponse = + this.eiProducerApi.getEiJobsForOneEiProducer(producerId.getAsString()); + return jobsResponse.getBody(); } @ApiOperation(value = "Get EI producers") @GetMapping(EI_PRODUCERS) - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity> getEiProducers() { + public ResponseEntity getEiProducers() { logger.debug("getEiProducers"); ResponseEntity response = this.eiProducerApi.getAllEiProducerIds(); JsonArray bodyJson = JsonParser.parseString(response.getBody()).getAsJsonArray(); @@ -161,31 +118,22 @@ public class EnrichmentController { producers.add(producerInfo); } - return new ResponseEntity<>(producers, HttpStatus.OK); + return new ResponseEntity<>(gson.toJson(producers), HttpStatus.OK); } private String[] getSupportedTypes(JsonElement producerId) { - ResponseEntity producerResponse = this.eiProducerApi.getEiProducer(producerId.getAsString()); - JsonArray supportedTypesJson = JsonParser.parseString(producerResponse.getBody()).getAsJsonObject() - .get("supported_ei_types").getAsJsonArray(); + ResponseEntity producerResponse = + this.eiProducerApi.getEiProducer(producerId.getAsString()); List 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 statusResponse = this.eiProducerApi.getEiProducerStatus(producerId.getAsString()); - return JsonParser.parseString(statusResponse.getBody()).getAsJsonObject().get("operational_state") - .getAsString(); - } - - @ApiOperation(value = "Get the status of an EI producer") - @GetMapping(EI_PRODUCERS + "/{" + EI_PRODUCER_ID + "}/" + STATUS) - @Secured({ControlPanelConstants.ROLE_ADMIN, ControlPanelConstants.ROLE_STANDARD}) - public ResponseEntity getEiProducerStatus(@PathVariable(EI_PRODUCER_ID) String eiProducerId) { - logger.debug("getEiProducerStatus {}", eiProducerId); - return this.eiProducerApi.getEiProducerStatus(eiProducerId); + ResponseEntity statusResponse = + this.eiProducerApi.getEiProducerStatus(producerId.getAsString()); + return statusResponse.getBody().opState.toString(); } }