New EI Consumer API, aligned to ORAN WG2

[nonrtric.git] / enrichment-coordinator-service / src / main / java / org / oransc / enrichment / clients / ProducerCallbacks.java

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerCallbacks.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerCallbacks.java
index 07b188d..87d1dba 100644 (file)
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerCallbacks.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerCallbacks.java
@@ -26,13 +26,13 @@ import com.google.gson.GsonBuilder;
 import java.lang.invoke.MethodHandles;
 
 import org.oransc.enrichment.configuration.ApplicationConfig;
-import org.oransc.enrichment.configuration.ImmutableWebClientConfig;
-import org.oransc.enrichment.configuration.WebClientConfig;
 import org.oransc.enrichment.repository.EiJob;
 import org.oransc.enrichment.repository.EiProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * Callbacks to the EiProducer
@@ -41,54 +41,55 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class ProducerCallbacks {
 
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-    private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
-        .create(); //
+    private static Gson gson = new GsonBuilder().create();
 
-    @Autowired
-    ApplicationConfig applicationConfig;
+    private final AsyncRestClient restClient;
 
-    public void notifyProducersJobCreated(EiJob eiJob) {
-        for (EiProducer producer : eiJob.type().getProducers()) {
-            notifyProducerJobStarted(producer, eiJob);
-        }
+    public ProducerCallbacks(ApplicationConfig config) {
+        AsyncRestClientFactory restClientFactory = new AsyncRestClientFactory(config.getWebClientConfig());
+        this.restClient = restClientFactory.createRestClient("");
     }
 
     public void notifyProducersJobDeleted(EiJob eiJob) {
-        AsyncRestClient restClient = restClient(false);
         ProducerJobInfo request = new ProducerJobInfo(eiJob);
         String body = gson.toJson(request);
         for (EiProducer producer : eiJob.type().getProducers()) {
-            restClient.post(producer.jobDeletionCallbackUrl(), body) //
-                .subscribe(notUsed -> logger.debug("Job subscription started OK {}", producer.id()), //
-                    throwable -> logger.warn("Job subscription failed {}", producer.id(), throwable.toString()), null);
+            restClient.post(producer.getJobDeletionCallbackUrl(), body) //
+                .subscribe(notUsed -> logger.debug("Job deleted OK {}", producer.getId()), //
+                    throwable -> logger.warn("Job delete failed {}", producer.getId(), throwable.toString()), null);
         }
     }
 
-    public void notifyProducerJobStarted(EiProducer producer, EiJob eiJob) {
-        AsyncRestClient restClient = restClient(false);
-        ProducerJobInfo request = new ProducerJobInfo(eiJob);
-        String body = gson.toJson(request);
-
-        restClient.post(producer.jobCreationCallbackUrl(), body) //
-            .subscribe(notUsed -> logger.debug("Job subscription started OK {}", producer.id()), //
-                throwable -> logger.warn("Job subscription failed {}", producer.id(), throwable.toString()), null);
-
+    /**
+     * Calls all producers for an EiJob activation.
+     * 
+     * @param eiJob an EI job
+     * @return the number of producers that returned OK
+     */
+    public Mono<Integer> notifyProducersJobStarted(EiJob eiJob) {
+        return Flux.fromIterable(eiJob.type().getProducers()) //
+            .flatMap(eiProducer -> notifyProducerJobStarted(eiProducer, eiJob)) //
+            .collectList() //
+            .flatMap(okResponses -> Mono.just(Integer.valueOf(okResponses.size()))); //
     }
 
-    private AsyncRestClient restClient(boolean useTrustValidation) {
-        WebClientConfig config = this.applicationConfig.getWebClientConfig();
-        config = ImmutableWebClientConfig.builder() //
-            .keyStoreType(config.keyStoreType()) //
-            .keyStorePassword(config.keyStorePassword()) //
-            .keyStore(config.keyStore()) //
-            .keyPassword(config.keyPassword()) //
-            .isTrustStoreUsed(useTrustValidation) //
-            .trustStore(config.trustStore()) //
-            .trustStorePassword(config.trustStorePassword()) //
-            .build();
+    /**
+     * Calls one producer for an EiJob activation.
+     * 
+     * @param producer a producer
+     * @param eiJob an EI job
+     * @return the body of the response from the REST call
+     */
+    public Mono<String> notifyProducerJobStarted(EiProducer producer, EiJob eiJob) {
+        ProducerJobInfo request = new ProducerJobInfo(eiJob);
+        String body = gson.toJson(request);
 
-        return new AsyncRestClient("", config);
+        return restClient.post(producer.getJobCreationCallbackUrl(), body)
+            .doOnNext(resp -> logger.debug("Job subscription started OK {}", producer.getId()))
+            .onErrorResume(throwable -> {
+                logger.warn("Job subscription failed {}", producer.getId(), throwable.toString());
+                return Mono.empty();
+            });
     }
 
 }