Pull request #309: Corrected display of invalid validation type in er…

…ror messages Merge in ITB/itb-commons from development to master * commit '09f766742f0ab3fc597c7ff02b2ea0198d4914cf': Corrected display of invalid validation type in error messages
ISAITB · Feb 19, 2025 · 795bf93 · 795bf93
2 parents 4f9ff7b + 09f7667
commit 795bf93
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/validation-commons/src/main/java/eu/europa/ec/itb/validation/commons/BaseInputHelper.java b/validation-commons/src/main/java/eu/europa/ec/itb/validation/commons/BaseInputHelper.java
@@ -127,22 +127,23 @@ public String validateValidationType(R domainConfig, ValidateRequest validateReq
      * @return The type of validation (validated).
      */
     public String validateValidationType(R domainConfig, String validationType) {
-        if (validationType == null) {
+        String validationTypeToUse = validationType;
+        if (validationTypeToUse == null) {
             String defaultValidationType = domainConfig.getDefaultType();
             if (defaultValidationType == null) {
                 throw new ValidatorException("validator.label.exception.validationTypeMissing", domainConfig.getDomainName(), String.join(", ", domainConfig.getType()));
             }
-            validationType = defaultValidationType;
+            validationTypeToUse = defaultValidationType;
         } else {
-            if (!domainConfig.getType().contains(validationType)) {
+            if (!domainConfig.getType().contains(validationTypeToUse)) {
                 // Check also whether the validation type is a configured alias.
-                validationType = domainConfig.resolveAlias(validationType);
-                if (validationType == null) {
+                validationTypeToUse = domainConfig.resolveAlias(validationTypeToUse);
+                if (validationTypeToUse == null) {
                     throw new ValidatorException("validator.label.exception.validationTypeInvalid", validationType, domainConfig.getDomainName(), String.join(", ", domainConfig.getType()));
                 }
             }
         }
-        return validationType;
+        return validationTypeToUse;
     }
 
     /**