Merge fix

Author: JohannesRabauer

bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithCesop.java

@@ -48,6 +48,7 @@
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCountryCode;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCurrency;
+import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
 
 
 @SuppressWarnings("checkstyle:MagicNumber")
@@ -75,8 +76,7 @@ public static BzstDipConfiguration createConfiguration()
 			.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
 			.setTaxID("86095742719")
 			.setTaxNumber("123")
-			.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
-				.getResourceAsStream("DemoKeystore.jks"))
+			.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
 			.setCertificateKeystorePassword("test123")
 			.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
 			.setMessageTypeIndicCesop(BzstCesopMessageTypeIndicEnum.CESOP_101)

bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithDac7.java

@@ -26,6 +26,7 @@
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipOecdLegalAddressType;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipTaxes;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipTin;
+import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
 
 
 @SuppressWarnings("checkstyle:MagicNumber")

bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithPem.java

@@ -11,8 +11,8 @@
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfigurationBuilder;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipDpiMessageType;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipOecdDocType;
-import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
-import software.xdev.bzst.dip.client.model.message.BzstDipCompleteResult;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
 import software.xdev.bzst.dip.client.signing.SigningProviderByPem;
 
 
@@ -27,7 +27,7 @@ public static void main(final String[] args)
 		final BzstDipConfiguration configuration = createConfiguration();
 		final BzstDipClient bzstDipClient = new BzstDipClient(configuration);
 		final BzstDipCompleteResult bzstDipCompleteResult =
-			bzstDipClient.sendDipAndQueryResult(Application.createMessage());
+			bzstDipClient.sendDipAndQueryResult(ApplicationWithDac7.createMessage());
 		LOGGER.info(
 			"Sending dip message with transfer number {} {}",
 			bzstDipCompleteResult.dataTransferNumber(),

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/BzstDipClient.java

@@ -293,12 +293,12 @@ private BzstDipSendingResult sendDipOnlyInternal(
 	)
 	{
 		final XMLDocumentCreator xmlDocumentCreator = new XMLDocumentCreator(this.configuration);
-		final String signedXML =
-			SigningUtil.signXMLDocument(
+		final String signedXML = new XmlSigner(this.configuration.getSigningProvider())
+			.signXMLDocument(
 				xmlDocumentCreator.buildXMLDocument(
 					paymentDataBodyType
-				),
-				this.configuration);
+				)
+			);
 		LOGGER.debug("Created following XML-Document:\n{}", signedXML);
 
 		LOGGER.debug("XML data will now be uploaded...");

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfiguration.java

@@ -19,12 +19,12 @@
 import java.security.cert.X509Certificate;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
-import java.util.function.Supplier;
 
 import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMessageTypeEnum;
 import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMessageTypeIndicEnum;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCountryCode;
+import software.xdev.bzst.dip.client.signing.SigningProvider;
 
 
 /**

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfigurationBuilder.java

@@ -19,18 +19,16 @@
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.UUID;
-import java.util.function.Supplier;
 
 import software.xdev.bzst.dip.client.exception.ConfigurationException;
 import software.xdev.bzst.dip.client.exception.PropertyNotSetException;
-import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
-import software.xdev.bzst.dip.client.signing.SigningProvider;
-import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
-import software.xdev.bzst.dip.client.signing.SigningProviderByPem;
 import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMessageTypeEnum;
 import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMessageTypeIndicEnum;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCountryCode;
+import software.xdev.bzst.dip.client.signing.SigningProvider;
+import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
+import software.xdev.bzst.dip.client.signing.SigningProviderByPem;
 
 
 /**
@@ -164,11 +162,6 @@ public class BzstDipConfigurationBuilder
 	 */
 	private BzstCesopMessageTypeIndicEnum messageTypeIndicCesop;
 
-	public void setRetryQueryResultsAmount(final Integer retryQueryResultsAmount)
-	{
-		this.retryQueryResultsAmount = retryQueryResultsAmount;
-	}
-	
 	public BzstDipConfigurationBuilder setReportingPeriodCesopQuarter(final int reportingPeriodCesopQuarter)
 	{
 		this.reportingPeriodCesopQuarter = reportingPeriodCesopQuarter;

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/BearerTokenRequester.java

@@ -113,35 +113,5 @@ private String createRequestToken()
 			.notBefore(new Date(System.currentTimeMillis() - Duration.ofMinutes(1).toMillis()))
 			.signWith(privateKey, Jwts.SIG.RS256)
 			.compact();
-		try(final InputStream keystoreInputStream = this.configuration.getCertificateKeystoreInputStream().get())
-		{
-			final KeyStore.PrivateKeyEntry privateKeyEntry = SigningUtil.getPrivateKeyEntry(
-				keystoreInputStream,
-				this.configuration.getKeyStorePrivateKeyAlias(),
-				this.configuration.getCertificateKeystorePassword(),
-				SigningUtil.KEYSTORE_TYPE
-			);
-			
-			final PrivateKey privateKey = privateKeyEntry.getPrivateKey();
-			final String clientId = this.configuration.getClientId();
-			LOGGER.debug("Using client id: {}", clientId);
-			
-			return Jwts.builder()
-				.issuer(clientId)
-				.subject(clientId)
-				.audience().add(
-					this.configuration.getRealmEnvironmentBaseUrl() + MDS_POSTFIX)
-				.and()
-				.issuedAt(new Date())
-				.expiration(new Date(System.currentTimeMillis() + Duration.ofMinutes(5).toMillis()))
-				.id(UUID.randomUUID().toString())
-				.notBefore(new Date(System.currentTimeMillis() - Duration.ofMinutes(1).toMillis()))
-				.signWith(privateKey, Jwts.SIG.RS256)
-				.compact();
-		}
-		catch(final IOException ioException)
-		{
-			throw new EncryptionException("An error occurred while creating the request token.", ioException);
-		}
 	}
 }

bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/ConfigurationTestUtil.java

@@ -21,12 +21,12 @@
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfigurationBuilder;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipDpiMessageType;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipOecdDocType;
-import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
 import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
 import software.xdev.bzst.dip.client.signing.SigningProviderByPem;
 
 
-public class ConfigurationTestUtil
+public final class ConfigurationTestUtil
 {
 	private ConfigurationTestUtil()
 	{

bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/ReportableSellerCsvFileParserTest.java

@@ -23,6 +23,7 @@
 import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.LocalDate;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
@@ -41,6 +42,8 @@
 import software.xdev.bzst.dip.client.model.configuration.BzstDipOecdDocType;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
 import software.xdev.bzst.dip.client.parser.ReportableSellerCsvFileParser;
+import software.xdev.bzst.dip.client.signing.SigningProvider;
+import software.xdev.bzst.dip.client.signing.SigningProviderByPem;
 import software.xdev.bzst.dip.client.xmldocument.model.CorrectableReportableSellerType;
 
 
@@ -58,8 +61,7 @@ class ReportableSellerCsvFileParserTest
 		.setTaxID("86095742719")
 		.setTaxNumber("123")
 		.setCertificateKeystorePassword("test123")
-		.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
-			.getResourceAsStream("DemoKeystore.jks"))
+		.setSigningProvider(new SigningProviderByPem("DemoKey.pem", "DemoCert.pem"))
 		.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
 		.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
 		.setReportingPeriod(LocalDate.now())

bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfigurationBuilderTest.java

@@ -21,9 +21,9 @@
 import org.junit.jupiter.api.Test;
 
 import software.xdev.bzst.dip.client.exception.ConfigurationException;
-import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
-import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
+import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
+import software.xdev.bzst.dip.client.signing.SigningProviderByPem;
 
 
 @SuppressWarnings("MethodName")
@@ -169,9 +169,8 @@ void buildAndValidate_cesop()
 				.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
 				.setTaxID("86095742719")
 				.setTaxNumber("123")
-				.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
-					.getResourceAsStream("DemoKeystore.jks"))
 				.setCertificateKeystorePassword("test123")
+				.setSigningProvider(new SigningProviderByPem("DemoKey.pem", "DemoCert.pem"))
 				.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
 				.setReportingPeriod(LocalDate.now())
 				.setDocTypeIndic(BzstDipOecdDocType.OECD_1)