Fixed merge

Author: JohannesRabauer

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/exception/EncryptionException.java

@@ -15,12 +15,11 @@
  */
 package software.xdev.bzst.dip.client.exception;
 
-import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
+import software.xdev.bzst.dip.client.webclient.BearerTokenRequester;
 
 
 /**
- * Is used for exception that occur during encryption in
- * {@link software.xdev.bzst.dip.client.util.WebClientUtil#createRequestToken(BzstDipConfiguration)}.
+ * Is used for exception that occur during encryption in {@link BearerTokenRequester#getAccessToken()}.
  */
 public class EncryptionException extends RuntimeException
 {

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

@@ -15,18 +15,10 @@
  */
 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;
@@ -41,10 +33,7 @@
 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;
 
 
 /**
@@ -59,41 +48,6 @@ private WebClientUtil()
 	{
 	}
 
-	public static String createRequestToken(final BzstDipConfiguration configuration)
-	{
-		LOGGER.debug("Creating jwt token...");
-		try(final InputStream keystoreInputStream = configuration.getCertificateKeystoreInputStream().get())
-		{
-			final KeyStore.PrivateKeyEntry privateKeyEntry = SigningUtil.getPrivateKeyEntry(
-				keystoreInputStream,
-				configuration.getKeyStorePrivateKeyAlias(),
-				configuration.getCertificateKeystorePassword(),
-				SigningUtil.KEYSTORE_TYPE
-			);
-			
-			final PrivateKey privateKey = privateKeyEntry.getPrivateKey();
-			final String clientId = configuration.getClientId();
-			LOGGER.debug("Using client id: {}", clientId);
-			
-			return Jwts.builder()
-				.issuer(clientId)
-				.subject(clientId)
-				.audience().add(
-					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);
-		}
-	}
-	
 	public static List<String> extractTransferNumberFromXml(final String xmlString) throws IOException
 	{
 		try