DATACMNS-867 - Introduced monadic methods on Streamable.

Streamable now exposes map(…), flatMap(…) and filter(…) to allow easy conversion into new Streamables. Introduced LazyStreamable to back those implementations. Simplified implementation of methods in PartTree to use those new methods.

Changed Page and Slice map(…) method to take a Function over a Converter so that act as specialization of the newly introduced map(…) method.

src/main/java/org/springframework/data/domain/Chunk.java

@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.springframework.core.convert.converter.Converter;
@@ -156,11 +157,11 @@ abstract class Chunk<T> implements Slice<T>, Serializable {
 	 * @param converter must not be {@literal null}.
 	 * @return
 	 */
-	protected <U> List<U> getConvertedContent(Converter<? super T, ? extends U> converter) {
+	protected <U> List<U> getConvertedContent(Function<? super T, ? extends U> converter) {
 
 		Assert.notNull(converter, "Converter must not be null!");
 
-		return this.stream().map(converter::convert).collect(Collectors.toList());
+		return this.stream().map(converter::apply).collect(Collectors.toList());
 	}
 
 	/*

src/main/java/org/springframework/data/domain/Page.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 the original author or authors.
+ * Copyright 2008-2017 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.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.domain;
 
+import java.util.function.Function;
+
 import org.springframework.core.convert.converter.Converter;
 
 /**
@@ -47,5 +49,5 @@ public interface Page<T> extends Slice<T> {
 	 * @return a new {@link Page} with the content of the current one mapped by the given {@link Converter}.
 	 * @since 1.10
 	 */
-	<U> Page<U> map(Converter<? super T, ? extends U> converter);
+	<U> Page<U> map(Function<? super T, ? extends U> converter);
 }

src/main/java/org/springframework/data/domain/PageImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 the original author or authors.
+ * Copyright 2008-2017 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.
@@ -17,8 +17,7 @@ package org.springframework.data.domain;
 
 import java.util.List;
 import java.util.Optional;
-
-import org.springframework.core.convert.converter.Converter;
+import java.util.function.Function;
 
 /**
  * Basic {@code Page} implementation.
@@ -106,7 +105,7 @@ public class PageImpl<T> extends Chunk<T> implements Page<T> {
 	 * @see org.springframework.data.domain.Slice#transform(org.springframework.core.convert.converter.Converter)
 	 */
 	@Override
-	public <U> Page<U> map(Converter<? super T, ? extends U> converter) {
+	public <U> Page<U> map(Function<? super T, ? extends U> converter) {
 		return new PageImpl<>(getConvertedContent(converter), pageable, total);
 	}
 

src/main/java/org/springframework/data/domain/Slice.java

@@ -16,6 +16,7 @@
 package org.springframework.data.domain;
 
 import java.util.List;
+import java.util.function.Function;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.util.Streamable;
@@ -124,5 +125,5 @@ public interface Slice<T> extends Streamable<T> {
 	 * @return a new {@link Slice} with the content of the current one mapped by the given {@link Converter}.
 	 * @since 1.10
 	 */
-	<U> Slice<U> map(Converter<? super T, ? extends U> converter);
+	<U> Slice<U> map(Function<? super T, ? extends U> converter);
 }

src/main/java/org/springframework/data/domain/SliceImpl.java

@@ -16,8 +16,7 @@
 package org.springframework.data.domain;
 
 import java.util.List;
-
-import org.springframework.core.convert.converter.Converter;
+import java.util.function.Function;
 
 /**
  * Default implementation of {@link Slice}.
@@ -70,7 +69,7 @@ public class SliceImpl<T> extends Chunk<T> {
 	 * @see org.springframework.data.domain.Slice#transform(org.springframework.core.convert.converter.Converter)
 	 */
 	@Override
-	public <U> Slice<U> map(Converter<? super T, ? extends U> converter) {
+	public <U> Slice<U> map(Function<? super T, ? extends U> converter) {
 		return new SliceImpl<>(getConvertedContent(converter), pageable, hasNext);
 	}
 

src/main/java/org/springframework/data/repository/query/ResultProcessor.java

@@ -134,7 +134,7 @@ public class ResultProcessor {
 		ChainingConverter converter = ChainingConverter.of(type.getReturnedType(), preparingConverter).and(this.converter);
 
 		if (source instanceof Slice && method.isPageQuery() || method.isSliceQuery()) {
-			return (T) ((Slice<?>) source).map(converter);
+			return (T) ((Slice<?>) source).map(converter::convert);
 		}
 
 		if (source instanceof Collection && method.isCollectionQuery()) {

src/main/java/org/springframework/data/repository/query/parser/PartTree.java

@@ -177,7 +177,7 @@ public class PartTree implements Streamable<OrPart> {
 	 * @return the iterable {@link Part}s
 	 */
 	public Streamable<Part> getParts() {
-		return Streamable.of(this.stream().flatMap(OrPart::stream).collect(Collectors.toList()));
+		return flatMap(OrPart::stream);
 	}
 
 	/**
@@ -187,10 +187,7 @@ public class PartTree implements Streamable<OrPart> {
 	 * @return
 	 */
 	public Streamable<Part> getParts(Type type) {
-
-		return Streamable.of(getParts().stream()//
-				.filter(part -> part.getType().equals(type))//
-				.collect(Collectors.toList()));
+		return getParts().filter(part -> part.getType().equals(type));
 	}
 
 	/*

src/main/java/org/springframework/data/util/LazyStreamable.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017 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.data.util;
+
+import lombok.Value;
+
+import java.util.Iterator;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+/**
+ * Lazy implementation of {@link Streamable} obtains a {@link Stream} from a given {@link Supplier}.
+ * 
+ * @author Oliver Gierke
+ * @since 2.0
+ */
+@Value(staticConstructor = "of")
+class LazyStreamable<T> implements Streamable<T> {
+
+	private final Supplier<? extends Stream<T>> stream;
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
+	@Override
+	public Iterator<T> iterator() {
+		return stream().iterator();
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.util.Streamable#stream()
+	 */
+	@Override
+	public Stream<T> stream() {
+		return stream.get();
+	}
+}

src/main/java/org/springframework/data/util/Streamable.java

@@ -17,6 +17,9 @@ package org.springframework.data.util;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -28,17 +31,9 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
+@FunctionalInterface
 public interface Streamable<T> extends Iterable<T> {
 
-	/**
-	 * Creates a non-parallel {@link Stream} of the underlying {@link Iterable}.
-	 * 
-	 * @return will never be {@literal null}.
-	 */
-	default Stream<T> stream() {
-		return StreamSupport.stream(spliterator(), false);
-	}
-
 	/**
 	 * Returns an empty {@link Streamable}.
 	 * 
@@ -71,4 +66,59 @@ public interface Streamable<T> extends Iterable<T> {
 
 		return iterable::iterator;
 	}
+
+	static <T> Streamable<T> of(Supplier<? extends Stream<T>> supplier) {
+		return LazyStreamable.of(supplier);
+	}
+
+	/**
+	 * Creates a non-parallel {@link Stream} of the underlying {@link Iterable}.
+	 * 
+	 * @return will never be {@literal null}.
+	 */
+	default Stream<T> stream() {
+		return StreamSupport.stream(spliterator(), false);
+	}
+
+	/**
+	 * Returns a new {@link Streamable} that will apply the given {@link Function} to the current one.
+	 * 
+	 * @param mapper must not be {@literal null}.
+	 * @return
+	 * @see Stream#map(Function)
+	 */
+	default <R> Streamable<R> map(Function<? super T, ? extends R> mapper) {
+
+		Assert.notNull(mapper, "Mapping function must not be null!");
+
+		return Streamable.of(() -> stream().map(mapper));
+	}
+
+	/**
+	 * Returns a new {@link Streamable} that will apply the given {@link Function} to the current one.
+	 * 
+	 * @param mapper must not be {@literal null}.
+	 * @return
+	 * @see Stream#flatMap(Function)
+	 */
+	default <R> Streamable<R> flatMap(Function<? super T, ? extends Stream<? extends R>> mapper) {
+
+		Assert.notNull(mapper, "Mapping function must not be null!");
+
+		return Streamable.of(() -> stream().flatMap(mapper));
+	}
+
+	/**
+	 * Returns a new {@link Streamable} that will apply the given filter {@link Predicate} to the current one.
+	 * 
+	 * @param predicate must not be {@literal null}.
+	 * @return
+	 * @see Stream#filter(Predicate)
+	 */
+	default Streamable<T> filter(Predicate<? super T> predicate) {
+
+		Assert.notNull(predicate, "Filter predicate must not be null!");
+
+		return Streamable.of(() -> stream().filter(predicate));
+	}
 }