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=27160f13c89e199f558f8f3552d8ba11b01920b8;hb=366bc97828bf62e39a41318c1407a2c7c8cb5b74;hp=e8bb659c2eac059bdbe0154e60a5bf5723803ed3;hpb=e912ee4367d6a305ac038c86dec816b5ce71191b;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 e8bb659c..27160f13 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
@@ -20,10 +20,12 @@
 
 package org.oransc.enrichment.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
@@ -33,7 +35,10 @@ import java.util.List;
 import lombok.Getter;
 
 import org.oransc.enrichment.controllers.VoidResponse;
-import org.oransc.enrichment.controllers.consumer.ConsumerEiJobStatus;
+import org.oransc.enrichment.controllers.a1e.A1eConsts;
+import org.oransc.enrichment.controllers.a1e.A1eEiJobStatus;
+import org.oransc.enrichment.controllers.r1consumer.ConsumerConsts;
+import org.oransc.enrichment.controllers.r1consumer.ConsumerTypeRegistrationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -45,38 +50,75 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController("ConsumerSimulatorController")
-@Api(tags = {"A1-EI (enrichment information) callbacks"})
 public class ConsumerSimulatorController {
 
     private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
     public static class TestResults {
 
-        public List<ConsumerEiJobStatus> status = Collections.synchronizedList(new ArrayList<ConsumerEiJobStatus>());
+        public List<A1eEiJobStatus> eiJobStatusCallbacks =
+            Collections.synchronizedList(new ArrayList<A1eEiJobStatus>());
+        public List<ConsumerTypeRegistrationInfo> typeRegistrationInfoCallbacks =
+            Collections.synchronizedList(new ArrayList<ConsumerTypeRegistrationInfo>());
 
         public void reset() {
-            status.clear();
+            eiJobStatusCallbacks.clear();
+            typeRegistrationInfoCallbacks.clear();
         }
     }
 
     @Getter
     private TestResults testResults = new TestResults();
 
-    public static String getJobStatusUrl(String eiJobId) {
-        return "/consumer_simulator/eijobs/" + eiJobId + "/status";
+    public static String getJobStatusUrl(String infoJobId) {
+        return "/example_dataconsumer/info_jobs/" + infoJobId + "/status";
     }
 
-    @PostMapping(path = "/consumer_simulator/eijobs/{eiJobId}/status", produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiOperation(value = "Callback for EI job status", notes = "")
+    @Tag(name = A1eConsts.CONSUMER_API_CALLBACKS_NAME)
+    @PostMapping(
+        path = "/example_dataconsumer/info_jobs/{infoJobId}/status",
+        produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(
+        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(code = 200, message = "OK", response = VoidResponse.class)} //
-    )
+            @ApiResponse(
+                responseCode = "200",
+                description = "OK", //
+                content = @Content(schema = @Schema(implementation = VoidResponse.class))) //
+        })
     public ResponseEntity<Object> jobStatusCallback( //
-        @PathVariable("eiJobId") String eiJobId, //
-        @RequestBody ConsumerEiJobStatus status) {
-        logger.info("Job status callback status: {} eiJobId: {}", status.state, eiJobId);
-        this.testResults.status.add(status);
+        @PathVariable("infoJobId") String infoJobId, //
+        @RequestBody A1eEiJobStatus status) {
+        logger.info("Job status callback status: {} infoJobId: {}", status.state, infoJobId);
+        this.testResults.eiJobStatusCallbacks.add(status);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    private static final String TYPE_STATUS_CALLBACK_URL = "/example_dataconsumer/info_type_status";
+
+    public static String getTypeStatusCallbackUrl() {
+        return TYPE_STATUS_CALLBACK_URL;
+    }
+
+    @Tag(name = ConsumerConsts.CONSUMER_API_CALLBACKS_NAME)
+    @PostMapping(path = TYPE_STATUS_CALLBACK_URL, produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(
+        summary = "Callback for changed Information type registration status",
+        description = "The primitive is implemented by the data consumer and is invoked when a Information type status has been changed. <br/>"
+            + "Subscription are managed by primitives in '" + ConsumerConsts.CONSUMER_API_NAME + "'")
+    @ApiResponses(
+        value = { //
+            @ApiResponse(
+                responseCode = "200",
+                description = "OK", //
+                content = @Content(schema = @Schema(implementation = VoidResponse.class))) //
+        })
+    public ResponseEntity<Object> typeStatusCallback( //
+        @RequestBody ConsumerTypeRegistrationInfo status) {
+        logger.info("Job type registration status callback status: {}", status);
+        this.testResults.typeRegistrationInfoCallbacks.add(status);
         return new ResponseEntity<>(HttpStatus.OK);
     }