Fix VAT numbers validators

Author: nip24pl

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>pl.nip24</groupId>
 	<artifactId>nip24-client</artifactId>
-	<version>1.3.7</version>
+	<version>1.3.8</version>
 
 	<name>nip24-java-client</name>
 	<description>NIP24 Service Client for Java</description>
@@ -64,7 +64,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.4.1</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>

src/main/java/pl/nip24/client/EUVAT.java

@@ -33,45 +33,45 @@ public class EUVAT {
 
 	/**
 	 * Konwertuje podany numer EU VAT do postaci znormalizowanej
-	 * @param nip numer EU VAT w dowolnym formacie
+	 * @param number numer EU VAT w dowolnym formacie
 	 * @return znormalizowany numer EU VAT
 	 */
-	public static String normalize(String nip)
+	public static String normalize(String number)
 	{
-		if (nip == null || nip.length() == 0) {
+		if (number == null || number.length() == 0) {
 			return null;
 		}
 
-		nip = nip.replaceAll("-", "");
-		nip = nip.replaceAll(" ", "");
-		nip = nip.trim().toUpperCase();
+		number = number.replaceAll("-", "");
+		number = number.replaceAll(" ", "");
+		number = number.trim().toUpperCase();
 
-		if (!nip.matches("[A-Z]{2}[A-Z0-9]{2,12}")) {
+		if (!number.matches("[A-Z]{2}[A-Z0-9+*]{2,12}")) {
 			return null;
 		}
 
-		return nip;
+		return number;
 	}
 
 	/**
 	 * Sprawdza poprawnoϾ numeru EU VAT
-	 * @param nip numer EU VAT
+	 * @param number numer EU VAT
 	 * @return true jeżeli podany numer jest prawidłowy
 	 */
-	public static boolean isValid(String nip)
+	public static boolean isValid(String number)
 	{
-		if ((nip = normalize(nip)) == null) {
+		if ((number = normalize(number)) == null) {
 			return false;
 		}
 
-		String cc = nip.substring(0, 2).toUpperCase();
-		String num = nip.substring(2).toUpperCase();
+		String cc = number.substring(0, 2).toUpperCase();
+		String num = number.substring(2).toUpperCase();
 
 		if (!map.containsKey(cc)) {
 			return false;
 		}
 
-		if (!nip.matches(map.get(cc))) {
+		if (!number.matches(map.get(cc))) {
 			return false;
 		}
 
@@ -84,32 +84,32 @@ public static boolean isValid(String nip)
 
 	static {
 		map.put("AT", "ATU\\d{8}");
-		map.put("BE", "BE0\\d{9}");
+		map.put("BE", "BE[0-1]{1}\\d{9}");
 		map.put("BG", "BG\\d{9,10}");
 		map.put("CY", "CY\\d{8}[A-Z]{1}");
 		map.put("CZ", "CZ\\d{8,10}");
 		map.put("DE", "DE\\d{9}");
 		map.put("DK", "DK\\d{8}");
 		map.put("EE", "EE\\d{9}");
 		map.put("EL", "EL\\d{9}");
-		map.put("ES", "ES[A-Z0-9]{9}");
+		map.put("ES", "ES[A-Z0-9]{1}\\d{7}[A-Z0-9]{1}");
 		map.put("FI", "FI\\d{8}");
 		map.put("FR", "FR[A-Z0-9]{2}\\d{9}");
-		map.put("GB", "GB[A-Z0-9]{5,12}");
 		map.put("HR", "HR\\d{11}");
 		map.put("HU", "HU\\d{8}");
-		map.put("IE", "IE[A-Z0-9]{8,9}");
+		map.put("IE", "IE[A-Z0-9+*]{8,9}");
 		map.put("IT", "IT\\d{11}");
 		map.put("LT", "LT\\d{9,12}");
 		map.put("LU", "LU\\d{8}");
 		map.put("LV", "LV\\d{11}");
 		map.put("MT", "MT\\d{8}");
-		map.put("NL", "NL\\d{9}B\\d{2}");
+		map.put("NL", "NL[A-Z0-9+*]{12}");
 		map.put("PL", "PL\\d{10}");
 		map.put("PT", "PT\\d{9}");
 		map.put("RO", "RO\\d{2,10}");
 		map.put("SE", "SE\\d{12}");
 		map.put("SI", "SI\\d{8}");
 		map.put("SK", "SK\\d{10}");
+		map.put("XI", "XI[A-Z0-9]{5,12}");
 	}
 }

src/main/java/pl/nip24/client/NIP24Client.java

@@ -56,7 +56,7 @@
  */
 public class NIP24Client {
 
-	public final static String VERSION = "1.3.7";
+	public final static String VERSION = "1.3.8";
 
 	public final static String PRODUCTION_URL = "https://www.nip24.pl/api";
 	public final static String TEST_URL = "https://www.nip24.pl/api-test";