Update Streams.

Author: gk-brown

build.gradle

@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'
-    version = '5.3.4'
+    version = '5.3.5'
 
     repositories {
         mavenCentral()

kilo-client/src/main/java/org/httprpc/kilo/sql/ResultSetAdapter.java

@@ -131,7 +131,12 @@ public void close() throws SQLException {
      *
      * @return
      * A stream over the results.
+     *
+     * @deprecated
+     * Use {@link org.httprpc.kilo.util.stream.Streams#streamOf(Iterable)}
+     * instead.
      */
+    @Deprecated
     public Stream<Map<String, Object>> stream() {
         return StreamSupport.stream(spliterator(), false).onClose(() -> {
             try {

kilo-client/src/main/java/org/httprpc/kilo/util/stream/Streams.java

@@ -16,7 +16,10 @@
 
 import org.httprpc.kilo.beans.BeanAdapter;
 
+import java.util.Collection;
 import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 /**
  * Provides static utility methods for working with streams.
@@ -40,4 +43,44 @@ private Streams() {
     public static <T> Function<Object, T> toType(Class<T> type) {
         return value -> BeanAdapter.coerce(value, type);
     }
+
+    /**
+     * Returns a stream over an iterable.
+     *
+     * @param <T>
+     * The element type.
+     *
+     * @param iterable
+     * The iterable instance.
+     *
+     * @return
+     * A stream over the iterable.
+     */
+    public static <T> Stream<T> streamOf(Iterable<T> iterable) {
+        if (iterable == null) {
+            throw new IllegalArgumentException();
+        }
+
+        return StreamSupport.stream(iterable.spliterator(), false);
+    }
+
+    /**
+     * Returns a stream over a collection.
+     *
+     * @param <T>
+     * The element type.
+     *
+     * @param collection
+     * The collection instance.
+     *
+     * @return
+     * A stream over the collection.
+     */
+    public static <T> Stream<T> streamOf(Collection<T> collection) {
+        if (collection == null) {
+            throw new IllegalArgumentException();
+        }
+
+        return collection.stream();
+    }
 }

kilo-client/src/test/java/org/httprpc/kilo/sql/ResultSetAdapterTest.java

@@ -75,7 +75,7 @@ private TemporalAccessorTest selectTemporalAccessorTest(int id) throws SQLExcept
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("id", id)
             ))) {
-            return results.stream().findFirst().map(toType(TemporalAccessorTest.class)).orElseThrow();
+            return streamOf(results).findFirst().map(toType(TemporalAccessorTest.class)).orElseThrow();
         }
     }
 
@@ -152,7 +152,7 @@ private JSONTest selectJSONTest(int id) throws SQLException {
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("id", id)
             ))) {
-            return results.stream().findFirst().map(toType(JSONTest.class)).orElseThrow();
+            return streamOf(results).findFirst().map(toType(JSONTest.class)).orElseThrow();
         }
     }
 
@@ -211,7 +211,7 @@ private XMLTest selectXMLTest(int id) throws SQLException {
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("id", id)
             ))) {
-            return results.stream().findFirst().map(toType(XMLTest.class)).orElseThrow();
+            return streamOf(results).findFirst().map(toType(XMLTest.class)).orElseThrow();
         }
     }
 

kilo-test/src/main/java/org/httprpc/kilo/test/CatalogService.java

@@ -40,7 +40,7 @@ public List<Item> getItems() throws SQLException {
 
         try (var statement = queryBuilder.prepare(getConnection());
             var results = queryBuilder.executeQuery(statement)) {
-            return results.stream().map(toType(Item.class)).toList();
+            return streamOf(results).map(toType(Item.class)).toList();
         }
     }
 
@@ -56,7 +56,7 @@ public ItemDetail getItem(
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("itemID", itemID)
             ))) {
-            return results.stream().findFirst().map(toType(ItemDetail.class)).orElse(null);
+            return streamOf(results).findFirst().map(toType(ItemDetail.class)).orElse(null);
         }
     }
 

kilo-test/src/main/java/org/httprpc/kilo/test/EmployeeService.java

@@ -58,7 +58,7 @@ public List<Employee> getEmployees() throws SQLException {
 
         try (var statement = queryBuilder.prepare(getConnection());
             var results = queryBuilder.executeQuery(statement)) {
-            return results.stream().map(toType(Employee.class)).toList();
+            return streamOf(results).map(toType(Employee.class)).toList();
         }
     }
 
@@ -74,7 +74,7 @@ public Iterable<Employee> getEmployeesStream() {
 
             try (var statement = queryBuilder.prepare(connection);
                 var results = queryBuilder.executeQuery(statement)) {
-                pipe.submit(results.stream().map(toType(Employee.class)));
+                pipe.submit(streamOf(results).map(toType(Employee.class)));
             } catch (SQLException exception) {
                 throw new RuntimeException(exception);
             }

kilo-test/src/main/java/org/httprpc/kilo/test/FilmService.java

@@ -53,7 +53,7 @@ public List<Film> getFilms(
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("match", map(match, value -> value.replace('*', '%')))
             ))) {
-            return results.stream().map(toType(Film.class)).toList();
+            return streamOf(results).map(toType(Film.class)).toList();
         }
     }
 
@@ -70,7 +70,7 @@ public FilmDetail getFilm(
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("filmID", filmID)
             ))) {
-            film = results.stream().findFirst().map(toType(FilmDetail.class)).orElseThrow();
+            film = streamOf(results).findFirst().map(toType(FilmDetail.class)).orElseThrow();
         }
 
         film.setActors(getActors(filmID));
@@ -89,7 +89,7 @@ private List<Actor> getActors(Integer filmID) throws SQLException {
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("filmID", filmID)
             ))) {
-            return results.stream().map(toType(Actor.class)).toList();
+            return streamOf(results).map(toType(Actor.class)).toList();
         }
     }
 
@@ -103,7 +103,7 @@ private List<Category> getCategories(Integer filmID) throws SQLException {
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("filmID", filmID)
             ))) {
-            return results.stream().map(toType(Category.class)).toList();
+            return streamOf(results).map(toType(Category.class)).toList();
         }
     }
 }

kilo-test/src/main/java/org/httprpc/kilo/test/PetService.java

@@ -43,7 +43,7 @@ public List<Pet> getPets(@Required String owner) throws SQLException {
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("owner", owner)
             ))) {
-            return results.stream().map(toType(Pet.class)).toList();
+            return streamOf(results).map(toType(Pet.class)).toList();
         }
     }