From c19a5a29764dcc311edc9210ca32c457a1640371 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 1 Nov 2023 09:44:32 +0100
Subject: [PATCH] OZG-4461 OZG-4511 move/rename VorgangEventListener ->
ProcessorEventListener
---
.../ProcessorEventListener.java} | 8 +++++---
.../ozgcloud/processor/vorgang/VorgangService.java | 2 +-
.../ProcessorEventListenerITCase.java} | 7 +++++--
.../ProcessorEventListenerTest.java} | 13 +++++++------
4 files changed, 18 insertions(+), 12 deletions(-)
rename src/main/java/de/ozgcloud/processor/{vorgang/VorgangEventListener.java => processor/ProcessorEventListener.java} (86%)
rename src/test/java/de/ozgcloud/processor/{vorgang/VorgangEventListenerITCase.java => processor/ProcessorEventListenerITCase.java} (81%)
rename src/test/java/de/ozgcloud/processor/{vorgang/VorgangEventListenerTest.java => processor/ProcessorEventListenerTest.java} (89%)
diff --git a/src/main/java/de/ozgcloud/processor/vorgang/VorgangEventListener.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
similarity index 86%
rename from src/main/java/de/ozgcloud/processor/vorgang/VorgangEventListener.java
rename to src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
index 6584a2e..53df8b9 100644
--- a/src/main/java/de/ozgcloud/processor/vorgang/VorgangEventListener.java
+++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
@@ -1,12 +1,14 @@
-package de.ozgcloud.processor.vorgang;
+package de.ozgcloud.processor.processor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
-import de.ozgcloud.processor.processor.ProcessorService;
import de.ozgcloud.processor.result.ResultService;
+import de.ozgcloud.processor.vorgang.Vorgang;
+import de.ozgcloud.processor.vorgang.VorgangId;
+import de.ozgcloud.processor.vorgang.VorgangService;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -14,7 +16,7 @@ import lombok.extern.log4j.Log4j2;
@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
@RequiredArgsConstructor
@Log4j2
-class VorgangEventListener {
+class ProcessorEventListener {
private final VorgangService service;
private final ProcessorService processorService;
diff --git a/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java b/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
index c0c1297..059b71d 100644
--- a/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
+++ b/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
@Service("processorVorgangService")
@RequiredArgsConstructor
-class VorgangService {
+public class VorgangService {
private final OzgCloudVorgangService ozgCloudService;
private final ProcessorVorgangMapper mapper;
diff --git a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
similarity index 81%
rename from src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerITCase.java
rename to src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
index e4c0b1d..479fb7f 100644
--- a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.processor.vorgang;
+package de.ozgcloud.processor.processor;
import static org.mockito.Mockito.*;
@@ -12,9 +12,12 @@ import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
import de.ozgcloud.processor.processor.ProcessorService;
import de.ozgcloud.processor.result.ResultService;
+import de.ozgcloud.processor.vorgang.VorgangId;
+import de.ozgcloud.processor.vorgang.VorgangService;
+import de.ozgcloud.processor.vorgang.VorgangTestFactory;
@ITCase
-class VorgangEventListenerITCase {
+class ProcessorEventListenerITCase {
@Autowired
private ApplicationEventPublisher publisher;
diff --git a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerTest.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
similarity index 89%
rename from src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerTest.java
rename to src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
index 8bc0c7c..48fe807 100644
--- a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerTest.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.processor.vorgang;
+package de.ozgcloud.processor.processor;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -16,20 +16,21 @@ import org.mockito.Spy;
import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
-import de.ozgcloud.processor.processor.ProcessorResult;
-import de.ozgcloud.processor.processor.ProcessorResultTestFactory;
-import de.ozgcloud.processor.processor.ProcessorService;
import de.ozgcloud.processor.result.ProcessorTechnicalException;
import de.ozgcloud.processor.result.ResultService;
+import de.ozgcloud.processor.vorgang.Vorgang;
+import de.ozgcloud.processor.vorgang.VorgangId;
+import de.ozgcloud.processor.vorgang.VorgangService;
+import de.ozgcloud.processor.vorgang.VorgangTestFactory;
import reactor.core.publisher.Mono;
-class VorgangEventListenerTest {
+class ProcessorEventListenerTest {
private static final VorgangCreatedEvent EVENT = new VorgangCreatedEvent(OzgCloudVorgangTestFactory.ID.toString());
@Spy
@InjectMocks
- private VorgangEventListener vorgangEventListener;
+ private ProcessorEventListener vorgangEventListener;
@Mock
private VorgangService vorgangService;
--
GitLab