SPR-7244: double indexing with a collection of different types of element

Author: aclement

org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java

@@ -89,7 +89,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		}
 
 		// Indexing into a Map
-		if (targetObjectTypeDescriptor.isMap()) {
+		if (targetObject instanceof Map) {
 			if (targetObject == null) {
 			    // Current decision: attempt to index into null map == exception and does not just return null
 				throw new SpelEvaluationException(getStartPosition(),SpelMessage.CANNOT_INDEX_INTO_NULL_VALUE);

org.springframework.expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java

@@ -17,6 +17,7 @@
 package org.springframework.expression.spel;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 
@@ -28,6 +29,7 @@
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.ParserContext;
 import org.springframework.expression.PropertyAccessor;
 import org.springframework.expression.TypedValue;
@@ -673,4 +675,27 @@ public void elvis_SPR7209_2() {
 		Assert.assertEquals("default", expr.getValue());
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
+	public void testMapOfMap_SPR7244() throws Exception {
+        Map<String,Object> map = new LinkedHashMap();
+        map.put("uri", "http:");
+        Map nameMap = new LinkedHashMap();
+        nameMap.put("givenName", "Arthur");
+        map.put("value", nameMap);
+        
+        StandardEvaluationContext ctx = new StandardEvaluationContext(map);
+        ExpressionParser parser = new SpelExpressionParser();
+        String el1 = "#root['value'].get('givenName')";
+        Expression exp = parser.parseExpression(el1);
+        Object evaluated = exp.getValue(ctx);
+        Assert.assertEquals("Arthur", evaluated);
+
+        String el2 = "#root['value']['givenName']";
+        exp = parser.parseExpression(el2);
+        evaluated = exp.getValue(ctx);
+        Assert.assertEquals("Arthur",evaluated);
+    }
+
+	
 }