Merge branch 'master' into OZG-6944-Antragsraum-Attachment

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>
 
@@ -18,7 +18,7 @@
 		<vorgang-manager.version>2.17.0-SNAPSHOT</vorgang-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 +115,7 @@
 		</dependency>
 
 
-		<!--dev
-		tools-->
+		<!--dev tools-->
 		<dependency>
 			<groupId>org.mapstruct</groupId>
 			<artifactId>mapstruct</artifactId>

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

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:

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>
 

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>
 	

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>

vorgang-manager-server/pom.xml

@@ -32,7 +32,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>
 
@@ -54,7 +54,7 @@
 
 		<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.5.0-PR-15-SNAPSHOT</processor-manager.version>
+		<processor-manager.version>0.5.0-SNAPSHOT</processor-manager.version>
 		<nachrichten-manager.version>2.14.0-PR-37-SNAPSHOT</nachrichten-manager.version>
 		<ozgcloud-starter.version>0.13.0-SNAPSHOT</ozgcloud-starter.version>
 		<notification-manager.version>2.12.0-SNAPSHOT</notification-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>

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) {

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
@@ -17,4 +15,3 @@ 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
\ No newline at end of file
-net.devh.boot.grpc.server.autoconfigure.GrpcServerTraceAutoConfiguration

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.VorgangMapper;
 import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
@@ -62,7 +63,7 @@ class VorgangEventListenerITCase {
 	@MockBean
 	private ProcessorService vorgagnProcessorService;
 	@MockBean
-	@Qualifier("processorManager_OzgCloudVorgangService")
+	@Qualifier(ProcessorManagerConfiguration.OZGCLOUD_VORGANG_SERVICE_NAME)
 	private OzgCloudVorgangService ozgCloudVorgangService;
 	@MockBean
 	@Qualifier("processorManager_VorgangMapperImpl")

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>