Polished collection support

Polished collection support tp ensure we can support various types of collection such as List, Set etc.

spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RequestProcessor.java

@@ -18,12 +18,11 @@ package org.springframework.cloud.function.web;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -104,8 +103,9 @@ public class RequestProcessor {
 		Object input = null;
 		if (StringUtils.hasText(body)) {
 			if (body.startsWith("[")) {
+				Class<?> collectionType = Collection.class.isAssignableFrom(inputType) ? inputType : Collection.class;
 				input = mapper.toObject(body, ResolvableType
-						.forClassWithGenerics(ArrayList.class, (Class<?>) itemType)
+						.forClassWithGenerics(collectionType, (Class<?>) itemType)
 						.getType());
 			}
 			else {
@@ -136,8 +136,8 @@ public class RequestProcessor {
 	private Mono<ResponseEntity<?>> post(FunctionWrapper wrapper, Object body,
 			MultiValueMap<String, String> params, boolean stream) {
 
-		Iterable<?> iterable = body instanceof Collection ? (List<?>) body
+		Iterable<?> iterable = body instanceof Collection ? (Collection<?>) body
-				: Collections.singletonList(body);
+				: (body instanceof Set ? Collections.singleton(body) : Collections.singletonList(body));
 
 		Function<Publisher<?>, Publisher<?>> function = wrapper.function();
 		Consumer<Publisher<?>> consumer = wrapper.consumer();

spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputListTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import reactor.core.publisher.Mono;
 @RunWith(SpringRunner.class)
 @FunctionalSpringBootTest("spring.main.web-application-type=reactive")
 @AutoConfigureWebTestClient
-public class FunctionalWithInputCollectionTests {
+public class FunctionalWithInputListTests {
 
 	@Autowired
 	private WebTestClient client;

spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputSetTests.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * @author Dave Syer
+ *
+ */
+@RunWith(SpringRunner.class)
+@FunctionalSpringBootTest("spring.main.web-application-type=reactive")
+@AutoConfigureWebTestClient
+public class FunctionalWithInputSetTests {
+
+	@Autowired
+	private WebTestClient client;
+
+	@Test
+	public void words() throws Exception {
+		String reply = client.post().uri("/").body(Mono.just("[{\"value\":\"foo\"}, {\"value\":\"bar\"}]"), String.class)
+				.exchange().expectStatus().isOk().expectBody(String.class).returnResult().getResponseBody();
+		assertTrue(reply.contains("FOO"));
+		assertTrue(reply.contains("BAR"));
+		assertTrue(reply.contains("{\"value\":\""));
+	}
+
+	@SpringBootConfiguration
+	protected static class TestConfiguration implements Function<Set<Foo>, Foo> {
+		@Override
+		public Foo apply(Set<Foo> value) {
+			return new Foo(value.stream().map(foo -> foo.getValue().toUpperCase())
+					.collect(Collectors.joining()));
+		}
+	}
+
+	public static class Foo {
+
+		private String value;
+
+		public Foo() {
+		}
+
+		public Foo(String value) {
+			this.value = value;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public String toString() {
+			return "Foo [value=" + this.value + "]";
+		}
+
+	}
+}