80 lines
5.1 KiB
Diff
80 lines
5.1 KiB
Diff
From 4b9f2a1a3e1c67fbd29a7fc710c611d7aca6eab9 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
|
|
Date: Tue, 25 Feb 2020 13:05:53 +0100
|
|
Subject: [PATCH] HV-1774 Fix an invalid error message for unbalanced '{'/'}'
|
|
|
|
---
|
|
.../internal/engine/messageinterpolation/parser/ELState.java | 2 +-
|
|
.../messageinterpolation/parser/InterpolationTermState.java | 2 +-
|
|
.../engine/messageinterpolation/parser/MessageState.java | 2 +-
|
|
.../org/hibernate/validator/internal/util/logging/Log.java | 4 ++--
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java
|
|
index fda95a153..9f480f848 100644
|
|
--- a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java
|
|
+++ b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java
|
|
@@ -42,7 +42,7 @@ public void handleBeginTerm(char character, TokenCollector tokenCollector) throw
|
|
|
|
@Override
|
|
public void handleEndTerm(char character, TokenCollector tokenCollector) throws MessageDescriptorFormatException {
|
|
- throw log.getNonTerminatedParameterException(
|
|
+ throw log.getUnbalancedBeginEndParameterException(
|
|
tokenCollector.getOriginalMessageDescriptor(),
|
|
character
|
|
);
|
|
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java
|
|
index 9b00c3594..809db34dd 100644
|
|
--- a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java
|
|
+++ b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java
|
|
@@ -17,7 +17,7 @@
|
|
|
|
@Override
|
|
public void terminate(TokenCollector tokenCollector) throws MessageDescriptorFormatException {
|
|
- throw log.getNonTerminatedParameterException(
|
|
+ throw log.getUnbalancedBeginEndParameterException(
|
|
tokenCollector.getOriginalMessageDescriptor(),
|
|
TokenCollector.BEGIN_TERM
|
|
);
|
|
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java
|
|
index a8b1de63f..88171668a 100644
|
|
--- a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java
|
|
+++ b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java
|
|
@@ -40,7 +40,7 @@ public void handleBeginTerm(char character, TokenCollector tokenCollector) throw
|
|
|
|
@Override
|
|
public void handleEndTerm(char character, TokenCollector tokenCollector) throws MessageDescriptorFormatException {
|
|
- throw log.getNonTerminatedParameterException(
|
|
+ throw log.getUnbalancedBeginEndParameterException(
|
|
tokenCollector.getOriginalMessageDescriptor(),
|
|
character
|
|
);
|
|
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/BeginState.java b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/BeginState.java
|
|
index 678f16e..7d544de 100644
|
|
--- a/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/BeginState.java
|
|
+++ b/engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/BeginState.java
|
|
@@ -48,7 +48,7 @@ public void handleBeginTerm(char character, TokenCollector tokenCollector) throw
|
|
|
|
@Override
|
|
public void handleEndTerm(char character, TokenCollector tokenCollector) throws MessageDescriptorFormatException {
|
|
- throw log.getNonTerminatedParameterException( tokenCollector.getOriginalMessageDescriptor(), character );
|
|
+ throw log.getUnbalancedBeginEndParameterException( tokenCollector.getOriginalMessageDescriptor(), character );
|
|
}
|
|
|
|
@Override
|
|
diff --git a/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java b/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java
|
|
index 3effce1c9..33034cb0c 100644
|
|
--- a/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java
|
|
+++ b/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java
|
|
@@ -552,8 +552,8 @@ ConstraintDefinitionException getValidatorForCrossParameterConstraintMustEitherV
|
|
ValidationException getOverridingConstraintDefinitionsInMultipleMappingFilesException(String constraintClass);
|
|
|
|
@Message(id = 168,
|
|
- value = "The message descriptor '%1$s' contains an unbalanced meta character '%2$c' parameter.")
|
|
- MessageDescriptorFormatException getNonTerminatedParameterException(String messageDescriptor, char character);
|
|
+ value = "The message descriptor '%1$s' contains an unbalanced meta character '%2$c'.")
|
|
+ MessageDescriptorFormatException getUnbalancedBeginEndParameterException(String messageDescriptor, char character);
|
|
|
|
@Message(id = 169,
|
|
value = "The message descriptor '%1$s' has nested parameters.")
|