From 760e33960ec10d3ec37c547e10f5e05c0115a344 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 5 Dec 2023 12:10:46 +0100
Subject: [PATCH] OZG-4589 switch to new common-lib version
---
pom.xml | 38 ++++++++++---------
.../processor/ProcessorEventListener.java | 8 ++--
.../processor/VorgangProcessedEvent.java | 4 +-
.../ProcessorEventListenerITCase.java | 13 +++----
.../processor/ProcessorEventListenerTest.java | 13 ++++---
.../processor/ProcessorPropertiesITCase.java | 2 +-
.../processor/ProcessorServiceITCase.java | 16 ++++----
.../processor/result/ResultServiceITCase.java | 2 +-
8 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index f220c5f..e8397c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>de.ozgcloud.processor</groupId>
@@ -17,28 +17,30 @@
<description>OZG-Cloud Processor Manager</description>
<properties>
- <pluto.version>1.16.0</pluto.version>
+ <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
<tyrus-standalone-client.version>2.1.3</tyrus-standalone-client.version>
</properties>
<dependencies>
<!-- OZG-Cloud -->
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-utils</artifactId>
- <version>${pluto.version}</version>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-utils</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
+
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-command</artifactId>
- <version>${pluto.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>de.ozgcloud.command</groupId>
+ <artifactId>command-manager</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-command</artifactId>
- <version>${pluto.version}</version>
+ <groupId>de.ozgcloud.command</groupId>
+ <artifactId>command-manager</artifactId>
+ <version>${vorgang-manager.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>de.ozgcloud.api-lib</groupId>
<artifactId>ozg-cloud-spring-boot-starter</artifactId>
@@ -51,7 +53,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
<!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -79,13 +81,13 @@
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
-
+
<!-- commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
+
</dependencies>
<build>
diff --git a/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
index eafc17c..30b4a9f 100644
--- a/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
+++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
@@ -10,10 +10,10 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
-import de.itvsh.ozg.pluto.command.Command;
-import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
-import de.itvsh.ozg.pluto.command.CommandFailedEvent;
-import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.command.CommandFailedEvent;
+import de.ozgcloud.command.VorgangCreatedEvent;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.Vorgang;
import de.ozgcloud.processor.vorgang.VorgangId;
diff --git a/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java b/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
index 55427c7..a13a83c 100644
--- a/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
+++ b/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
@@ -1,7 +1,7 @@
package de.ozgcloud.processor.processor;
-import de.itvsh.ozg.pluto.command.Command;
-import de.itvsh.ozg.pluto.command.CommandExecutedEvent;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.command.CommandExecutedEvent;
class VorgangProcessedEvent extends CommandExecutedEvent {
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
index 4653353..f3821f2 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
@@ -10,11 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
-import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
-import de.itvsh.ozg.pluto.command.CommandTestFactory;
-import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.command.CommandTestFactory;
+import de.ozgcloud.command.VorgangCreatedEvent;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.VorgangId;
import de.ozgcloud.processor.vorgang.VorgangService;
@@ -32,7 +32,7 @@ class ProcessorEventListenerITCase {
@Autowired
private ApplicationEventPublisher publisher;
-
+
@Test
void shouldLoadVorgang() {
when(service.getVorgang(any())).thenReturn(VorgangTestFactory.create());
@@ -43,7 +43,6 @@ class ProcessorEventListenerITCase {
verify(service).getVorgang(VorgangId.from(OzgCloudVorgangTestFactory.ID.toString()));
}
-
@DisplayName("On command listener")
@Nested
class TestOnCommandListener {
@@ -51,7 +50,7 @@ class ProcessorEventListenerITCase {
@Test
void shouldTriggerForExecuteProcessor() {
var command = CommandTestFactory.createBuilder().order(ProcessorEventListener.PROCESS_VORGANG_ORDER).build();
-
+
publisher.publishEvent(new CommandCreatedEvent(command));
verify(service).getVorgang(VorgangId.from(CommandTestFactory.VORGANG_ID));
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
index ae70a1b..0b3d299 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
@@ -11,6 +11,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
+import jakarta.validation.ConstraintViolationException;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
@@ -22,19 +24,18 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.ozg.pluto.command.Command;
-import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
-import de.itvsh.ozg.pluto.command.CommandFailedEvent;
-import de.itvsh.ozg.pluto.command.CommandTestFactory;
-import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.command.CommandFailedEvent;
+import de.ozgcloud.command.CommandTestFactory;
+import de.ozgcloud.command.VorgangCreatedEvent;
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 jakarta.validation.ConstraintViolationException;
import reactor.core.publisher.Mono;
class ProcessorEventListenerTest {
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorPropertiesITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorPropertiesITCase.java
index c5a7103..7107513 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorPropertiesITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorPropertiesITCase.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import lombok.SneakyThrows;
@ITCase
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorServiceITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorServiceITCase.java
index eeb80ba..d4d32f9 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorServiceITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorServiceITCase.java
@@ -22,7 +22,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.processor.processor.ProcessorProperties.Processor;
import de.ozgcloud.processor.result.ProcessorTechnicalException;
import de.ozgcloud.processor.result.ResultService;
@@ -57,7 +57,7 @@ class ProcessorServiceITCase {
processor = ProcessorTestFactory.createBuilder().address(mockWebServer.url("/").toString()).build();
mockWebServer.enqueue(createMockResponse());
}
-
+
private MockResponse createMockResponse() {
return new MockResponse()
.addHeader("Content-Type", "application/json")
@@ -208,11 +208,11 @@ class ProcessorServiceITCase {
assertThrows(ProcessorTechnicalException.class, () -> results.forEach(Mono::block));
}
}
-
+
@DisplayName("Process vorgang")
@Nested
class TestProcessVorgang {
-
+
private MockWebServer mockWebServer = new MockWebServer();
private Vorgang vorgang = VorgangTestFactory.create();
private Processor processor = ProcessorTestFactory.createBuilder().address(mockWebServer.url("/").toString()).build();
@@ -228,18 +228,18 @@ class ProcessorServiceITCase {
void cleanup() {
mockWebServer.shutdown();
}
-
+
@Test
void shouldReturnProcessor() {
var result = service.processVorgang(vorgang, Collections.singleton(ProcessorTestFactory.PROCESSOR_NAME));
-
+
assertThat(result).isNotEmpty();
}
-
+
@Test
void shouldReturnEmptyStream() {
var result = service.processVorgang(vorgang, Collections.singleton("notMatchingProcessorName"));
-
+
assertThat(result).isEmpty();
}
}
diff --git a/src/test/java/de/ozgcloud/processor/result/ResultServiceITCase.java b/src/test/java/de/ozgcloud/processor/result/ResultServiceITCase.java
index 5737f04..5a1c8de 100644
--- a/src/test/java/de/ozgcloud/processor/result/ResultServiceITCase.java
+++ b/src/test/java/de/ozgcloud/processor/result/ResultServiceITCase.java
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.processor.processor.ProcessorResultTestFactory;
@ITCase
--
GitLab