Skip to content

Revert "[perf] use precompiled pattern" #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
volosied merged 1 commit into from
Sep 2, 2026
+5 −13
Merged

Revert "[perf] use precompiled pattern" #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions api/src/main/java/jakarta/faces/validator/BeanValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import java.util.regex.Pattern;

import jakarta.el.ValueExpression;
import jakarta.el.ValueReference;
Expand Down Expand Up @@ -110,13 +109,6 @@ public class BeanValidator implements Validator, PartialStateHolder
* Currently, a string containing only whitespace is classified as empty.
*/
public static final String EMPTY_VALIDATION_GROUPS_PATTERN = "^[\\W,]*$";

/**
* Precompiled form of {@link #EMPTY_VALIDATION_GROUPS_PATTERN}; use this instead of
* {@code String.matches(EMPTY_VALIDATION_GROUPS_PATTERN)} to avoid recompiling the
* pattern on every postback.
*/
public static final Pattern EMPTY_VALIDATION_GROUPS = Pattern.compile(EMPTY_VALIDATION_GROUPS_PATTERN);

/**
* Enable f:validateWholeBean use.
Expand Down Expand Up @@ -345,7 +337,7 @@ private ValidatorFactory createValidatorFactory(FacesContext context)
*/
private void postSetValidationGroups()
{
if (this.validationGroups == null || EMPTY_VALIDATION_GROUPS.matcher(this.validationGroups).matches())
if (this.validationGroups == null || this.validationGroups.matches(EMPTY_VALIDATION_GROUPS_PATTERN))
{
this.validationGroupsArray = DEFAULT_VALIDATION_GROUPS_ARRAY;
}
Expand Down
4 changes: 2 additions & 2 deletions impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import jakarta.faces.component.visit.VisitContext;
import jakarta.faces.component.visit.VisitResult;
import jakarta.faces.context.FacesContext;
import static jakarta.faces.validator.BeanValidator.EMPTY_VALIDATION_GROUPS;
import static jakarta.faces.validator.BeanValidator.EMPTY_VALIDATION_GROUPS_PATTERN;
import static jakarta.faces.validator.BeanValidator.MESSAGE_ID;
import static jakarta.faces.validator.BeanValidator.VALIDATION_GROUPS_DELIMITER;
import static jakarta.faces.validator.BeanValidator.VALIDATOR_FACTORY_KEY;
Expand Down Expand Up @@ -296,7 +296,7 @@ private ValidatorFactory createValidatorFactory(FacesContext context)
private void postSetValidationGroups(ValidateWholeBeanComponent component)
{
String validationGroups = getValidationGroups(component);
if (validationGroups == null || EMPTY_VALIDATION_GROUPS.matcher(validationGroups).matches())
if (validationGroups == null || validationGroups.matches(EMPTY_VALIDATION_GROUPS_PATTERN))
{
this.validationGroupsArray = DEFAULT_VALIDATION_GROUPS_ARRAY;
}
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ private void addDefaultValidator(FaceletContext ctx, FaceletCompositionContext m
// check the validationGroups
String validationGroups = beanValidator.getValidationGroups();
if (validationGroups == null
|| BeanValidator.EMPTY_VALIDATION_GROUPS.matcher(validationGroups).matches())
|| validationGroups.matches(BeanValidator.EMPTY_VALIDATION_GROUPS_PATTERN))
{
// no validationGroups available
// --> get the validationGroups from the stack
Expand Down Expand Up @@ -854,7 +854,7 @@ private void addEnclosingValidator(FacesContext context,
// check the validationGroups
String validationGroups = beanValidator.getValidationGroups();
if (validationGroups == null
|| BeanValidator.EMPTY_VALIDATION_GROUPS.matcher(validationGroups).matches())
|| validationGroups.matches(BeanValidator.EMPTY_VALIDATION_GROUPS_PATTERN))
{
// no validationGroups available
// --> get the validationGroups from the stack
Expand Down
Loading