fix toString for DynamicMap

Author: jdconrad

server/src/main/java/org/elasticsearch/script/DynamicMap.java

@@ -98,6 +98,17 @@ public Set<Entry<String, Object>> entrySet() {
 
     @Override
     public String toString() {
-        return delegate.toString();
+        StringBuilder sb = new StringBuilder("DynamicMap [");
+        int count = 0;
+        for (Map.Entry<String, Object> entry : entrySet()) {
+            sb.append(entry.getKey());
+            sb.append(": ");
+            sb.append(entry.getValue());
+            if (++count < size()) {
+                sb.append(", ");
+            }
+        }
+        sb.append("]");
+        return sb.toString();
     }
 }

server/src/test/java/org/elasticsearch/script/ScriptTests.java

@@ -29,7 +29,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
 
 public class ScriptTests extends ESTestCase {
 
@@ -192,7 +196,6 @@ public void testDynamicMapToString() {
         map.put("long", 1L);
         map.put("string", "value");
         DynamicMap dm = new DynamicMap(map, Collections.emptyMap());
-        assertTrue(dm.toString().contains("string=value"));
-        assertTrue(dm.toString().contains("long=1"));
+        assertThat(dm.toString(), both(containsString("long: 1")).and(containsString("string: value")));
     }
 }