Update tests.

Author: gk-brown

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

@@ -19,10 +19,12 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.httprpc.kilo.PageServlet;
+import org.httprpc.kilo.Required;
 import org.httprpc.kilo.WebService;
+import org.httprpc.kilo.beans.BeanAdapter;
 import org.httprpc.kilo.io.CSVEncoder;
-import org.httprpc.kilo.io.TemplateEncoder;
 import org.httprpc.kilo.sql.QueryBuilder;
+import org.httprpc.kilo.util.concurrent.Pipe;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -32,14 +34,24 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ResourceBundle;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static org.httprpc.kilo.util.Collections.*;
+import static org.httprpc.kilo.util.Iterables.*;
 import static org.httprpc.kilo.util.Optionals.*;
 
 @WebServlet("/pets/stream")
 public class PetServlet extends PageServlet {
+    private interface Parameters {
+        @Required
+        String getOwner();
+    }
+
     private DataSource dataSource = null;
 
+    private static ExecutorService executorService = Executors.newCachedThreadPool();
+
     @Override
     public void init() throws ServletException {
         super.init();
@@ -60,50 +72,47 @@ protected Connection openConnection() throws SQLException {
     }
 
     @Override
-    protected void process(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        var accept = map(request.getHeader("Accept"), String::toLowerCase);
-
-        if (accept == null) {
-            return;
-        }
+    protected Object execute() {
+        var parameters = getParameters(Parameters.class);
 
-        var owner = request.getParameter("owner");
+        var owner = parameters.getOwner();
 
-        if (owner == null) {
-            return;
-        }
+        var pipe = new Pipe<Pet>();
 
-        var queryBuilder = QueryBuilder.select(Pet.class)
-            .filterByForeignKey(Owner.class, "owner")
-            .ordered(true);
+        var connection = getConnection();
 
-        try (var statement = queryBuilder.prepare(getConnection());
-            var results = queryBuilder.executeQuery(statement, mapOf(
-                entry("owner", owner)
-            ))) {
-            if (accept.startsWith(WebService.TEXT_HTML)) {
-                response.setContentType(WebService.TEXT_HTML);
+        executorService.submit(() -> {
+            var queryBuilder = QueryBuilder.select(Pet.class)
+                .filterByForeignKey(Owner.class, "owner")
+                .ordered(true);
 
-                var type = getClass();
+            try (var statement = queryBuilder.prepare(connection);
+                var results = queryBuilder.executeQuery(statement, mapOf(
+                    entry("owner", owner)
+                ))) {
+                pipe.submit(mapAll(results, BeanAdapter.toType(Pet.class)));
+            } catch (SQLException exception) {
+                throw new RuntimeException(exception);
+            }
+        });
 
-                var templateEncoder = new TemplateEncoder(type, String.format("%s.html", type.getSimpleName()));
+        return pipe;
+    }
 
-                templateEncoder.setResourceBundle(ResourceBundle.getBundle(type.getName(), request.getLocale()));
+    @Override
+    protected void encodeResult(HttpServletRequest request, HttpServletResponse response, Object result) throws IOException {
+        var accept = map(request.getHeader("Accept"), String::toLowerCase);
 
-                templateEncoder.write(results, response.getWriter());
-            } else if (accept.startsWith(WebService.TEXT_CSV)) {
-                response.setContentType(WebService.TEXT_CSV);
+        if (accept != null && accept.equals(WebService.TEXT_CSV)) {
+            response.setContentType(WebService.TEXT_CSV);
 
-                var csvEncoder = new CSVEncoder(listOf("name", "species", "sex", "birth", "death"));
+            var csvEncoder = new CSVEncoder(listOf("name", "species", "sex", "birth", "death"));
 
-                csvEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getName(), request.getLocale()));
+            csvEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getName(), request.getLocale()));
 
-                csvEncoder.write(results, response.getWriter());
-            } else {
-                response.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);
-            }
-        } catch (SQLException exception) {
-            throw new RuntimeException(exception);
+            csvEncoder.write((Iterable<?>)result, response.getWriter());
+        } else {
+            super.encodeResult(request, response, result);
         }
     }
 }