MORE-Platform#303: This changes the lookup for ObservationFactory beans to be dynamic. The ApplicationContext is now used to lookup beans by id (obervergation.getType()) at the time of request. The bug was caused by a change in the bean initialization caused by removing some dependencies from the StudyService. Wit this change the initialisation order has no effect.

Author: Rupert Westenthaler

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/Value.java

@@ -126,4 +126,14 @@ public Value<T> setValidationFunction(Function<T, ValidationIssue> validationFun
         this.validationFunction = validationFunction;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "Value{" +
+                "id='" + id + '\'' +
+                ", defaultValue=" + defaultValue +
+                ", required=" + required +
+                ", immutable=" + immutable +
+                '}';
+    }
 }

studymanager-services/src/main/java/io/redlink/more/studymanager/configuration/ComponentFactoriesConfiguration.java

@@ -13,6 +13,8 @@
 import io.redlink.more.studymanager.core.factory.TriggerFactory;
 import io.redlink.more.studymanager.properties.ComponentFactoriesProperties;
 import org.reflections.Reflections;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -29,6 +31,7 @@
 @Configuration
 @EnableConfigurationProperties({ComponentFactoriesProperties.class})
 public class ComponentFactoriesConfiguration implements BeanFactoryAware {
+    private final Logger logger = LoggerFactory.getLogger(ComponentFactoriesConfiguration.class);
     private BeanFactory beanFactory;
 
     private final Reflections reflections;
@@ -61,8 +64,10 @@ public void onPostConstruct() {
         Set<Class<? extends ObservationFactory>> observationFactories = reflections.getSubTypesOf(ObservationFactory.class);
         observationFactories.stream().map(this::instantiate)
                 .map(f -> f.init(componentFactoriesProperties.get(f.getId())))
-                .forEach(m ->
-                configurableBeanFactory.registerSingleton(m.getId(), m)
+                .forEach(m -> {
+                    logger.trace("Registering observation factory: {}[class:{}, properties:{}]", m.getId(),m.getClass().getName(), m.getProperties());
+                    configurableBeanFactory.registerSingleton(m.getId(), m);
+                }
         );
 
         /*

studymanager-services/src/main/java/io/redlink/more/studymanager/service/ObservationService.java

@@ -25,9 +25,14 @@
 import io.redlink.more.studymanager.repository.ObservationRepository;
 import io.redlink.more.studymanager.sdk.MoreSDK;
 import io.redlink.more.studymanager.utils.RandomSchedulerUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Lookup;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -37,20 +42,23 @@
 @Service
 public class ObservationService {
 
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
     private final StudyStateService studyStateService;
     private final ObservationRepository repository;
 
-    private final Map<String, ObservationFactory> observationFactories;
     private final MoreSDK sdk;
+    ApplicationContext applicationContext;
 
     public ObservationService(StudyStateService studyStateService,
                               ObservationRepository repository,
-                              Map<String, ObservationFactory> observationFactories,
-                              MoreSDK sdk) {
+                              MoreSDK sdk,
+                              ApplicationContext applicationContext) {
         this.studyStateService = studyStateService;
         this.repository = repository;
-        this.observationFactories = observationFactories;
+        //this.observationFactories = observationFactories;
         this.sdk = sdk;
+        this.applicationContext = applicationContext;
     }
 
     public Observation addObservation(Observation observation) {
@@ -171,13 +179,15 @@ public List<ParticipantWithObservationProperties> getParticipantObservationPrope
     }
 
     private ObservationFactory factory(Observation observation) {
-        return observationFactories.get(observation.getType());
+        ObservationFactory factory = applicationContext.getBean(observation.getType(), ObservationFactory.class);
+        if(factory == null) {
+            throw NotFoundException.ObservationFactory(observation.getType());
+        } else {
+            return factory;
+        }
     }
 
     private Observation validate(Observation observation) {
-        if (!observationFactories.containsKey(observation.getType())) {
-            throw NotFoundException.ObservationFactory(observation.getType());
-        }
         try {
             final var factory = factory(observation);
             factory.validate(observation.getProperties());