This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch worktree-snazzy-petting-map in repository https://gitbox.apache.org/repos/asf/camel.git
commit ec5a94d4046fe846ca4e358d5e3556a6a15d782c Author: Claus Ibsen <[email protected]> AuthorDate: Sat Jul 11 10:01:22 2026 +0200 CAMEL-23990: camel-yaml-dsl-validator - Fix MessageFormat crash when error messages contain curly braces Co-Authored-By: Claude Opus 4.6 <[email protected]> Signed-off-by: Claus Ibsen <[email protected]> --- .../java/org/apache/camel/dsl/yaml/validator/CamelYamlParser.java | 4 +++- .../src/main/java/org/apache/camel/dsl/yaml/validator/YamlParser.java | 4 +++- .../main/java/org/apache/camel/dsl/yaml/validator/YamlValidator.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/CamelYamlParser.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/CamelYamlParser.java index e396aa06e5e1..9977323b38f3 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/CamelYamlParser.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/CamelYamlParser.java @@ -98,9 +98,11 @@ public class CamelYamlParser { return Collections.emptyList(); } } catch (Exception e) { + String msg = e.getClass().getName() + ": " + e.getMessage(); Error error = Error.builder() .messageKey("parser") - .format(new MessageFormat(e.getClass().getName() + ": " + e.getMessage())) + .format(new MessageFormat("{0}")) + .arguments(msg) .build(); return List.of(error); } diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlParser.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlParser.java index 16142ce61b62..6b0753c0c8b1 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlParser.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlParser.java @@ -40,9 +40,11 @@ public class YamlParser { mapper.readTree(file); return Collections.emptyList(); } catch (Exception e) { + String msg = e.getClass().getName() + ": " + e.getMessage(); Error error = Error.builder() .messageKey("parser") - .format(new MessageFormat(e.getClass().getName() + ": " + e.getMessage())) + .format(new MessageFormat("{0}")) + .arguments(msg) .build(); return List.of(error); } diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlValidator.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlValidator.java index a55c58e10a13..91770407d318 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlValidator.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/YamlValidator.java @@ -66,9 +66,11 @@ public class YamlValidator { var target = mapper.readTree(file); return new ArrayList<>(schema.validate(target)); } catch (Exception e) { + String msg = e.getClass().getName() + ": " + e.getMessage(); Error error = Error.builder() .messageKey("parser") - .format(new MessageFormat(e.getClass().getName() + ": " + e.getMessage())) + .format(new MessageFormat("{0}")) + .arguments(msg) .build(); return List.of(error); }
