X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=enrichment-coordinator-service%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fenrichment%2Frepository%2FEiProducers.java;h=fcc915684a0ef63916a1ea897e4fab9d4be2a423;hb=c760c62129b21c31243a331cf3c8f1963a1058a3;hp=483850d97ed6a30d567eb18df280822bbbd3dfe6;hpb=ebf3211ddd6e634ca9c0a2fec56abd1f12c7625d;p=nonrtric.git diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiProducers.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiProducers.java index 483850d9..fcc91568 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiProducers.java +++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiProducers.java @@ -20,22 +20,118 @@ package org.oransc.enrichment.repository; +import java.lang.invoke.MethodHandles; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Vector; +import org.immutables.value.Value.Immutable; +import org.oransc.enrichment.controllers.consumer.ConsumerCallbacks; +import org.oransc.enrichment.controllers.producer.ProducerCallbacks; import org.oransc.enrichment.exceptions.ServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** - * Dynamic representation of all Rics in the system. + * Dynamic representation of all EiProducers. */ +@SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally +@Component public class EiProducers { - private Map allEiProducers = new HashMap<>(); + private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + private final Map allEiProducers = new HashMap<>(); + private final MultiMap producersByType = new MultiMap<>(); - public synchronized void put(EiProducer producer) { - allEiProducers.put(producer.id(), producer); + @Autowired + private ProducerCallbacks producerCallbacks; + @Autowired + private ConsumerCallbacks consumerCallbacks; + + @Autowired + private EiTypes eiTypes; + + @Autowired + private EiJobs eiJobs; + + @Immutable + public interface EiTypeRegistrationInfo { + String id(); + + Object jobDataSchema(); + } + + @Immutable + public interface EiProducerRegistrationInfo { + String id(); + + Collection supportedTypes(); + + String jobCallbackUrl(); + + String producerSupervisionCallbackUrl(); + + } + + public EiProducer registerProducer(EiProducerRegistrationInfo producerInfo) { + final String producerId = producerInfo.id(); + EiProducer previousDefinition = this.get(producerId); + if (previousDefinition != null) { + for (EiType type : previousDefinition.getEiTypes()) { + producersByType.remove(type.getId(), producerId); + } + allEiProducers.remove(producerId); + } + + EiProducer producer = createProducer(producerInfo); + allEiProducers.put(producer.getId(), producer); + for (EiType type : producer.getEiTypes()) { + producersByType.put(type.getId(), producer.getId(), producer); + } + + if (previousDefinition != null) { + purgeTypes(previousDefinition.getEiTypes()); + this.consumerCallbacks.notifyConsumersProducerDeleted(previousDefinition); + } + + producerCallbacks.restartEiJobs(producer, this.eiJobs); + consumerCallbacks.notifyConsumersProducerAdded(producer); + return producer; + } + + private void purgeTypes(Collection types) { + for (EiType type : types) { + if (getProducersForType(type.getId()).isEmpty()) { + this.eiTypes.remove(type); + } + } + } + + private EiType getType(EiTypeRegistrationInfo typeInfo) { + EiType type = this.eiTypes.get(typeInfo.id()); + if (type == null) { + type = new EiType(typeInfo.id(), typeInfo.jobDataSchema()); + this.eiTypes.put(type); + this.consumerCallbacks.notifyConsumersTypeAdded(type); + } + return type; + } + + private EiProducer createProducer(EiProducerRegistrationInfo producerInfo) { + ArrayList types = new ArrayList<>(); + + EiProducer producer = new EiProducer(producerInfo.id(), types, producerInfo.jobCallbackUrl(), + producerInfo.producerSupervisionCallbackUrl()); + + for (EiTypeRegistrationInfo typeInfo : producerInfo.supportedTypes()) { + EiType type = getType(typeInfo); + types.add(type); + } + return producer; } public synchronized Collection getAllProducers() { @@ -54,19 +150,42 @@ public class EiProducers { return allEiProducers.get(id); } - public synchronized void remove(String id) { - this.allEiProducers.remove(id); - } - - public synchronized void remove(EiProducer producer) { - this.allEiProducers.remove(producer.id()); - } - public synchronized int size() { return allEiProducers.size(); } public synchronized void clear() { this.allEiProducers.clear(); + this.producersByType.clear(); } + + public void deregisterProducer(EiProducer producer, EiTypes eiTypes) { + allEiProducers.remove(producer.getId()); + for (EiType type : producer.getEiTypes()) { + if (producersByType.remove(type.getId(), producer.getId()) == null) { + this.logger.error("Bug, no producer found"); + } + if (this.producersByType.get(type.getId()).isEmpty()) { + eiTypes.remove(type); + } + } + this.consumerCallbacks.notifyConsumersProducerDeleted(producer); + } + + public synchronized Collection getProducersForType(EiType type) { + return this.producersByType.get(type.getId()); + } + + public synchronized Collection getProducersForType(String typeId) { + return this.producersByType.get(typeId); + } + + public synchronized Collection getProducerIdsForType(String typeId) { + Collection producerIds = new ArrayList<>(); + for (EiProducer p : this.getProducersForType(typeId)) { + producerIds.add(p.getId()); + } + return producerIds; + } + }