From 0436de6184c1a95d463da52929e3bf60923d6e04 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 13 Dec 2021 09:23:09 +0100
Subject: update third-party libs and resolve API issues

---
 .../validation/CompanyNumberValidator.java         | 92 +++++++++++-----------
 1 file changed, 47 insertions(+), 45 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/CompanyNumberValidator.java')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/CompanyNumberValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/CompanyNumberValidator.java
index b96b1e4b0..cbba90a6b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/CompanyNumberValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/CompanyNumberValidator.java
@@ -28,51 +28,53 @@ import at.gv.egovernment.moa.id.configuration.Constants;
 
 public class CompanyNumberValidator implements IdentificationNumberValidator {
 
-	public boolean validate(String commercialRegisterNumber) {
-		
-		String normalizedNumber = commercialRegisterNumber.replaceAll(" ", "");
-		if(normalizedNumber.startsWith(Constants.IDENIFICATIONTYPE_FN))
-			normalizedNumber = normalizedNumber.substring(2);
-		
-		return checkCommercialRegisterNumber(normalizedNumber);
-	}
+  @Override
+  public boolean validate(String commercialRegisterNumber) {
 
-	private boolean checkCommercialRegisterNumber(String commercialRegisterNumber) {
-		if (commercialRegisterNumber == null) {
-			return false;
-		}
-		commercialRegisterNumber = StringUtils.leftPad(commercialRegisterNumber, 7,
-		    '0');
-		if (!commercialRegisterNumber.matches("\\d{6}[abdfghikmpstvwxzy]")) {
-			return false;
-		}
-		String digits = commercialRegisterNumber.substring(0,
-		    commercialRegisterNumber.length() - 1);
-		char checkDigit = commercialRegisterNumber.charAt(commercialRegisterNumber
-		    .length() - 1);
-		boolean result = calcCheckDigitFromCommercialRegisterNumber(digits) == checkDigit;
-		return result;
-	}
+    String normalizedNumber = commercialRegisterNumber.replaceAll(" ", "");
+    if (normalizedNumber.startsWith(Constants.IDENIFICATIONTYPE_FN)) {
+      normalizedNumber = normalizedNumber.substring(2);
+    }
 
-	public static char calcCheckDigitFromCommercialRegisterNumber(
-	    String commercialRegisterDigits) {
-		final int[] WEIGHT = { 6, 4, 14, 15, 10, 1 };
-		final char[] CHECKDIGIT = { 'a', 'b', 'd', 'f', 'g', 'h', 'i', 'k', 'm',
-		    'p', 's', 't', 'v', 'w', 'x', 'y', 'z' };
-		if (commercialRegisterDigits == null) {
-			throw new NullPointerException("Commercial register number missing.");
-		}
-		commercialRegisterDigits = StringUtils.leftPad(commercialRegisterDigits, 6,
-		    '0');
-		if (!commercialRegisterDigits.matches("\\d{6}")) {
-			throw new IllegalArgumentException(
-			    "Invalid commercial register number provided.");
-		}
-		int sum = 0;
-		for (int i = 0; i < commercialRegisterDigits.length(); i++) {
-			int value = commercialRegisterDigits.charAt(i) - '0';
-			sum += WEIGHT[i] * value;
-		}
-		return CHECKDIGIT[sum % 17];
-	}
+    return checkCommercialRegisterNumber(normalizedNumber);
+  }
+
+  private boolean checkCommercialRegisterNumber(String commercialRegisterNumber) {
+    if (commercialRegisterNumber == null) {
+      return false;
+    }
+    commercialRegisterNumber = StringUtils.leftPad(commercialRegisterNumber, 7,
+        '0');
+    if (!commercialRegisterNumber.matches("\\d{6}[abdfghikmpstvwxzy]")) {
+      return false;
+    }
+    final String digits = commercialRegisterNumber.substring(0,
+        commercialRegisterNumber.length() - 1);
+    final char checkDigit = commercialRegisterNumber.charAt(commercialRegisterNumber
+        .length() - 1);
+    final boolean result = calcCheckDigitFromCommercialRegisterNumber(digits) == checkDigit;
+    return result;
+  }
+
+  public static char calcCheckDigitFromCommercialRegisterNumber(
+      String commercialRegisterDigits) {
+    final int[] WEIGHT = { 6, 4, 14, 15, 10, 1 };
+    final char[] CHECKDIGIT = { 'a', 'b', 'd', 'f', 'g', 'h', 'i', 'k', 'm',
+        'p', 's', 't', 'v', 'w', 'x', 'y', 'z' };
+    if (commercialRegisterDigits == null) {
+      throw new NullPointerException("Commercial register number missing.");
+    }
+    commercialRegisterDigits = StringUtils.leftPad(commercialRegisterDigits, 6,
+        '0');
+    if (!commercialRegisterDigits.matches("\\d{6}")) {
+      throw new IllegalArgumentException(
+          "Invalid commercial register number provided.");
+    }
+    int sum = 0;
+    for (int i = 0; i < commercialRegisterDigits.length(); i++) {
+      final int value = commercialRegisterDigits.charAt(i) - '0';
+      sum += WEIGHT[i] * value;
+    }
+    return CHECKDIGIT[sum % 17];
+  }
 }
-- 
cgit v1.2.3