From 75c9ab0a63887109119187aab52e066dc2f87c06 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 4 Dec 2018 15:43:54 +0100 Subject: [PATCH] DATACMNS-1430 - Tweaked TypeDiscoverer to consider subtypes of Streamable collection like. --- .../java/org/springframework/data/util/TypeDiscoverer.java | 2 +- .../springframework/data/util/TypeDiscovererUnitTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java index 9b27306e8..cc8fa08dc 100644 --- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java +++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java @@ -360,7 +360,7 @@ class TypeDiscoverer implements TypeInformation { return rawType.isArray() // || Iterable.class.equals(rawType) // || Collection.class.isAssignableFrom(rawType) // - || Streamable.class.equals(rawType); + || Streamable.class.isAssignableFrom(rawType); } /* diff --git a/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java b/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java index 1feb998c4..cd3e67b61 100755 --- a/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java +++ b/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java @@ -160,12 +160,12 @@ public class TypeDiscovererUnitTests { }); } - @Test // DATACMNS-1342 + @Test // DATACMNS-1342, DATACMNS-1430 public void considersStreamableToBeCollectionLike() { TypeInformation type = from(SomeStreamable.class); - assertThat(type.isCollectionLike()).isFalse(); + assertThat(type.isCollectionLike()).isTrue(); assertThat(type.getRequiredProperty("streamable").isCollectionLike()).isTrue(); }