diff --git a/common-dto/pom.xml b/common-dto/pom.xml index ca6a884e3..fc1206ec5 100644 --- a/common-dto/pom.xml +++ b/common-dto/pom.xml @@ -17,10 +17,11 @@ 2.0.1.Final true + - org.iban4j - iban4j - 3.2.13-RELEASE + de.speedbanking + iban-commons + 1.8.6 true diff --git a/common-dto/src/main/java/com/liberologico/cloudesire/common/validators/IBANValidatorForString.java b/common-dto/src/main/java/com/liberologico/cloudesire/common/validators/IBANValidatorForString.java index 5dc9c9af6..857bf266b 100644 --- a/common-dto/src/main/java/com/liberologico/cloudesire/common/validators/IBANValidatorForString.java +++ b/common-dto/src/main/java/com/liberologico/cloudesire/common/validators/IBANValidatorForString.java @@ -1,6 +1,6 @@ package com.liberologico.cloudesire.common.validators; -import org.iban4j.IbanUtil; +import de.speedbanking.iban.Iban; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -16,19 +16,6 @@ public void initialize( IBAN constraintAnnotation ) @Override public boolean isValid( String iban, ConstraintValidatorContext context ) { - if ( iban == null ) - { - return true; - - } - try - { - IbanUtil.validate( iban ); - } - catch ( Exception e ) - { - return false; - } - return true; + return iban == null || Iban.isValid(iban); } }