Fix merge

Author: JohannesRabauer

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

@@ -14,7 +14,6 @@
 import org.slf4j.LoggerFactory;
 
 import software.xdev.bzst.dip.client.BzstDipClient;
-import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfigurationBuilder;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipOecdDocType;
@@ -57,7 +56,7 @@ public final class ApplicationWithCesop
 	private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationWithCesop.class);
 
 	public static void main(final String[] args)
-		throws InterruptedException, HttpStatusCodeNotExceptedException, IOException, DatatypeConfigurationException
+		throws InterruptedException, IOException, DatatypeConfigurationException
 	{
 		final BzstDipConfiguration configuration = createConfiguration();
 		final BzstDipClient bzstDipClient = new BzstDipClient(configuration);

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

@@ -9,8 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.opencsv.exceptions.CsvValidationException;
-
 import software.xdev.bzst.dip.client.BzstDipClient;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
 import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
@@ -22,7 +20,7 @@ public final class ApplicationWithCsvInput
 	private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationWithCsvInput.class);
 
 	public static void main(final String[] args)
-		throws InterruptedException, HttpStatusCodeNotExceptedException, IOException, CsvValidationException
+		throws InterruptedException, IOException
 	{
 		final BzstDipConfiguration configuration = ApplicationWithDac7.createConfiguration();
 

bzst-dip-java-client/pom.xml

@@ -493,7 +493,7 @@
 					<plugin>
 						<groupId>software.xdev</groupId>
 						<artifactId>find-and-replace-maven-plugin</artifactId>
-						<version>1.0.0</version>
+						<version>1.0.3</version>
 						<executions>
 							<execution>
 								<!-- Remove so that we don't need additional dependency -->
@@ -542,10 +542,17 @@
 									<replaceAll>false</replaceAll>
 									<replaceLineBased>false</replaceLineBased>
 								</configuration>
-							</execution> 
+							</execution>
+						</executions>
 					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>pmd</id>
+			<build>
+				<plugins>
 					<plugin>
-						<id>pmd</id>
 						<artifactId>maven-pmd-plugin</artifactId>
 						<version>3.26.0</version>
 						<configuration>

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

@@ -23,8 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.opencsv.exceptions.CsvValidationException;
-
 import software.xdev.bzst.dip.client.generated.api.MdEinreichenProviderApi;
 import software.xdev.bzst.dip.client.generated.client.ApiClient;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
@@ -91,14 +89,14 @@ public BzstDipSendingResult sendDipOnly(final BzstDipMessage message)
 	}
 
 	/**
-	 * Sends the message without querying for a response. We recommend using the
-	 * {@link #sendDipAndQueryResult(String)} counterpart and
-	 * suggest only using this method, if specifically needed.
+	 * Sends the message without querying for a response. We recommend using the {@link #sendDipAndQueryResult(String)}
+	 * counterpart and suggest only using this method, if specifically needed.
+	 *
 	 * @param csvData which will be parsed by the {@link ReportableSellerCsvFileParser}.
 	 * @return the result which only contains the dataTransferNumber
 	 */
 	public BzstDipSendingResult sendDipOnly(final String csvData)
-		throws HttpStatusCodeNotExceptedException, CsvValidationException, IOException
+		throws IOException
 	{
 		return this.sendDipOnly(new ReportableSellerCsvFileParser(this.configuration).parseCsvData(csvData));
 	}
@@ -138,13 +136,14 @@ public BzstDipSendingResult sendDipOnly(
 	/**
 	 * Sends the message and queries a result.
 	 * <p>
-	 *     Querying the result might take a few seconds and is configured in
-	 *     {@link BzstDipConfiguration#getQueryResultConfiguration()}.
+	 * Querying the result might take a few seconds and is configured in
+	 * {@link BzstDipConfiguration#getQueryResultConfiguration()}.
 	 * </p>
 	 * <p>
-	 *     In special cases {@link #sendDipOnly(BzstDipMessage)} can be used, if the result is not needed,
-	 *     or the results should be queried in some other way.
+	 * In special cases {@link #sendDipOnly(BzstDipMessage)} can be used, if the result is not needed, or the results
+	 * should be queried in some other way.
 	 * </p>
+	 *
 	 * @param message with the data for the BZST DIP API.
 	 * @return the result which contains the dataTransferNumber and all found responses in the API.
 	 */
@@ -155,21 +154,22 @@ public BzstDipCompleteResult sendDipAndQueryResult(final BzstDipMessage message)
 	}
 
 	public BzstDipCompleteResult sendDipAndQueryResult(final BzstCesopPaymentDataBody message)
-		throws HttpStatusCodeNotExceptedException, InterruptedException, IOException, DatatypeConfigurationException
+		throws InterruptedException, IOException, DatatypeConfigurationException
 	{
 		return this.sendDipAndQueryResult(message.toXmlType());
 	}
 
 	/**
 	 * Sends the message and queries a result.
 	 * <p>
-	 *     Querying the result might take a few seconds and is configured in
-	 *     {@link BzstDipConfiguration#getQueryResultConfiguration()}.
+	 * Querying the result might take a few seconds and is configured in
+	 * {@link BzstDipConfiguration#getQueryResultConfiguration()}.
 	 * </p>
 	 * <p>
-	 *     In special cases {@link #sendDipOnly(String)} can be used, if the result is not needed,
-	 *     or the results should be queried in some other way.
+	 * In special cases {@link #sendDipOnly(String)} can be used, if the result is not needed, or the results should be
+	 * queried in some other way.
 	 * </p>
+	 *
 	 * @param csvData which will be parsed by the {@link ReportableSellerCsvFileParser}.
 	 * @return the result which contains the dataTransferNumber and all found responses in the API.
 	 */
@@ -182,13 +182,14 @@ public BzstDipCompleteResult sendDipAndQueryResult(final String csvData)
 	/**
 	 * Sends the message and queries a result.
 	 * <p>
-	 *     Querying the result might take a few seconds and is configured in
-	 *     {@link BzstDipConfiguration#getQueryResultConfiguration()}.
+	 * Querying the result might take a few seconds and is configured in
+	 * {@link BzstDipConfiguration#getQueryResultConfiguration()}.
 	 * </p>
 	 * <p>
-	 *     In special cases {@link #sendDipOnly(List)} can be used, if the result is not needed,
-	 *     or the results should be queried in some other way.
+	 * In special cases {@link #sendDipOnly(List)} can be used, if the result is not needed, or the results should be
+	 * queried in some other way.
 	 * </p>
+	 *
 	 * @param correctableReportableSellerTypes with the data for the BZST DIP API.
 	 * @return the result which contains the dataTransferNumber and all found responses in the API.
 	 */
@@ -206,16 +207,16 @@ public BzstDipCompleteResult sendDipAndQueryResult(
 	/**
 	 * Sends the message and queries a result.
 	 * <p>
-	 *     Querying the result might take a few seconds and is configured in
-	 *     {@link BzstDipConfiguration#getQueryResultConfiguration()}.
+	 * Querying the result might take a few seconds and is configured in
+	 * {@link BzstDipConfiguration#getQueryResultConfiguration()}.
 	 * </p>
 	 * <p>
-	 *     In special cases {@link #sendDipOnly(List, CorrectablePlatformOperatorType)} can be used, if the result is
-	 *     not needed,
-	 *     or the results should be queried in some other way.
+	 * In special cases {@link #sendDipOnly(List, CorrectablePlatformOperatorType)} can be used, if the result is not
+	 * needed, or the results should be queried in some other way.
 	 * </p>
+	 *
 	 * @param correctableReportableSellerTypes with the data for the BZST DIP API.
-	 * @param correctablePlatformOperatorType with the information about the platform operator.
+	 * @param correctablePlatformOperatorType  with the information about the platform operator.
 	 * @return the result which contains the dataTransferNumber and all found responses in the API.
 	 */
 	public BzstDipCompleteResult sendDipAndQueryResult(
@@ -224,38 +225,35 @@ public BzstDipCompleteResult sendDipAndQueryResult(
 	)
 		throws InterruptedException, IOException
 	{
-			final BzstDipSendingResult sendingResult =
-				this.sendDipOnlyInternal(correctableReportableSellerTypes, correctablePlatformOperatorType);
-			
-			Thread.sleep(this.configuration.getQueryResultConfiguration().delayBeforeCheckingResults().toMillis());
+		final BzstDipSendingResult sendingResult =
+			this.sendDipOnlyInternal(correctableReportableSellerTypes, correctablePlatformOperatorType);
+		
+		Thread.sleep(this.configuration.getQueryResultConfiguration().delayBeforeCheckingResults().toMillis());
 
 		final BzstDipRequestStatusResult requestStatusResult = this.queryDipResultWithRetry(sendingResult);
-			
-			return BzstDipCompleteResult.fromResult(sendingResult, requestStatusResult);
+		
+		return BzstDipCompleteResult.fromResult(sendingResult, requestStatusResult);
 	}
 
 	public BzstDipCompleteResult sendDipAndQueryResult(
 		final PaymentDataBodyType paymentDataBodyType
 	)
-		throws HttpStatusCodeNotExceptedException, InterruptedException, IOException
+		throws InterruptedException, IOException
 	{
-		try(final WebClient client = new WebClient(this.configuration))
-		{
-			final BzstDipSendingResult sendingResult =
-				this.sendDipOnlyInternal(paymentDataBodyType, client);
-			
-			Thread.sleep(this.configuration.getQueryResultConfiguration().delayBeforeCheckingResults().toMillis());
-			
-			final BzstDipRequestStatusResult requestStatusResult = this.queryDipResultWithRetry(client, sendingResult);
-			
-			return BzstDipCompleteResult.fromResult(sendingResult, requestStatusResult);
-		}
+		final WebClient client = new WebClient(this.configuration);
+		final BzstDipSendingResult sendingResult = this.sendDipOnlyInternal(paymentDataBodyType, client);
+		
+		Thread.sleep(this.configuration.getQueryResultConfiguration().delayBeforeCheckingResults().toMillis());
+		
+		final BzstDipRequestStatusResult requestStatusResult = this.queryDipResultWithRetry(sendingResult);
+		
+		return BzstDipCompleteResult.fromResult(sendingResult, requestStatusResult);
 	}
 
 	/**
-	 * Queries for a DIP result. We recommend using the
-	 * {@link #sendDipAndQueryResult(BzstDipMessage)} counterpart and
+	 * Queries for a DIP result. We recommend using the {@link #sendDipAndQueryResult(BzstDipMessage)} counterpart and
 	 * suggest only using this method, if specifically needed.
+	 *
 	 * @return all found {@link BzstDipSingleTransferResult}s
 	 */
 	public BzstDipRequestStatusResult queryDipResult() throws IOException
@@ -292,7 +290,7 @@ private BzstDipSendingResult sendDipOnlyInternal(
 	private BzstDipSendingResult sendDipOnlyInternal(
 		final PaymentDataBodyType paymentDataBodyType,
 		final WebClient client
-	) throws HttpStatusCodeNotExceptedException
+	)
 	{
 		final XMLDocumentCreator xmlDocumentCreator = new XMLDocumentCreator(this.configuration);
 		final String signedXML =

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/util/WebClientUtil.java

@@ -15,10 +15,18 @@
  */
 package software.xdev.bzst.dip.client.util;
 
+import static software.xdev.bzst.dip.client.webclient.BearerTokenRequester.MDS_POSTFIX;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -33,7 +41,10 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import io.jsonwebtoken.Jwts;
+import software.xdev.bzst.dip.client.exception.EncryptionException;
 import software.xdev.bzst.dip.client.factory.DocumentBuilderFactoryNoExternalEntities;
+import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
 
 
 /**

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

@@ -105,6 +105,7 @@ private String createRequestToken()
 		{
 			final KeyStore.PrivateKeyEntry privateKeyEntry = SigningUtil.getPrivateKeyEntry(
 				keystoreInputStream,
+				this.configuration.getKeyStorePrivateKeyAlias(),
 				this.configuration.getCertificateKeystorePassword(),
 				SigningUtil.KEYSTORE_TYPE
 			);