From 933f3b56c4c37d1c9e6a11ec917858f3c11e78a1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 23 Oct 2024 01:02:35 +0200
Subject: [PATCH] OZG-6710 fix class imports; fix bean initialization

---
 ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 -
 ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 3 +--
 .../ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java   | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 79442fc76..633af9720 100644
--- a/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -2,6 +2,5 @@ net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
 net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration
diff --git a/vorgang-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/vorgang-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index a682eac9b..0085992ee 100644
--- a/vorgang-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/vorgang-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -2,7 +2,6 @@ net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
 net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcAdviceAutoConfiguration
@@ -15,4 +14,4 @@ net.devh.boot.grpc.server.autoconfigure.GrpcReflectionServiceAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcServerMetricAutoConfiguration
-net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration
\ No newline at end of file
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
index 269f31f0d..5ddae4430 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
@@ -23,6 +23,7 @@ import de.ozgcloud.command.VorgangCreatedEvent;
 import de.ozgcloud.common.test.ITCase;
 import de.ozgcloud.notification.antragsteller.AntragstellerNotificationEventListener;
 import de.ozgcloud.notification.user.UserNotificationEventListener;
+import de.ozgcloud.processor.ProcessorManagerConfiguration;
 import de.ozgcloud.processor.processor.ProcessorService;
 import de.ozgcloud.processor.vorgang.ProcessorVorgangMapper;
 import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
@@ -62,7 +63,7 @@ class VorgangEventListenerITCase {
 	@MockBean
 	private ProcessorService vorgagnProcessorService;
 	@MockBean
-	@Qualifier("processorManager_OzgCloudCommandService")
+	@Qualifier(ProcessorManagerConfiguration.OZGCLOUD_VORGANG_SERVICE_NAME)
 	private OzgCloudVorgangService ozgCloudVorgangService;
 	@MockBean
 	private ProcessorVorgangMapper processorVorgangMapper;
-- 
GitLab