Update tests.

Author: gk-brown

kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java

@@ -58,6 +58,7 @@
 
 import static org.httprpc.kilo.util.Collections.*;
 import static org.httprpc.kilo.util.Optionals.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 
 /**
  * Client-side invocation proxy for web services.
@@ -902,7 +903,7 @@ private static List<Object> getParameterValues(Object argument) {
 
             return list;
         } else if (argument instanceof Collection<?> collection) {
-            return collection.stream().map(WebServiceProxy::getParameterValue).toList();
+            return streamOf(collection).map(WebServiceProxy::getParameterValue).toList();
         } else {
             return listOf(getParameterValue(argument));
         }

kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java

@@ -56,6 +56,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import static org.httprpc.kilo.util.Optionals.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 
 /**
  * Provides access to Java bean properties and record components via the
@@ -1177,7 +1178,7 @@ private static Map<String, Property> computeProperties(Class<?> type) {
 
             Method mutator;
             if (mutatorList != null) {
-                mutator = mutatorList.stream()
+                mutator = streamOf(mutatorList)
                     .filter(method -> method.getParameterTypes()[0] == propertyType)
                     .findFirst().orElse(null);
             } else {

kilo-client/src/test/java/org/httprpc/kilo/beans/BeanAdapterTest.java

@@ -40,6 +40,7 @@
 import java.util.stream.Collectors;
 
 import static org.httprpc.kilo.util.Collections.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanAdapterTest {
@@ -548,7 +549,7 @@ public void testRequired() {
     public void testGetProperties() {
         var properties = BeanAdapter.getProperties(TestBean.class);
 
-        var propertyTypes = properties.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getAccessor().getGenericReturnType()));
+        var propertyTypes = streamOf(properties.entrySet()).collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getAccessor().getGenericReturnType()));
 
         assertEquals(Integer.TYPE, propertyTypes.get("i"));
         assertEquals(Long.TYPE, propertyTypes.get("long"));

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

@@ -67,6 +67,7 @@ private int insertTemporalAccessorTest(LocalDate date, LocalTime time, Instant i
         return queryBuilder.getGeneratedKey(0, Integer.class);
     }
 
+    @SuppressWarnings("deprecation")
     private TemporalAccessorTest selectTemporalAccessorTest(int id) throws SQLException {
         var queryBuilder = QueryBuilder.select(TemporalAccessorTest.class).filterByPrimaryKey("id");
 
@@ -75,7 +76,7 @@ private TemporalAccessorTest selectTemporalAccessorTest(int id) throws SQLExcept
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("id", id)
             ))) {
-            return streamOf(results).findFirst().map(toType(TemporalAccessorTest.class)).orElseThrow();
+            return results.stream().findFirst().map(toType(TemporalAccessorTest.class)).orElseThrow();
         }
     }
 
@@ -145,14 +146,15 @@ private void updateJSONTest(int id, List<?> list, Map<String, ?> map, JSONTest.R
         }
     }
 
+    @SuppressWarnings("deprecation")
     private JSONTest selectJSONTest(int id) throws SQLException {
         var queryBuilder = QueryBuilder.select(JSONTest.class).filterByPrimaryKey("id");
 
         try (var statement = queryBuilder.prepare(getConnection());
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("id", id)
             ))) {
-            return streamOf(results).findFirst().map(toType(JSONTest.class)).orElseThrow();
+            return results.stream().findFirst().map(toType(JSONTest.class)).orElseThrow();
         }
     }
 
@@ -204,14 +206,15 @@ private void updateXMLTest(int id, Document document) throws SQLException {
         }
     }
 
+    @SuppressWarnings("deprecation")
     private XMLTest selectXMLTest(int id) throws SQLException {
         var queryBuilder = QueryBuilder.select(XMLTest.class).filterByPrimaryKey("id");
 
         try (var statement = queryBuilder.prepare(getConnection());
             var results = queryBuilder.executeQuery(statement, mapOf(
                 entry("id", id)
             ))) {
-            return streamOf(results).findFirst().map(toType(XMLTest.class)).orElseThrow();
+            return results.stream().findFirst().map(toType(XMLTest.class)).orElseThrow();
         }
     }
 

kilo-client/src/test/java/org/httprpc/kilo/util/concurrent/PipeTest.java

@@ -20,9 +20,9 @@
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.stream.StreamSupport;
 
 import static org.httprpc.kilo.util.Collections.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class PipeTest {
@@ -61,9 +61,9 @@ public void testUnboundedPipeWithTimeout() {
     private void testPipe(Pipe<Integer> pipe) {
         var expectedValues = listOf(0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89);
 
-        executorService.submit(() -> pipe.submit(expectedValues.stream()));
+        executorService.submit(() -> pipe.submit(streamOf(expectedValues)));
 
-        assertEquals(expectedValues, StreamSupport.stream(pipe.spliterator(), false).toList());
+        assertEquals(expectedValues, streamOf(pipe).toList());
     }
 
     @Test
@@ -83,7 +83,7 @@ public void testOfferTimeout() throws Exception {
 
         var future = executorService.submit(() -> {
             try {
-                pipe.submit(listOf("abc").stream());
+                pipe.submit(streamOf(listOf("abc")));
             } catch (TimeoutException exception) {
                 return true;
             }

kilo-client/src/test/java/org/httprpc/kilo/xml/ElementAdapterTest.java

@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import static org.httprpc.kilo.util.Collections.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ElementAdapterTest {
@@ -165,7 +166,7 @@ public void testMultipleElements() {
 
         var items = (List<Object>)elementAdapter.get("item*");
 
-        assertEquals(listOf("4", "5", "6"), items.stream().map(Object::toString).toList());
+        assertEquals(listOf("4", "5", "6"), streamOf(items).map(Object::toString).toList());
 
         elementAdapter.put("item*", listOf());
 

kilo-server/src/main/java/org/httprpc/kilo/WebService.java

@@ -71,6 +71,7 @@
 
 import static org.httprpc.kilo.util.Collections.*;
 import static org.httprpc.kilo.util.Optionals.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 
 /**
  * Abstract base class for web services.
@@ -810,7 +811,7 @@ public static synchronized <T extends WebService> T getInstance(Class<T> type) {
      * A list of active service descriptors.
      */
     public static synchronized List<ServiceDescriptor> getServiceDescriptors() {
-        return instances.values().stream()
+        return streamOf(instances.values())
             .map(WebService::getServiceDescriptor)
             .sorted(Comparator.comparing(WebService.ServiceDescriptor::getPath))
             .toList();

kilo-test/src/test/java/org/httprpc/kilo/test/CatalogTest.java

@@ -22,6 +22,7 @@
 import java.net.URI;
 
 import static org.httprpc.kilo.util.Collections.*;
+import static org.httprpc.kilo.util.stream.Streams.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class CatalogTest {
@@ -81,13 +82,13 @@ public void testCatalog() throws IOException {
         assertEquals("blue", item.getColor());
         assertEquals(10.0, item.getWeight());
 
-        assertNotNull(catalogServiceProxy.getItems().stream()
+        assertNotNull(streamOf(catalogServiceProxy.getItems())
             .filter(result -> result.getID().equals(itemID))
             .findAny().orElse(null));
 
         catalogServiceProxy.deleteItem(item.getID());
 
-        assertNull(catalogServiceProxy.getItems().stream()
+        assertNull(streamOf(catalogServiceProxy.getItems())
             .filter(result -> result.getID().equals(itemID))
             .findAny().orElse(null));
     }

kilo-test/src/test/java/org/httprpc/kilo/test/TestServiceProxy.java

@@ -35,6 +35,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.httprpc.kilo.util.stream.Streams.*;
+
 @ServicePath("test")
 public interface TestServiceProxy {
     interface FormData {
@@ -140,6 +142,6 @@ public void handleResponse(InputStream errorStream, String contentType, int stat
     List<Number> getFibonacciSequence(int count) throws IOException;
 
     default int getFibonacciSum(int count) throws IOException {
-        return getFibonacciSequence(count).stream().mapToInt(Number::intValue).sum();
+        return streamOf(getFibonacciSequence(count)).mapToInt(Number::intValue).sum();
     }
 }

kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java

@@ -257,7 +257,7 @@ public void testListPost() throws IOException {
 
         webServiceProxy.setBody(body);
 
-        var result = ((List<?>)webServiceProxy.invoke()).stream()
+        var result = streamOf((List<?>)webServiceProxy.invoke())
             .map(toType(Integer.class))
             .toList();