From 359bcb16f037f321fe4809aa020eb1a2044767b8 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 16 Apr 2024 10:20:52 +0200
Subject: [PATCH] OZG-5322 enable dummy document processor by configuration
only
---
.../ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java | 4 ++--
.../smartdocuments/SmartDocumentsBescheidRemoteService.java | 2 --
.../src/main/resources/application-local.yml | 3 +++
.../de/ozgcloud/bescheid/BescheidEventListenerITCase.java | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
index 8f7743512..694e6b999 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
@@ -1,6 +1,6 @@
package de.ozgcloud.bescheid.dummy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import com.google.common.net.MediaType;
@@ -12,7 +12,7 @@ import de.ozgcloud.bescheid.vorgang.Vorgang;
import de.ozgcloud.common.binaryfile.TempFileUtils;
@Service
-@ConditionalOnMissingBean(type = "BescheidRemoteService")
+@ConditionalOnProperty("ozgcloud.feature.bescheid.enable-dummy-document-processor")
class DummyBescheidRemoteService implements BescheidRemoteService {
private static final String DUMMY_BESCHEID_FILE_NAME = "dummy-bescheid.pdf";
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
index 664f4300d..6dd87bd4b 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
@@ -14,7 +14,6 @@ import javax.xml.xpath.XPathFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Primary;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
@@ -50,7 +49,6 @@ import reactor.core.publisher.Mono;
@Log4j2
@Service
-@Primary
@ConditionalOnProperty("ozgcloud.bescheid.smart-documents.url")
class SmartDocumentsBescheidRemoteService implements BescheidRemoteService {
diff --git a/vorgang-manager-server/src/main/resources/application-local.yml b/vorgang-manager-server/src/main/resources/application-local.yml
index 346ab3798..f575ac6f0 100644
--- a/vorgang-manager-server/src/main/resources/application-local.yml
+++ b/vorgang-manager-server/src/main/resources/application-local.yml
@@ -53,6 +53,9 @@ ozgcloud:
elasticsearch:
initEnabled: true
index: test-index
+ feature:
+ bescheid:
+ enable-dummy-document-processor: true
mongock:
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
index d1eb5639c..15dcb7324 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
@@ -72,6 +72,7 @@ import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
"grpc.server.port=-1",
"grpc.client.ozgcloud-command-manager.address=in-process:test",
"grpc.client.vorgang-manager.address=in-process:test",
+ "ozgcloud.feature.bescheid.enable-dummy-document-processor=true",
})
@DataITCase
@DirtiesContext
--
GitLab