Skip to content

Commit 4b9f2a1

Browse files
yrodieregsmet
authored andcommitted
HV-1774 Fix an invalid error message for unbalanced '{'/'}'
1 parent 16b77f0 commit 4b9f2a1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/ELState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void handleBeginTerm(char character, TokenCollector tokenCollector) throw
4747

4848
@Override
4949
public void handleEndTerm(char character, TokenCollector tokenCollector) throws MessageDescriptorFormatException {
50-
throw LOG.getNonTerminatedParameterException(
50+
throw LOG.getUnbalancedBeginEndParameterException(
5151
tokenCollector.getOriginalMessageDescriptor(),
5252
character
5353
);

engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/InterpolationTermState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class InterpolationTermState implements ParserState {
2222

2323
@Override
2424
public void terminate(TokenCollector tokenCollector) throws MessageDescriptorFormatException {
25-
throw LOG.getNonTerminatedParameterException(
25+
throw LOG.getUnbalancedBeginEndParameterException(
2626
tokenCollector.getOriginalMessageDescriptor(),
2727
BEGIN_TERM
2828
);

engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/parser/MessageState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void handleBeginTerm(char character, TokenCollector tokenCollector) throw
4343

4444
@Override
4545
public void handleEndTerm(char character, TokenCollector tokenCollector) throws MessageDescriptorFormatException {
46-
throw LOG.getNonTerminatedParameterException(
46+
throw LOG.getUnbalancedBeginEndParameterException(
4747
tokenCollector.getOriginalMessageDescriptor(),
4848
character
4949
);

engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,8 @@ ConstraintDefinitionException getValidatorForCrossParameterConstraintMustEitherV
606606
ValidationException getOverridingConstraintDefinitionsInMultipleMappingFilesException(String constraintClassName);
607607

608608
@Message(id = 168,
609-
value = "The message descriptor '%1$s' contains an unbalanced meta character '%2$c' parameter.")
610-
MessageDescriptorFormatException getNonTerminatedParameterException(String messageDescriptor, char character);
609+
value = "The message descriptor '%1$s' contains an unbalanced meta character '%2$c'.")
610+
MessageDescriptorFormatException getUnbalancedBeginEndParameterException(String messageDescriptor, char character);
611611

612612
@Message(id = 169,
613613
value = "The message descriptor '%1$s' has nested parameters.")

0 commit comments

Comments
 (0)