Delegate to wrapped map for toString in DynamicMap (#72048)

This changes has DynamicMap delegate to its interally wrapped Map for toString to give better debugging information. This is particularly relevant to Debug.explain in Painless.
elastic · Apr 21, 2021 · 1e49d36 · 1e49d36
1 parent 2d3f171
commit 1e49d36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/server/src/main/java/org/elasticsearch/script/DynamicMap.java b/server/src/main/java/org/elasticsearch/script/DynamicMap.java
@@ -94,4 +94,9 @@ public Collection<Object> values() {
     public Set<Entry<String, Object>> entrySet() {
         return delegate.entrySet();
     }
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
 }
diff --git a/server/src/test/java/org/elasticsearch/script/ScriptTests.java b/server/src/test/java/org/elasticsearch/script/ScriptTests.java
@@ -199,4 +199,13 @@ public void testParseFromObjectWrongParamsFormat() {
         );
         assertEquals("Value must be of type Map: [params]", exc.getMessage());
     }
+
+    public void testDynamicMapToString() {
+        Map<String, Object> map = new HashMap<>();
+        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"));
+    }
 }