X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=enrichment-coordinator-service%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fenrichment%2Fcontrollers%2Fconsumer%2FConsumerController.java;h=8267b6affffc2b93d28c931c025dda81e8b20d01;hb=e912ee4367d6a305ac038c86dec816b5ce71191b;hp=bead826583fff32d1f6ffd99230bc156f1c31a3b;hpb=9e3bf9348a6f2a739411316591093f3b9a0fc937;p=nonrtric.git diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java index bead8265..8267b6af 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java +++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java @@ -30,22 +30,25 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import org.everit.json.schema.Schema; import org.everit.json.schema.loader.SchemaLoader; import org.json.JSONObject; -import org.oransc.enrichment.clients.ProducerCallbacks; import org.oransc.enrichment.configuration.ApplicationConfig; import org.oransc.enrichment.controllers.ErrorResponse; import org.oransc.enrichment.controllers.VoidResponse; +import org.oransc.enrichment.controllers.producer.ProducerCallbacks; import org.oransc.enrichment.exceptions.ServiceException; import org.oransc.enrichment.repository.EiJob; import org.oransc.enrichment.repository.EiJobs; +import org.oransc.enrichment.repository.EiProducers; import org.oransc.enrichment.repository.EiType; import org.oransc.enrichment.repository.EiTypes; -import org.oransc.enrichment.repository.ImmutableEiJob; +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; @@ -66,6 +69,8 @@ import reactor.core.publisher.Mono; @RequestMapping(path = ConsumerConsts.API_ROOT, produces = MediaType.APPLICATION_JSON_VALUE) public class ConsumerController { + private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + @Autowired ApplicationConfig applicationConfig; @@ -75,11 +80,13 @@ public class ConsumerController { @Autowired private EiTypes eiTypes; + @Autowired + private EiProducers eiProducers; + @Autowired ProducerCallbacks producerCallbacks; - private static Gson gson = new GsonBuilder() // - .create(); // + private static Gson gson = new GsonBuilder().create(); @GetMapping(path = "/eitypes", produces = MediaType.APPLICATION_JSON_VALUE) @ApiOperation(value = "EI type identifiers", notes = "") @@ -149,14 +156,14 @@ public class ConsumerController { List result = new ArrayList<>(); if (owner != null) { for (EiJob job : this.eiJobs.getJobsForOwner(owner)) { - if (eiTypeId == null || job.type().getId().equals(eiTypeId)) { - result.add(job.id()); + if (eiTypeId == null || job.getTypeId().equals(eiTypeId)) { + result.add(job.getId()); } } } else if (eiTypeId != null) { - this.eiJobs.getJobsForType(eiTypeId).forEach(job -> result.add(job.id())); + this.eiJobs.getJobsForType(eiTypeId).forEach(job -> result.add(job.getId())); } else { - this.eiJobs.getJobs().forEach(job -> result.add(job.id())); + this.eiJobs.getJobs().forEach(job -> result.add(job.getId())); } return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK); } catch ( @@ -205,8 +212,10 @@ public class ConsumerController { } private ConsumerEiJobStatus toEiJobStatus(EiJob job) { - // TODO - return new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.ENABLED); + return this.eiProducers.isJobEnabled(job) + ? new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.ENABLED) + : new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.DISABLED); + } @DeleteMapping(path = "/eijobs/{eiJobId}", produces = MediaType.APPLICATION_JSON_VALUE) @@ -223,8 +232,7 @@ public class ConsumerController { @PathVariable("eiJobId") String eiJobId) { try { EiJob job = this.eiJobs.getJob(eiJobId); - this.eiJobs.remove(job); - this.producerCallbacks.notifyProducersJobDeleted(job); + this.eiJobs.remove(job, this.eiProducers); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } catch (Exception e) { return ErrorResponse.create(e, HttpStatus.NOT_FOUND); @@ -251,21 +259,17 @@ public class ConsumerController { final boolean isNewJob = this.eiJobs.get(eiJobId) == null; return validatePutEiJob(eiJobId, eiJobObject) // - .flatMap(this::notifyProducersNewJob) // + .flatMap(this::startEiJob) // .doOnNext(newEiJob -> this.eiJobs.put(newEiJob)) // .flatMap(newEiJob -> Mono.just(new ResponseEntity<>(isNewJob ? HttpStatus.CREATED : HttpStatus.OK))) .onErrorResume(throwable -> Mono.just(ErrorResponse.create(throwable, HttpStatus.NOT_FOUND))); } - private Mono notifyProducersNewJob(EiJob newEiJob) { - return this.producerCallbacks.notifyProducersJobStarted(newEiJob) // - .flatMap(noOfAcceptingProducers -> { - if (noOfAcceptingProducers.intValue() > 0) { - return Mono.just(newEiJob); - } else { - return Mono.error(new ServiceException("Job not accepted by any producers", HttpStatus.CONFLICT)); - } - }); + private Mono startEiJob(EiJob newEiJob) { + return this.producerCallbacks.startEiJob(newEiJob, eiProducers) // + .doOnNext(noOfAcceptingProducers -> this.logger.debug( + "Started EI job {}, number of activated producers: {}", newEiJob.getId(), noOfAcceptingProducers)) // + .flatMap(noOfAcceptingProducers -> Mono.just(newEiJob)); } private Mono validatePutEiJob(String eiJobId, ConsumerEiJobInfo eiJobInfo) { @@ -274,7 +278,7 @@ public class ConsumerController { validateJsonObjectAgainstSchema(eiType.getJobDataSchema(), eiJobInfo.jobData); EiJob existingEiJob = this.eiJobs.get(eiJobId); - if (existingEiJob != null && !existingEiJob.type().getId().equals(eiJobInfo.eiTypeId)) { + if (existingEiJob != null && !existingEiJob.getTypeId().equals(eiJobInfo.eiTypeId)) { throw new ServiceException("Not allowed to change type for existing EI job", HttpStatus.CONFLICT); } return Mono.just(toEiJob(eiJobInfo, eiJobId, eiType)); @@ -301,15 +305,14 @@ public class ConsumerController { } } - // Status TBD - private EiJob toEiJob(ConsumerEiJobInfo info, String id, EiType type) { - return ImmutableEiJob.builder() // + return EiJob.builder() // .id(id) // - .type(type) // + .typeId(type.getId()) // .owner(info.owner) // .jobData(info.jobData) // - .targetUri(info.targetUri) // + .targetUrl(info.targetUri) // + .jobStatusUrl(info.statusNotificationUri == null ? "" : info.statusNotificationUri) // .build(); } @@ -318,6 +321,7 @@ public class ConsumerController { } private ConsumerEiJobInfo toEiJobInfo(EiJob s) { - return new ConsumerEiJobInfo(s.type().getId(), s.jobData(), s.owner(), s.targetUri()); + return new ConsumerEiJobInfo(s.getTypeId(), s.getJobData(), s.getOwner(), s.getTargetUrl(), + s.getJobStatusUrl()); } }