X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=information-coordinator-service%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fics%2Fcontroller%2FProducerSimulatorController.java;h=9e383949f66c042a44c13ec4611077c65733cb0d;hb=721a0c1f9728a06c78edd75ba898bc67c4b82446;hp=55d32b026ff44916e12799399fed699289ecb70b;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git diff --git a/information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java b/information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java index 55d32b02..9e383949 100644 --- a/information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java +++ b/information-coordinator-service/src/test/java/org/oransc/ics/controller/ProducerSimulatorController.java @@ -36,6 +36,7 @@ import lombok.Getter; import org.oransc.ics.controllers.ErrorResponse; import org.oransc.ics.controllers.VoidResponse; +import org.oransc.ics.controllers.r1consumer.ConsumerConsts; import org.oransc.ics.controllers.r1producer.ProducerConsts; import org.oransc.ics.controllers.r1producer.ProducerJobInfo; import org.slf4j.Logger; @@ -51,16 +52,16 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController("ProducerSimulatorController") -@Tag(name = ProducerConsts.PRODUCER_API_CALLBACKS_NAME) +@Tag(name = ProducerConsts.PRODUCER_API_CALLBACKS_NAME, description = ProducerConsts.PRODUCER_API_CALLBACKS_DESCRIPTION) public class ProducerSimulatorController { private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - public static final String JOB_URL = "/example_dataproducer/info_job"; - public static final String JOB_ERROR_URL = "/example_dataproducer/info_job_error"; + public static final String JOB_URL = "/example-dataproducer/info-job"; + public static final String JOB_ERROR_URL = "/example-dataproducer/info-job-error"; - public static final String SUPERVISION_URL = "/example_dataproducer/health_check"; - public static final String SUPERVISION_ERROR_URL = "/example_dataproducer/health_check_error"; + public static final String SUPERVISION_URL = "/example-dataproducer/health-check"; + public static final String SUPERVISION_ERROR_URL = "/example-dataproducer/health-check-error"; public static class TestResults { @@ -123,7 +124,7 @@ public class ProducerSimulatorController { content = @Content(schema = @Schema(implementation = VoidResponse.class))) // }) public ResponseEntity jobDeletedCallback( // - @PathVariable("infoJobId") String infoJobId) { + @PathVariable(ConsumerConsts.INFO_JOB_ID_PATH) String infoJobId) { try { logger.info("Job deleted callback {}", infoJobId); this.testResults.jobsStopped.add(infoJobId); @@ -159,7 +160,7 @@ public class ProducerSimulatorController { content = @Content(schema = @Schema(implementation = VoidResponse.class))) // }) public ResponseEntity jobDeletedCallbackReturnError( // - @PathVariable("infoJobId") String infoJobId) { + @PathVariable(ConsumerConsts.INFO_JOB_ID_PATH) String infoJobId) { logger.info("Job created (returning error) callback {}", infoJobId); this.testResults.noOfRejectedDelete += 1; return ErrorResponse.create("Producer returns error on delete job", HttpStatus.NOT_FOUND);