Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into OZG-6748-Duplizierte-Vorgaenge-Fuer-einen-Mantelantrag-fix

common/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>common</artifactId>

enterprise-adapter/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>enterprise-adapter</artifactId>
 	<name>EM - Enterprise Interface Adapter</name>

fim-adapter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.ozgcloud.eingang</groupId>
         <artifactId>eingang-manager</artifactId>
-        <version>2.13.0-SNAPSHOT</version>
+        <version>2.14.0-SNAPSHOT</version>
     </parent>
     <artifactId>fim-adapter</artifactId>
     <name>Eingangs Adapter - FIM</name>

formcycle-adapter/formcycle-adapter-impl/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>formcycle-adapter</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapper.java

@@ -12,11 +12,13 @@ import org.mapstruct.ReportingPolicy;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
 import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
 
 @Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, unmappedTargetPolicy = ReportingPolicy.WARN)
 interface FormCycleServiceKontoMapper {
 
 	@Mapping(target = "postfachAddress", ignore = true)
+	@Mapping(target = "type", constant = ServiceKontoFactory.POSTFACH_TYPE_BAYERN_ID)
 	@Mapping(target = "postfachAddresses", expression = "java(fromGrpcPostfachAddresses(serviceKonto))")
 	ServiceKonto fromGrpc(FormCycleServiceKonto serviceKonto);
 

formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapperTest.java

@@ -11,6 +11,7 @@ import org.mapstruct.factory.Mappers;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
 import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory;
 import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
 
 class FormCycleServiceKontoMapperTest {
 
@@ -20,6 +21,13 @@ class FormCycleServiceKontoMapperTest {
 	@Nested
 	class TestFromGrpcServiceKonto {
 
+		@Test
+		void shouldMapType() {
+			var result = mapper.fromGrpc(FormCycleServiceKontoTestFactory.create());
+
+			assertThat(result.getType()).isEqualTo(ServiceKontoFactory.POSTFACH_TYPE_BAYERN_ID);
+		}
+
 		@DisplayName("trustLevel")
 		@Nested
 		class TestTrustLevel {

formcycle-adapter/formcycle-adapter-interface/pom.xml

@@ -36,7 +36,7 @@
 	<groupId>de.ozgcloud.eingang</groupId>
 	<artifactId>formcycle-adapter-interface</artifactId>
 	<name>EM - Formcycle Adapter - Interface</name>
-	<version>2.13.0-SNAPSHOT</version>
+	<version>2.14.0-SNAPSHOT</version>
 	
 	<properties>
 		<vorgang-manager.version>2.0.0</vorgang-manager.version>

formcycle-adapter/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>formcycle-adapter</artifactId>

formsolutions-adapter/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

forwarder/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

intelliform-adapter/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

pom.xml

@@ -37,7 +37,7 @@
 
 	<groupId>de.ozgcloud.eingang</groupId>
 	<artifactId>eingang-manager</artifactId>
-	<version>2.13.0-SNAPSHOT</version>
+	<version>2.14.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>OZG-Cloud Eingang Manager</name>
 

router/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

semantik-adapter/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>semantik-adapter</artifactId>

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java

@@ -23,7 +23,7 @@ public class ServiceKontoFactory {
 
 	public static final int POSTFACH_ADDRESS_DEFAULT = 1;
 	public static final String POSTFACH_TYPE_OSI = "OSI";
-	public static final String POSTFACH_TYPE_BAYERN_ID = "BayernID";
+	public static final String POSTFACH_TYPE_BAYERN_ID = "BAYERN_ID";
 	public static final String POSTFACH_VERSION = "1.0";
 	public static final String KEY_BAYERN_ID_POSTFACH_ID = "u:saml_legacypostkorbhandle";
 	public static final String KEY_BAYERN_ID_TRUST_LEVEL = "u:saml_eid_citizen_qaa_level";

src/main/helm/templates/deployment.yaml

@@ -79,7 +79,7 @@ spec:
         - name: ozgcloud_adapter_targetVorgangManagerName
           value: {{ (.Values.routing).targetVorgangManagerName}}
         - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_address
-          value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
+          value: 'dns:///vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
         - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_negotiationType
           value: {{ (.Values.routing).negotiationType | default "TLS" }}
         {{- end }}

src/test/helm/deployment_routing_strategy_env_test.yaml

@@ -50,6 +50,12 @@ tests:
           content:
             name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
             value: TLS
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_vorgang-manager-vorgang-manager_address
+            value: dns:///vorgang-manager.sh-helm-test:9090
+
   - it: validate routing infos
     set:
       routing:

xta-adapter/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.13.0-SNAPSHOT</version>
+		<version>2.14.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>xta-adapter</artifactId>
 	<name>Eingangs Adapter - XTA</name>