diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index 32cf666418b4afc8871b5f405adfb594d3960398..df3d8156aa9ba4e2fce017a55f79fe257d80fe98 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.3.2</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -17,8 +17,9 @@
<properties>
<vorgang-manager.version>2.17.0-SNAPSHOT</vorgang-manager.version>
<nachrichten-manager.version>2.9.0</nachrichten-manager.version>
+ <nachrichten-manager.version>2.14.0-SNAPSHOT</nachrichten-manager.version>
<document-manager.version>1.0.0-SNAPSHOT</document-manager.version>
- <api-lib.version>0.12.0</api-lib.version>
+ <api-lib.version>0.13.0-SNAPSHOT</api-lib.version>
<spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>
</properties>
@@ -115,8 +116,7 @@
</dependency>
- <!--dev
- tools-->
+ <!--dev tools-->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
@@ -140,4 +140,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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 539db3df5fe335ab29e56648cc3f3ee374821b85..633af9720e49e1f4a99c738220ea6753af8b7ed4 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,7 +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
-net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration
diff --git a/bescheid-manager/src/test/resources/application-itcase.yml b/bescheid-manager/src/test/resources/application-itcase.yml
index 72e5c1342fce4a554381a3cc7d09cd4a09af48f7..aa8dcc28422bf74f3560eeb1aedd499691f52b2f 100644
--- a/bescheid-manager/src/test/resources/application-itcase.yml
+++ b/bescheid-manager/src/test/resources/application-itcase.yml
@@ -5,6 +5,10 @@ logging:
'[de.ozgcloud]': WARN
config: classpath:log4j2-local.xml
+grpc:
+ server:
+ port: -1
+
ozgcloud:
admin:
sync:
diff --git a/vorgang-manager-base/pom.xml b/vorgang-manager-base/pom.xml
index 86a78b108d23553ea8b9116d5c268aa58cb627ff..2c938ed40e4b8f8f45ac394f9a3763f09aeafaf5 100644
--- a/vorgang-manager-base/pom.xml
+++ b/vorgang-manager-base/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.3.1</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath />
</parent>
diff --git a/vorgang-manager-command/pom.xml b/vorgang-manager-command/pom.xml
index 297b08859ee29248689371203b49a4e518a6f470..bbd6bfd6ea27d70a4c27c0b09151b5c6f2147006 100644
--- a/vorgang-manager-command/pom.xml
+++ b/vorgang-manager-command/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.3.1</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml
index bea7ee4e91b09224ad1b09a3caa37822da7c714c..6c73bece4e8e6d780afc6953fb562bf5ae510fbb 100644
--- a/vorgang-manager-interface/pom.xml
+++ b/vorgang-manager-interface/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.3.1</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -103,13 +103,14 @@
<goal>run</goal>
</goals>
<configuration>
+ <protocVersion>${protobuf.version}</protocVersion>
<outputTargets>
<outputTarget>
<type>java</type>
</outputTarget>
<outputTarget>
<type>grpc-java</type>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.58.0</pluginArtifact>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen.version}</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 91dd8496756f87e9b5b263fe9df228820e68eec4..befeabf44fbf36f8a0a910a59bdb267bfb596592 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.3.1</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -54,9 +54,9 @@
<user-manager-interface.version>2.9.0</user-manager-interface.version>
<bescheid-manager.version>1.20.0-SNAPSHOT</bescheid-manager.version>
- <processor-manager.version>0.4.1</processor-manager.version>
+ <processor-manager.version>0.5.0-SNAPSHOT</processor-manager.version>
<nachrichten-manager.version>2.14.0-SNAPSHOT</nachrichten-manager.version>
- <ozgcloud-starter.version>0.12.0</ozgcloud-starter.version>
+ <ozgcloud-starter.version>0.13.0-SNAPSHOT</ozgcloud-starter.version>
<notification-manager.version>2.12.0-SNAPSHOT</notification-manager.version>
<collaboration-manager.version>0.4.0-SNAPSHOT</collaboration-manager.version>
@@ -178,6 +178,11 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ </dependency>
+
<!-- aspectJ -->
<dependency>
@@ -281,6 +286,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>de.ozgcloud.api-lib</groupId>
<artifactId>ozg-cloud-spring-boot-starter</artifactId>
@@ -453,4 +459,4 @@
</snapshotRepository>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java
index a69a46cd567558faad48a5e3a4de33101acfaea6..d75ab5873cd6342996cdc7fe98c57032362ac079 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java
@@ -50,8 +50,30 @@ public abstract class VorgangWithEingangMapper {
.build();
}
- @Mapping(target = "eingang", source = "eingangs")
+ @Mapping(target = "unknownFields", ignore = true)
+ @Mapping(target = "statusBytes", ignore = true)
+ @Mapping(target = "removeClientAttributes", ignore = true)
+ @Mapping(target = "nummerBytes", ignore = true)
+ @Mapping(target = "nameBytes", ignore = true)
+ @Mapping(target = "mergeUnknownFields", ignore = true)
+ @Mapping(target = "mergeHeader", ignore = true)
+ @Mapping(target = "mergeFrom", ignore = true)
+ @Mapping(target = "mergeEingang", ignore = true)
+ @Mapping(target = "idBytes", ignore = true)
+ @Mapping(target = "headerOrBuilder", ignore = true)
+ @Mapping(target = "formEngineNameBytes", ignore = true)
+ @Mapping(target = "eingangOrBuilder", ignore = true)
+ @Mapping(target = "defaultInstanceForType", ignore = true)
+ @Mapping(target = "createdAtBytes", ignore = true)
+ @Mapping(target = "clientAttributesOrBuilderList", ignore = true)
+ @Mapping(target = "clientAttributesList", ignore = true)
+ @Mapping(target = "clearOneof", ignore = true)
+ @Mapping(target = "clearField", ignore = true)
+ @Mapping(target = "assignedToBytes", ignore = true)
+ @Mapping(target = "allFields", ignore = true)
+ @Mapping(target = "aktenzeichenBytes", ignore = true)
@Mapping(target = "clientAttributesBuilderList", ignore = true)
+ @Mapping(target = "eingang", source = "eingangs")
abstract GrpcVorgangWithEingang toGrpcWithoutClientAttributes(Vorgang vorgang);
Eingang mapListToGrpcEingang(List<Eingang> eingaenge) {
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 08abec6c597ed602bc6a36d5de3111b9a0d66a74..0085992ee7898da7618d6aa0facb2e775c3d5e41 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,10 +2,8 @@ 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.common.autoconfigure.GrpcCommonTraceAutoConfiguration
net.devh.boot.grpc.server.autoconfigure.GrpcAdviceAutoConfiguration
net.devh.boot.grpc.server.autoconfigure.GrpcHealthServiceAutoConfiguration
net.devh.boot.grpc.server.autoconfigure.GrpcMetadataConsulConfiguration
@@ -16,5 +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.GrpcServerTraceAutoConfiguration
+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 269f31f0df733254ec0f7a6de31b87c1b9fe3c3f..5ddae443065b586a4bc16110c11ae7fa1e251788 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;
diff --git a/vorgang-manager-utils/pom.xml b/vorgang-manager-utils/pom.xml
index f26d1456f2f68ea27ff3ac04ea1ee51f2ac94cb1..e152aac5fa8b76246a3b88334125a5390cd25d67 100644
--- a/vorgang-manager-utils/pom.xml
+++ b/vorgang-manager-utils/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.3.1</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -45,7 +45,8 @@
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
- <lombok.version>1.18.28</lombok.version>
+ <lombok.version>1.18.34</lombok.version>
+
</properties>
<dependencies>