Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow SpEL reserved words in type package names

Browse Source 
Expand the kinds of tokens considered when parsing qualified type names.
This allows previously reserved words (for example 'mod') to be used as
part of a package name.

Issue: SPR-9862
This commit is contained in:
Phillip Webb
2012-10-09 21:18:51 -07:00
committed by Chris Beams
parent 7c399d795e
commit edce2e7bca
4 changed files with 103 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import org.junit.Test;
/**
* Tests the messages and exceptions that come out for badly formed expressions
*
*
* @author Andy Clement
*/
public class ParserErrorMessagesTests extends ExpressionTestCase {
@@ -56,7 +56,7 @@ public class ParserErrorMessagesTests extends ExpressionTestCase {
// T() can only take an identifier (possibly qualified), not a literal
// message ought to say identifier rather than ID
parseAndCheckError("null instanceof T('a')", SpelMessage.NOT_EXPECTED_TOKEN, 18,
"identifier","literal_string");
"qualified ID","literal_string");
}
}

50
spring-expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java → spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@@ -16,32 +16,49 @@
package org.springframework.expression.spel;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import junit.framework.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.*;
import org.springframework.expression.AccessException;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.MethodExecutor;
import org.springframework.expression.MethodResolver;
import org.springframework.expression.ParserContext;
import org.springframework.expression.PropertyAccessor;
import org.springframework.expression.TypedValue;
import org.springframework.expression.spel.standard.SpelExpression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.ReflectiveMethodResolver;
import org.springframework.expression.spel.support.ReflectivePropertyAccessor;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.expression.spel.support.StandardTypeLocator;
import org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.junit.Assert.*;
/**
* Tests based on Jiras up to the release of Spring 3.0.0
* Reproduction tests cornering various SpEL JIRA issues.
*
* @author Andy Clement
* @author Clark Duplichien
*/
public class SpringEL300Tests extends ExpressionTestCase {
public class SpelReproTests extends ExpressionTestCase {
@Test
public void testNPE_SPR5661() {
@@ -147,12 +164,12 @@ public class SpringEL300Tests extends ExpressionTestCase {
Expression expr = new SpelExpressionParser().parseRaw("T(java.util.Map$Entry)");
Assert.assertEquals(Map.Entry.class,expr.getValue(eContext));
expr = new SpelExpressionParser().parseRaw("T(org.springframework.expression.spel.SpringEL300Tests$Outer$Inner).run()");
expr = new SpelExpressionParser().parseRaw("T(org.springframework.expression.spel.SpelReproTests$Outer$Inner).run()");
Assert.assertEquals(12,expr.getValue(eContext));
expr = new SpelExpressionParser().parseRaw("new org.springframework.expression.spel.SpringEL300Tests$Outer$Inner().run2()");
expr = new SpelExpressionParser().parseRaw("new org.springframework.expression.spel.SpelReproTests$Outer$Inner().run2()");
Assert.assertEquals(13,expr.getValue(eContext));
}
}
static class Outer {
static class Inner {
@@ -1034,6 +1051,15 @@ public class SpringEL300Tests extends ExpressionTestCase {
Assert.assertEquals("abc",exp.getValue(ctx));
}
@Test
public void testReservedWordProperties_9862() throws Exception {
StandardEvaluationContext ctx = new StandardEvaluationContext();
SpelExpressionParser parser = new SpelExpressionParser();
SpelExpression expression = parser.parseRaw("T(org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver).CONST");
Object value = expression.getValue(ctx);
assertEquals(value, Reserver.CONST);
}
/**
* We add property accessors in the order:
* First, Second, Third, Fourth.

29
spring-expression/src/test/java/org/springframework/expression/spel/testresources/le/div/mod/reserved/Reserver.java Normal file
View File

@@ -0,0 +1,29 @@
/*
* Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.expression.spel.testresources.le.div.mod.reserved;
/**
* For use when testing that the SpEL expression parser can accommodate SpEL's own
* reserved words being used in package names.
*
* @author Phillip Webb
*/
public class Reserver {
public static final String CONST = "Const";
}