root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

OperatorMatches caches compiled patterns 

Issue: SPR-12610
This commit is contained in:
Juergen Hoeller 2015-01-20 16:02:11 +01:00
parent 11bf3b3524
commit d34402d3ba
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,8 @@
package org.springframework.expression.spel.ast; package org.springframework.expression.spel.ast;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException; import java.util.regex.PatternSyntaxException;
@ -27,15 +29,20 @@ import org.springframework.expression.spel.SpelMessage;
import org.springframework.expression.spel.support.BooleanTypedValue; import org.springframework.expression.spel.support.BooleanTypedValue;
/** /**
* Implements the matches operator. Matches takes two operands. The first is a string and * Implements the matches operator. Matches takes two operands:
* the second is a java regex. It will return true when getValue() is called if the first * The first is a String and the second is a Java regex.
* operand matches the regex. * It will return {@code true} when {@link #getValue} is called
* if the first operand matches the regex.
* *
* @author Andy Clement * @author Andy Clement
* @author Juergen Hoeller
* @since 3.0 * @since 3.0
*/ */
public class OperatorMatches extends Operator { public class OperatorMatches extends Operator {
private final ConcurrentMap<String, Pattern> patternCache = new ConcurrentHashMap<String, Pattern>();
public OperatorMatches(int pos, SpelNodeImpl... operands) { public OperatorMatches(int pos, SpelNodeImpl... operands) {
super("matches", pos, operands); super("matches", pos, operands);
} }
@ -66,8 +73,14 @@ public class OperatorMatches extends Operator {
} }
try { try {
Pattern pattern = Pattern.compile((String) right); String leftString = (String) left;
Matcher matcher = pattern.matcher((String) left); String rightString = (String) right;
Pattern pattern = this.patternCache.get(rightString);
if (pattern == null) {
pattern = Pattern.compile(rightString);
this.patternCache.putIfAbsent(rightString, pattern);
}
Matcher matcher = pattern.matcher(leftString);
return BooleanTypedValue.forValue(matcher.matches()); return BooleanTypedValue.forValue(matcher.matches());
} }
catch (PatternSyntaxException ex) { catch (PatternSyntaxException ex) {