PR Kommentare bearbeitet

pom.xml

@@ -49,7 +49,6 @@
         <jaxb-maven-plugin.version>3.0.1</jaxb-maven-plugin.version>
         <ozg-info-manager-interface.version>0.10.0-22.8503e49-20240124.071709-1</ozg-info-manager-interface.version>
         <bayernid-proxy-interface.version>0.1.0</bayernid-proxy-interface.version>
-        <opensaml.version>4.3.0</opensaml.version>
     </properties>
 
     <repositories>
@@ -159,28 +158,12 @@
             <artifactId>mapstruct</artifactId>
         </dependency>
 
-        <!-- open saml2 -->
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <version>${opensaml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
-            <version>${opensaml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
-            <version>${opensaml.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-saml2-service-provider</artifactId>
         </dependency>
 
-        <!-- grpc -->
+ 
         <dependency>
             <groupId>net.devh</groupId>
             <artifactId>grpc-server-spring-boot-starter</artifactId>

src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java

@@ -35,7 +35,7 @@ import net.devh.boot.grpc.server.service.GrpcService;
 @GrpcService
 @RequiredArgsConstructor
 @ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
-public class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplBase {
+class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplBase {
 	private final AntragraumService antragraumService;
 	private final AntragraumNachrichtMapper mapper;
 

src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java

@@ -24,39 +24,21 @@
 
 package de.ozgcloud.nachrichten.antragraum;
 
-import java.time.format.DateTimeFormatter;
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.commons.collections.MapUtils;
+import org.mapstruct.CollectionMappingStrategy;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.NullValueCheckStrategy;
 
 import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
 
-@Mapper
+@Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 interface AntragraumNachrichtMapper {
 	String DEFAULT_STATUS = "NEU";
 
-	default GrpcRueckfrage toGrpc(PostfachNachricht postfachNachricht) {
-		return GrpcRueckfrage.newBuilder()
-				.setId(postfachNachricht.getId())
-				.setText(postfachNachricht.getMailBody())
-				.setSendAt(postfachNachricht.getSentAt().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
-				.setVorgangName(postfachNachricht.getSubject())
-				.setVorgangId(postfachNachricht.getVorgangId())
-				.setStatus(DEFAULT_STATUS)
-				.addAllAttachmentFileId(postfachNachricht.getAttachments())
-				.build();
-	}
-
-	@SuppressWarnings("unchecked")
-	default GrpcRueckfrage toGrpc(Map<String, Object> itemMap) {
-		var rueckfrageBuilder = GrpcRueckfrage.newBuilder()
-				.setId(MapUtils.getString(itemMap, PostfachNachricht.FIELD_ID))
-				.setVorgangId(MapUtils.getString(itemMap, PostfachNachricht.FIELD_VORGANG_ID))
-				.setVorgangName(MapUtils.getString(itemMap, PostfachNachricht.FIELD_SUBJECT))
-				.addAllAttachmentFileId((Iterable<String>) itemMap.getOrDefault(PostfachNachricht.FIELD_ATTACHMENTS, Collections.emptyList()));
-
-		return rueckfrageBuilder.build();
-	}
+	@Mapping(source = "sentAt", target = "sentAt", dateFormat = "yyyy-MM-dd'T'HH:mm:ss")
+	@Mapping(source = "mailBody", target = "text")
+	@Mapping(source = "subject", target = "vorgangName")
+	@Mapping(source = "attachments", target = "attachmentFileIdList")
+	@Mapping(target = "status", constant = DEFAULT_STATUS)
+	GrpcRueckfrage toGrpc(PostfachNachricht postfachNachricht);
 }

src/main/java/de/ozgcloud/nachrichten/antragraum/BayernIdSamlConfiguration.java

@@ -81,7 +81,7 @@ import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 @Configuration
 @ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
-public class BayernIdSamlConfiguration {
+class BayernIdSamlConfiguration {
 	private XMLObjectProviderRegistry registry;
 	@Getter
 	private ParserPool parserPool;
@@ -104,13 +104,6 @@ public class BayernIdSamlConfiguration {
 
 	private ParserPool initParserPool() throws ComponentInitializationException {
 		var localParserPool = new BasicParserPool();
-		localParserPool.setMaxPoolSize(100);
-		localParserPool.setCoalescing(true);
-		localParserPool.setIgnoreComments(true);
-		localParserPool.setIgnoreElementContentWhitespace(true);
-		localParserPool.setNamespaceAware(true);
-		localParserPool.setExpandEntityReferences(false);
-		localParserPool.setXincludeAware(false);
 
 		final var features = createFeatureMap();
 

src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java

@@ -63,10 +63,10 @@ class AntragraumNachrichtMapperTest {
 	}
 
 	@Test
-	void shouldMapSendAt() {
+	void shouldMapSentAt() {
 		var result = map();
 
-		assertThat(result.getSendAt()).isEqualTo(PostfachNachrichtTestFactory.SENT_AT.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+		assertThat(result.getSentAt()).isEqualTo(PostfachNachrichtTestFactory.SENT_AT.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
 	}
 
 	@Test

src/test/java/de/ozgcloud/nachrichten/antragraum/Saml2DecrypterTest.java

@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.opensaml.saml.saml2.core.Attribute;
@@ -34,6 +35,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import de.ozgcloud.common.test.TestUtils;
 
+@Disabled("Passende certificat und key file muessen local vorhanden sein")
 class Saml2DecrypterTest {
 	private Response samlResponse;
 

src/test/resources/bayernid-test-enc.crt

------BEGIN CERTIFICATE-----
-MIIDsTCCApmgAwIBAgIUdw/27be5+2vj+MhGtoJjDsMsdDEwDQYJKoZIhvcNAQEL
-BQAwaDELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJheWVybjERMA8GA1UEBwwITXVl
-bmNoZW4xDzANBgNVBAoMBm1nbSB0cDEkMCIGCSqGSIb3DQEJARYVamVucy5yZWVz
-ZUBtZ20tdHAuY29tMB4XDTI0MDExNjEyMjI0OVoXDTI1MDExNTEyMjI0OVowaDEL
-MAkGA1UEBhMCREUxDzANBgNVBAgMBkJheWVybjERMA8GA1UEBwwITXVlbmNoZW4x
-DzANBgNVBAoMBm1nbSB0cDEkMCIGCSqGSIb3DQEJARYVamVucy5yZWVzZUBtZ20t
-dHAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/HBBWBDSrEgd
-wXkSy15V00EaVTyLgc4vh/JcDiGIYZSqmcMwBd+B1u36xbdBf/duEtCUymMNP48O
-MjgFZtR6xn0meuR4NR6Ykn9mYGdU/GhldGuGv9XLAEAkVuTlo0H1QYyBS/6JwKQo
-SsHDkJ3YwDwKcyOt7QtpSadRZjQEN3gDvWoRYjgXTxj2I1ovllmi0zOHsFi5PBIu
-iPWUdJvBrHxpD/XVS9R/qzJpHPu3bjQ6UVRmhiZCUF7H5F/PQNwk+qXvjV0ooBeS
-WWO5hywhk4OP4QEgbYMOSo20YukYX8TJEsum1pwIcQrw7kW4GyKaAycyRsa1fbM3
-tEkj+TiBKwIDAQABo1MwUTAdBgNVHQ4EFgQUfDL/6R33SJodsONCvxKy96AtU18w
-HwYDVR0jBBgwFoAUfDL/6R33SJodsONCvxKy96AtU18wDwYDVR0TAQH/BAUwAwEB
-/zANBgkqhkiG9w0BAQsFAAOCAQEA+PCnvSwKU+bArTCIg5lfrwONbzKkjvPUymDN
-YX3oj1wVEN75hNf0RD7Rr0//ZYT3Rt0G193gjDcH1gbGIYhMLeGGkxEous2l3O+p
-RIQRR+hprjr6HzF8IphaJy1RbDwyGsXyLcyOylPL4cX9IjUdhklHiLZusBq95LSy
-w7hsCOAL2+vn816O7yv+28EWXXbnP2XEUjW36nxcZvR6oTJUplXyHRuuJJTsOxGR
-NuXA3UVgNbkdm1HnoSGpnsGdUKsUFoEmEJkcSdQRwxeH21WzYGOZmKMcvx2gObaS
-P8tafWh5z4Jx+Z7z5WP72Jt44/lnVjaV8aGo0KHXwgqQOtYftQ==
------END CERTIFICATE-----

src/test/resources/bayernid-test-enc.key

-