Proposal for enhancement

#4

Author: DJCordhose

Releasenotes.md

@@ -151,5 +151,5 @@ Release 3.2.0
 * Transformation of model value to iterable for for each now done in ModelAdaptor
 * ModelAdapter can be configured to treat everything as a list when looping over it, prevents map to be iterated over as entries
 * ModelAdapter now manages special iterator alias, DefaultModelAdapter provides "_it" for backward compatibility 
-
+* ModelAdapter now has a (slow) fallback to access maps with keys that are not strings (iterating through all keys, turning them to strings and compare), can be deactivated
 

src/com/floreysoft/jmte/DefaultModelAdaptor.java

@@ -43,18 +43,20 @@ public enum LoopMode {
     protected final Map<Class<?>, Map<String, Member>> cache = new HashMap<Class<?>, Map<String, Member>>();
     private final LoopMode loopMode;
     private final String specialIteratorVariable;
+    private final boolean enableSlowMapAccess;
 
     public DefaultModelAdaptor() {
         this(LoopMode.DEFAULT);
     }
 
     public DefaultModelAdaptor(LoopMode loopMode) {
-        this(loopMode, DEFAULT_SPECIAL_ITERATOR_VARIABLE);
+        this(loopMode, DEFAULT_SPECIAL_ITERATOR_VARIABLE, true);
     }
 
-    public DefaultModelAdaptor(LoopMode loopMode, String specialIteratorVariable) {
+    public DefaultModelAdaptor(LoopMode loopMode, String specialIteratorVariable, boolean enableSlowMapAccess) {
         this.loopMode = loopMode;
         this.specialIteratorVariable = specialIteratorVariable;
+        this.enableSlowMapAccess = enableSlowMapAccess;
     }
 
     public Object getValue(Map<String, Object> model, String expression) {
@@ -149,8 +151,7 @@ protected Object nextStep(Object o, String attributeName,
                     "receiver", o.toString()).build());
             return o;
         } else if (o instanceof Map) {
-            Map map = (Map) o;
-            result = map.get(attributeName);
+            result = accessMap((Map) o, attributeName);
         } else {
             try {
                 result = getPropertyValue(o, attributeName);
@@ -164,6 +165,21 @@ protected Object nextStep(Object o, String attributeName,
         return result;
     }
 
+    protected Object accessMap(Map map, String key) {
+        Object result;
+        result = map.get(key);
+        if (result == null && enableSlowMapAccess) {
+            final Set<Map.Entry<?, ?>> entries = map.entrySet();
+            for (Map.Entry entry: entries) {
+                if (entry.getKey().toString().equals(key)) {
+                    result = entry.getValue();
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
     @SuppressWarnings("rawtypes")
     protected Object getPropertyValue(Object o, String propertyName) {
         try {

test/com/floreysoft/jmte/AbstractEngineTest.java

@@ -152,7 +152,12 @@ public Iterator<Object> iterator() {
 		}
 	}
 
+	public static enum MyType {
+		TYPE_A, TYPE_B;
+	}
+
 	public static class MyBean {
+		public Map<MyType, String> mapEnumAsKey = new HashMap<>();
 
 		private Object property1 = "propertyValue1";
 		public Object property2 = "propertyValue2";
@@ -165,6 +170,8 @@ public MyBean(Object property1, Object property2) {
 		}
 
 		public MyBean() {
+			mapEnumAsKey.put(MyType.TYPE_A, "A");
+			mapEnumAsKey.put(MyType.TYPE_B, "B");
 		}
 
 		public List getList() {
@@ -1421,4 +1428,11 @@ public void xmlEncoderRawNamedRenderer() throws Exception {
 		assertEquals("&<>'\"", actual);
 	}
 
+	@Test
+	public void enumAsKey() throws Exception {
+		String output = newEngine().transform(
+				"${bean.mapEnumAsKey.TYPE_A}", DEFAULT_MODEL);
+		assertEquals("A", output);
+	}
+
 }