import com.google.gson.GsonBuilder;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
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.util.ArrayList;
+import java.util.Collection;
+
import org.oran.dmaapadapter.r1.ProducerJobInfo;
import org.oran.dmaapadapter.repository.InfoTypes;
import org.oran.dmaapadapter.repository.Job;
public class ProducerCallbacksController {
private static final Logger logger = LoggerFactory.getLogger(ProducerCallbacksController.class);
- public static final String API_NAME = "Management of configuration";
+ public static final String API_NAME = "Producer job control API";
public static final String API_DESCRIPTION = "";
public static final String JOB_URL = "/dmaap_dataproducer/info_job";
public static final String SUPERVISION_URL = "/dmaap_dataproducer/health_check";
description = "The call is invoked to activate or to modify a data subscription. The endpoint is provided by the Information Producer.")
@ApiResponses(value = { //
@ApiResponse(responseCode = "200", description = "OK", //
- content = @Content(schema = @Schema(implementation = VoidResponse.class))) //
+ content = @Content(schema = @Schema(implementation = VoidResponse.class))), //
+ @ApiResponse(responseCode = "404", description = "Information type is not found", //
+ content = @Content(schema = @Schema(implementation = ErrorResponse.ErrorInfo.class))), //
})
public ResponseEntity<Object> jobCreatedCallback( //
@RequestBody String body) {
ProducerJobInfo request = gson.fromJson(body, ProducerJobInfo.class);
logger.info("Job started callback {}", request.id);
- Job job = new Job(request.id, request.targetUri, types.getType(request.typeId));
+ Job job = new Job(request.id, request.targetUri, types.getType(request.typeId), request.owner,
+ request.lastUpdated, toJobParameters(request.jobData));
this.jobs.put(job);
return new ResponseEntity<>(HttpStatus.OK);
} catch (Exception e) {
}
}
+ private Job.Parameters toJobParameters(Object jobData) {
+ String json = gson.toJson(jobData);
+ return gson.fromJson(json, Job.Parameters.class);
+ }
+
+ @GetMapping(path = JOB_URL, produces = MediaType.APPLICATION_JSON_VALUE)
+ @Operation(summary = "Get all jobs", description = "Returns all info jobs, can be used for trouble shooting")
+ @ApiResponse(responseCode = "200", //
+ description = "Information jobs", //
+ content = @Content(array = @ArraySchema(schema = @Schema(implementation = ProducerJobInfo.class)))) //
+ public ResponseEntity<Object> getJobs() {
+
+ Collection<ProducerJobInfo> producerJobs = new ArrayList<>();
+ for (Job j : this.jobs.getAll()) {
+ producerJobs.add(new ProducerJobInfo(null, j.getId(), j.getType().getId(), j.getCallbackUrl(), j.getOwner(),
+ j.getLastUpdated()));
+ }
+ return new ResponseEntity<>(gson.toJson(producerJobs), HttpStatus.OK);
+ }
+
@DeleteMapping(path = JOB_URL + "/{infoJobId}", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Callback for Information Job deletion",
description = "The call is invoked to terminate a data subscription. The endpoint is provided by the Information Producer.")
})
public ResponseEntity<Object> jobDeletedCallback( //
@PathVariable("infoJobId") String infoJobId) {
- try {
- logger.info("Job deleted callback {}", infoJobId);
- this.jobs.remove(infoJobId);
- return new ResponseEntity<>(HttpStatus.OK);
- } catch (Exception e) {
- return ErrorResponse.create(e, HttpStatus.NOT_FOUND);
- }
+
+ logger.info("Job deleted callback {}", infoJobId);
+ this.jobs.remove(infoJobId);
+ return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping(path = SUPERVISION_URL, produces = MediaType.APPLICATION_JSON_VALUE)
content = @Content(schema = @Schema(implementation = String.class))) //
})
public ResponseEntity<Object> producerSupervision() {
- logger.info("Producer supervision");
+ logger.debug("Producer supervision");
return new ResponseEntity<>(HttpStatus.OK);
}