X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=enrichment-coordinator-service%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fenrichment%2Fcontroller%2FConsumerSimulatorController.java;h=a9702b29eec75d00b176e12423e4a58cdfd0877c;hb=c675b454a3434d690695a7336700f78a51579400;hp=660277f7cd4ffe83a3a2c6e2aee79c8fd64b0b0a;hpb=c5ea745a563f8bae0c0c3de3649a943e167f01cc;p=nonrtric.git diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java b/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java index 660277f7..a9702b29 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java +++ b/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java @@ -35,8 +35,8 @@ import java.util.List; import lombok.Getter; import org.oransc.enrichment.controllers.VoidResponse; -import org.oransc.enrichment.controllers.consumer.ConsumerConsts; -import org.oransc.enrichment.controllers.consumer.ConsumerEiJobStatus; +import org.oransc.enrichment.controllers.a1e.A1eConsts; +import org.oransc.enrichment.controllers.a1e.A1eEiJobStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -48,14 +48,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController("ConsumerSimulatorController") -@Tag(name = ConsumerConsts.CONSUMER_API_CALLBACKS_NAME) +@Tag(name = A1eConsts.CONSUMER_API_CALLBACKS_NAME) public class ConsumerSimulatorController { private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); public static class TestResults { - public List status = Collections.synchronizedList(new ArrayList()); + public List status = Collections.synchronizedList(new ArrayList()); public void reset() { status.clear(); @@ -65,14 +65,16 @@ public class ConsumerSimulatorController { @Getter private TestResults testResults = new TestResults(); - public static String getJobStatusUrl(String eiJobId) { - return "/example_dataconsumer/eijobs/" + eiJobId + "/status"; + public static String getJobStatusUrl(String infoJobId) { + return "/example_dataconsumer/info_jobs/" + infoJobId + "/status"; } - @PostMapping(path = "/example_dataconsumer/eijobs/{eiJobId}/status", produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping( + path = "/example_dataconsumer/info_jobs/{infoJobId}/status", + produces = MediaType.APPLICATION_JSON_VALUE) @Operation( - summary = "Callback for changed EI job status", - description = "The primitive is implemented by the data consumer and is invoked when a EI job status has been changed.") + summary = "Callback for changed Information Job status", + description = "The primitive is implemented by the data consumer and is invoked when a Information Job status has been changed.") @ApiResponses( value = { // @ApiResponse( @@ -81,9 +83,9 @@ public class ConsumerSimulatorController { content = @Content(schema = @Schema(implementation = VoidResponse.class))) // }) public ResponseEntity jobStatusCallback( // - @PathVariable("eiJobId") String eiJobId, // - @RequestBody ConsumerEiJobStatus status) { - logger.info("Job status callback status: {} eiJobId: {}", status.state, eiJobId); + @PathVariable("infoJobId") String infoJobId, // + @RequestBody A1eEiJobStatus status) { + logger.info("Job status callback status: {} infoJobId: {}", status.state, infoJobId); this.testResults.status.add(status); return new ResponseEntity<>(HttpStatus.OK); }