[camel] branch master updated: CAMEL-13741 - Allow to convert a Map to an Iterable

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c8cfad  CAMEL-13741 - Allow to convert a Map to an Iterable
1c8cfad is described below

commit 1c8cfadde1245e90887399feb57c38e8b1038547
Author: Antoine DESSAIGNE <antoine.dessai...@gmail.com>
AuthorDate: Thu Jul 11 10:05:09 2019 +0200

    CAMEL-13741 - Allow to convert a Map to an Iterable
---
 .../java/org/apache/camel/converter/ObjectConverterTest.java  | 11 +++++++++++
 .../src/main/java/org/apache/camel/support/ObjectHelper.java  |  3 +++
 2 files changed, 14 insertions(+)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
index b533f31..e705858 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
@@ -17,8 +17,11 @@
 package org.apache.camel.converter;
 
 import java.math.BigInteger;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -45,6 +48,14 @@ public class ObjectConverterTest extends Assert {
                 fail();
             }
         }
+
+        Map<String, String> map = new LinkedHashMap<>();
+        map.put("A", "AA");
+        map.put("B", "BB");
+        Iterator<?> it = ObjectConverter.iterable(map).iterator();
+        assertEquals(new SimpleEntry<>("A", "AA"), it.next());
+        assertEquals(new SimpleEntry<>("B", "BB"), it.next());
+        assertFalse(it.hasNext());
     }
 
     @Test
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java 
b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
index 195b1c7..fe5f99d 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;
 
@@ -611,6 +612,8 @@ public final class ObjectHelper {
                     };
                 };
             }
+        } else if (value instanceof Map) {
+            return ((Map)value).entrySet();
         } else {
             return Collections.singletonList(value);
         }