Made validating tax id optional

Author: JohannesRabauer

CHANGELOG.md

@@ -3,3 +3,6 @@
 * The alias for the private key in the keystore is now configurable (
   Properties: `certificate.keystore.private.key.alias` or
   Code: `BzstDipConfigurationBuilder#setKeyStorePrivateKeyAlias`)
+* It is now possible to deactivate the internal validation of the tax-id (
+  Properties: `tax.id.validate` or
+  Code: `BzstDipConfigurationBuilder#setValidateTaxID`)

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

@@ -60,6 +60,11 @@ public class BzstDipConfiguration
 	 * Steueridentifikationsnummer (Steuer-ID) without spaces or slashes ({@code /})
 	 */
 	private final String taxID;
+	/**
+	 * If {@code true} the {@link #taxID} is validated by the {@link TaxNumberValidator}. Default value is
+	 * {@code true}.
+	 */
+	private final boolean validateTaxID;
 	/**
 	 * <p>
 	 *     Organizational characteristic for the specified provider. The Steueridentifikationsnummer
@@ -154,6 +159,7 @@ public BzstDipConfiguration(
 		final String keyStorePrivateKeyAlias,
 		final String clientId,
 		final String taxID,
+		final boolean validateTaxID,
 		final String taxNumber,
 		final String realmEnvironmentBaseUrl,
 		final BzstDipEnvironment environment,
@@ -172,6 +178,7 @@ public BzstDipConfiguration(
 		this.keyStorePrivateKeyAlias = keyStorePrivateKeyAlias;
 		this.clientId = clientId;
 		this.taxID = taxID;
+		this.validateTaxID = validateTaxID;
 		this.taxNumber = taxNumber;
 		this.realmEnvironmentBaseUrl = realmEnvironmentBaseUrl;
 		this.environment = environment;
@@ -271,4 +278,9 @@ public BzstDipAddressFix getPlatformOperatorAddress()
 	{
 		return this.platformOperatorAddress;
 	}
+	
+	public boolean isValidateTaxID()
+	{
+		return this.validateTaxID;
+	}
 }

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

@@ -51,6 +51,10 @@ public class BzstDipConfigurationBuilder
 	 * @see BzstDipConfiguration#getTaxID()
 	 */
 	private String taxID;
+	/**
+	 * @see BzstDipConfiguration#isValidateTaxID()
+	 */
+	private Boolean validateTaxID;
 	/**
 	 * @see BzstDipConfiguration#getTaxNumber()
 	 */
@@ -162,6 +166,16 @@ public BzstDipConfigurationBuilder setTaxID(final String taxID)
 		return this;
 	}
 
+	/**
+	 * @param validateTaxID {@link #validateTaxID}
+	 * @return itself
+	 */
+	public BzstDipConfigurationBuilder setValidateTaxID(final Boolean validateTaxID)
+	{
+		this.validateTaxID = validateTaxID;
+		return this;
+	}
+	
 	/**
 	 * @param taxNumber {@link #taxNumber}
 	 * @return itself
@@ -330,6 +344,10 @@ public BzstDipConfiguration buildAndValidate()
 				"certificate"),
 			this.getSetPropertyOrReadFromFile(this.clientId, PropertiesSupplier.PROPERTY_NAME_CLIENT_ID),
 			this.getSetPropertyOrReadFromFile(this.taxID, PropertiesSupplier.PROPERTY_NAME_TAX_ID),
+			this.getSetPropertyOrReadFromFileBoolean(
+				this.validateTaxID,
+				PropertiesSupplier.PROPERTY_NAME_TAX_ID_VALIDATE,
+				true),
 			this.getSetPropertyOrReadFromFile(this.taxNumber, PropertiesSupplier.PROPERTY_NAME_TAX_NUMBER),
 			this.getSetPropertyOrReadFromFile(
 				this.realmEnvironmentBaseUrl,
@@ -463,6 +481,21 @@ private int getSetPropertyOrReadFromFileInteger(
 			String.valueOf(defaultValue)));
 	}
 
+	private Boolean getSetPropertyOrReadFromFileBoolean(
+		final Boolean builderProperty,
+		final String propertyNameInFile,
+		final Boolean defaultValue)
+	{
+		if(builderProperty != null)
+		{
+			return builderProperty;
+		}
+		return Boolean.parseBoolean(this.getSetPropertyOrReadFromFile(
+			null,
+			propertyNameInFile,
+			String.valueOf(defaultValue)));
+	}
+	
 	private Duration getSetPropertyOrReadFromFileDuration(
 		final Duration builderProperty,
 		final String propertyNameInFile,
@@ -538,7 +571,6 @@ private String getSetPropertyOrReadFromFile(
 		final String propertyNameInFile,
 		final String defaultValue)
 	{
-		
 		if(builderProperty != null)
 		{
 			return builderProperty;

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

@@ -36,7 +36,10 @@ public static void validateConfiguration(final BzstDipConfiguration configuratio
 			PropertiesSupplier.PROPERTY_NAME_CLIENT_ID, configuration.getClientId());
 		checkForNullOrBlank(
 			PropertiesSupplier.PROPERTY_NAME_TAX_ID, configuration.getTaxID());
-		TaxNumberValidator.validateTaxNumber(configuration.getTaxID());
+		if(configuration.isValidateTaxID())
+		{
+			TaxNumberValidator.validateTaxNumber(configuration.getTaxID());
+		}
 		checkForNullOrBlank(
 			PropertiesSupplier.PROPERTY_NAME_TAX_NUMBER, configuration.getTaxNumber());
 		checkForNullOrBlank(

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

@@ -34,6 +34,7 @@ public class PropertiesSupplier
 	public static final String PROPERTY_NAME_CERTIFICATE_KEYSTORE_FILE = "certificate.keystore.file";
 	public static final String PROPERTY_NAME_CLIENT_ID = "client.id";
 	public static final String PROPERTY_NAME_TAX_ID = "tax.id";
+	public static final String PROPERTY_NAME_TAX_ID_VALIDATE = "tax.id.validate";
 	public static final String PROPERTY_NAME_TAX_NUMBER = "tax.number";
 	public static final String PROPERTY_NAME_REALM_ENVIRONMENT_BASE_URL = "base.url";
 	public static final String PROPERTY_NAME_ENVIRONMENT = "environment";

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

@@ -44,6 +44,7 @@ void buildAndValidate_goodValue()
 			() -> new BzstDipConfigurationBuilder()
 				.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
 				.setTaxID("86095742719")
+				.setValidateTaxID(false)
 				.setTaxNumber("123")
 				.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
 					.getResourceAsStream("DemoKeystore.jks"))