Revize 8db0bbf6

re #8103 Error text in assembly validation is now valid (not null).

src/main/java/vldc/aswi/validators/AssemblyValidator.java

@@ -60 +60 @@
 
                 // Check if parameter's nameOfSelect is contained in column names of SQL query.
                 if (parameter.getNameOfSelect() == null || !columnNames.stream().anyMatch(n-> n.equalsIgnoreCase(parameter.getNameOfSelect()))) {
-                    errors.reject("parameters[" + i + "].nameOfSelect", "Název parametru v SQL query není validní u parametru '" + parameter.getName() + "'!");
+                    errors.reject("parameters[" + i + "].nameOfSelect", "Název parametru v SQL není validní u parametru '" + parameter.getName() + "'!");
                 }
 
                 // Check if current parameter have at least 1 location.

src/main/java/vldc/aswi/web/controller/BasicController.java

@@ -20 +20 @@
             if (object instanceof FieldError) {
                 FieldError fieldError = (FieldError) object;
 
-                message += fieldError.getDefaultMessage() + ", ";
+                if (fieldError.getDefaultMessage() == null) {
+                    message += fieldError.getCode() + ", ";
+                }
+                else {
+                    message += fieldError.getDefaultMessage() + ", ";
+                }
                 continue;
             }
 
             if (object instanceof ObjectError) {
                 ObjectError objectError = (ObjectError) object;
 
-                message += objectError.getDefaultMessage() + ", ";
+                if (objectError.getDefaultMessage() == null) {
+                    message += objectError.getCode() + ", ";
+                }
+                else {
+                    message += objectError.getDefaultMessage() + ", ";
+                }
                 continue;
             }
         }
-        return message;
+        return message.substring(0, message.length() - 2);
     }
 }