Skip to content

Use precompiled regex for PropertyMatch.namePattern #3376

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

Closed
wants to merge 1 commit into from
+9 −7
Closed

Use precompiled regex for PropertyMatch.namePattern #3376

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
16 changes: 9 additions & 7 deletions src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import org.apache.commons.logging.Log;
Expand Down Expand Up @@ -93,6 +94,7 @@
* @author Mark Paluch
* @author Mikael Klamra
* @author Christoph Strobl
* @author Kamil Krzywański
*/
public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?, P>, P extends PersistentProperty<P>>
implements MappingContext<E, P>, ApplicationEventPublisherAware, ApplicationContextAware, BeanFactoryAware,
Expand Down Expand Up @@ -819,8 +821,8 @@ public boolean matches(Property property) {
*/
static class PropertyMatch {

private final @Nullable String namePattern;
private final @Nullable String typeName;
private final @Nullable Pattern namePatternRegex;
private final @Nullable String typeName;

/**
* Creates a new {@link PropertyMatch} for the given name pattern and type name. At least one of the parameters
Expand All @@ -833,8 +835,8 @@ public PropertyMatch(@Nullable String namePattern, @Nullable String typeName) {

Assert.isTrue(!((namePattern == null) && (typeName == null)), "Either name pattern or type name must be given");

this.namePattern = namePattern;
this.typeName = typeName;
this.namePatternRegex = namePattern == null ? null : Pattern.compile(namePattern);
this.typeName = typeName;
}

/**
Expand Down Expand Up @@ -869,9 +871,9 @@ public boolean matches(String name, Class<?> type) {
Assert.notNull(name, "Name must not be null");
Assert.notNull(type, "Type must not be null");

if ((namePattern != null) && !name.matches(namePattern)) {
return false;
}
if (namePatternRegex != null && !namePatternRegex.matcher(name).matches()) {
return false;
}

if ((typeName != null) && !type.getName().equals(typeName)) {
return false;
Expand Down