HV-1774 Fix an invalid error message for unbalanced '{'/'}'

hibernate · May 6, 2020 · 5415140 · 5415140
1 parent d3b39a7
commit 5415140
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...ain/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java b/...ain/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java
@@ -47,7 +47,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/...bernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java b/...bernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java
@@ -22,7 +22,7 @@ public class InterpolationTermState implements ParserState {
 
 	@Override
 	public void terminate(TokenCollector tokenCollector) throws MessageDescriptorFormatException {
-		throw LOG.getNonTerminatedParameterException(
+		throw LOG.getUnbalancedBeginEndParameterException(
 				tokenCollector.getOriginalMessageDescriptor(),
 				BEGIN_TERM
 		);

diff --git a/...ava/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java b/...ava/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java
@@ -43,7 +43,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/util/logging/Log.java b/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java
@@ -614,8 +614,8 @@ ConstraintDefinitionException getValidatorForCrossParameterConstraintMustEitherV
 	ValidationException getOverridingConstraintDefinitionsInMultipleMappingFilesException(String constraintClassName);
 
 	@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.")