Merge pull request #188 from overture-stack/develop

release 3.6.0
add disableEventIndexing flag

Author: blabadi

.mvn/maven.config

@@ -1,3 +1,3 @@
--Drevision=3.5.0
+-Drevision=3.6.0
 -Dsha1=
 -Dchangelist=-SNAPSHOT

maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/inbound/messaging/IndexingMessagesStreamListener.java

@@ -28,7 +28,7 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.cloud.stream.messaging.Sink;
@@ -39,7 +39,9 @@
 
 @Slf4j
 @EnableBinding(Sink.class)
-@ConditionalOnProperty(name = "maestro.disableIndexing", havingValue = "false")
+@ConditionalOnExpression(
+    "${maestro.disableIndexing} eq false && ${maestro.disableEventIndexing} eq false"
+)
 public class IndexingMessagesStreamListener {
 
   private final Indexer indexer;

maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/inbound/messaging/song/SongAnalysisStreamListener.java

@@ -29,15 +29,17 @@
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.messaging.handler.annotation.Payload;
 import reactor.core.publisher.Flux;
 
 @Slf4j
 @EnableBinding(SongAnalysisSink.class)
-@ConditionalOnProperty(name = "maestro.disableIndexing", havingValue = "false")
+@ConditionalOnExpression(
+    "${maestro.disableIndexing} eq false && ${maestro.disableEventIndexing} eq false"
+)
 public class SongAnalysisStreamListener {
 
   private Indexer indexer;

maestro-app/src/main/resources/config/application.yml

@@ -7,6 +7,9 @@ maestro:
   # but you still need to define the repositories
   disableIndexing: false
 
+  # this can be used to disable kafka integration, this option is preceded by disableIndexing
+  disableEventIndexing: false
+
   webclient:
     # -1 = unlimited memory size
     maxInMemorySize: -1

maestro-app/src/test/resources/config/application.yml

@@ -3,6 +3,8 @@ server.port:
 
 maestro:
   disableIndexing: false
+  disableEventIndexing: false
+
   exclusionRules:
     byId:
       studyId: