From 5fcf71e7692ac97f6a655946f5639cd8bef921f0 Mon Sep 17 00:00:00 2001
From: Greg Brown <gk_brown@icloud.com>
Date: Fri, 13 Sep 2024 17:16:22 -0400
Subject: [PATCH] Add support for URI arguments and deprecate support for URL
 arguments.

---
 README.md                                     |  66 +++++----
 .../org/httprpc/kilo/WebServiceProxy.java     | 130 +++++++++++-------
 .../org/httprpc/kilo/beans/BeanAdapter.java   |  38 ++---
 .../org/httprpc/kilo/io/TemplateEncoder.java  | 102 +++++++++++---
 .../httprpc/kilo/io/TemplateEncoderTest.java  |  90 ++++++------
 .../java/org/httprpc/kilo/IndexServlet.java   |   2 +-
 .../java/org/httprpc/kilo/WebService.java     |   2 +-
 .../org/httprpc/kilo/test/PetService.java     |   4 +-
 .../org/httprpc/kilo/test/AbstractTest.java   |  31 -----
 .../org/httprpc/kilo/test/BulkUploadTest.java |  11 +-
 .../org/httprpc/kilo/test/CatalogTest.java    |   7 +-
 .../httprpc/kilo/test/DocumentationTest.java  |   7 +-
 .../org/httprpc/kilo/test/EmployeesTest.java  |  15 +-
 .../java/org/httprpc/kilo/test/Examples.java  |  21 +--
 .../java/org/httprpc/kilo/test/FilmsTest.java |   7 +-
 .../java/org/httprpc/kilo/test/PetsTest.java  |  13 +-
 .../org/httprpc/kilo/test/TiingoTest.java     |  13 +-
 .../kilo/test/WebServiceProxyTest.java        | 103 +++++++-------
 .../httprpc/kilo/test/XMLTransformTest.java   |   2 +-
 .../kotlin/org/httprpc/kilo/test/UserTest.kt  |   5 +-
 20 files changed, 360 insertions(+), 309 deletions(-)
 delete mode 100644 kilo-test/src/test/java/org/httprpc/kilo/test/AbstractTest.java

diff --git a/README.md b/README.md
index be824f707..0e5b18423 100644
--- a/README.md
+++ b/README.md
@@ -76,9 +76,9 @@ public class MathService extends WebService {
 
 The `RequestMethod` annotation associates an HTTP verb such as `GET` or `POST` with a service method, or "handler". The optional `ResourcePath` annotation associates a handler with a specific path, or "endpoint", relative to the servlet. If unspecified, the handler is associated with the servlet itself. The optional `Description` annotation is used to document a service implementation and is discussed in more detail [later](#api-documentation).
 
-Arguments may be provided via the query string, resource path, or request body. They may also be submitted as [form data](https://www.w3.org/TR/2014/REC-html5-20141028/forms.html#attr-fs-enctype). `WebService` converts the values to the expected types, invokes the method, and writes the return value (if any) to the output stream as JSON.
+Arguments may be provided via the query string, resource path, or request body. `WebService` converts the values to the expected types, invokes the method, and writes the return value (if any) to the output stream as JSON.
 
-Multiple methods may be associated with the same verb and path. `WebService` selects the best method to execute based on the provided argument values. For example, this request would invoke the first method:
+Multiple methods may be associated with the same verb and path. `WebService` selects the best method to execute based on the provided values. For example, this request would invoke the first method:
 
 ```
 GET /math/sum?a=2&b=4
@@ -113,7 +113,6 @@ Method parameters may be any of the following types:
 * `java.time.Period`
 * `java.util.UUID`
 * `java.util.List`, `java.util.Set`, array/varargs
-* `java.net.URL`
 
 Additionally, `java.util.Map`, bean, and record types are supported for [body content](#body-content).
 
@@ -121,22 +120,17 @@ Unspecified values are automatically converted to `0`, `false`, or the null char
 
 `List`, `Set`, and array elements are automatically converted to their declared types. If no values are provided for a list, set, or array parameter, an empty value (not `null`) will be passed to the method.
 
-`URL` parameters represent file uploads. They may be used only with `POST` requests submitted using the multi-part form data encoding. See the [file upload](https://github.com/HTTP-RPC/Kilo/blob/master/kilo-test/src/main/java/org/httprpc/kilo/test/FileUploadService.java) example for more information.
-
 If a provided value cannot be coerced to the expected type, an HTTP 403 (forbidden) response will be returned. If no method is found that matches the provided arguments, HTTP 405 (method not allowed) will be returned.
 
 Note that service classes must be compiled with the `-parameters` flag so that parameter names are available at runtime.
 
 #### Required Parameters
-Parameters that must be provided by the caller can be indicated by the `Required` annotation. For example, the following service method accepts a single required `file` argument:
+Parameters that must be provided by the caller can be indicated by the `Required` annotation. For example, the following service method accepts a single required `owner` argument:
 
 ```java
-@RequestMethod("POST")
-@Description("Uploads a single file.")
-public long uploadFile(
-    @Description("The file to upload.") @Required URL file
-) throws IOException {
-    ...
+@RequestMethod("GET")
+public List<Pet> getPets(@Required String owner) throws SQLException { 
+    ... 
 }
 ```
 
@@ -346,15 +340,13 @@ A JSON version of the generated documentation can be obtained by specifying an "
 The `WebServiceProxy` class is used to submit API requests to a server. It provides the following two constructors:
 
 ```java
-public WebServiceProxy(String method, URL url) { ... }
-public WebServiceProxy(String method, URL baseURL, String path, Object... arguments) throws MalformedURLException { ... }
+public WebServiceProxy(String method, URI uri) { ... }
+public WebServiceProxy(String method, URI baseURI, String path, Object... arguments) throws MalformedURLException { ... }
 ```
 
-The first version accepts a string representing the HTTP method to execute and the URL of the requested resource. The second accepts the HTTP method, a base URL, and a relative path (as a format string, to which the optional trailing arguments are applied).
-
-Request arguments are specified via a map passed to the `setArguments()` method. Argument values for `GET`, `PUT`, and `DELETE` requests are always sent in the query string. `POST` arguments are typically sent in the request body, and may be submitted as either "application/x-www-form-urlencoded" or "multipart/form-data" (specified via the proxy's `setEncoding()` method).
+The first version accepts a string representing the HTTP method to execute and the URI of the requested resource. The second accepts the HTTP method, a base URI, and a relative path (as a format string, to which the optional trailing arguments are applied).
 
-Any value may be used as an argument and will generally be encoded using its string representation. However, `Date` instances are automatically converted to a long value representing epoch time in milliseconds. Additionally, `Collection` or array instances represent multi-value parameters and behave similarly to `<select multiple>` tags in HTML forms. When using the multi-part encoding, instances of `URL` represent file uploads and behave similarly to `<input type="file">` tags in HTML.
+Query arguments are specified via a map passed to the `setArguments()` method. Any value may be used as an argument and will generally be encoded using its string representation. However, `Date` instances are first converted to a long value representing epoch time in milliseconds. Additionally, `Collection` or array instances represent multi-value parameters and behave similarly to `<select multiple>` tags in HTML forms.
 
 Body content can be provided via the `setBody()` method. By default, it will be serialized as JSON; however, the `setRequestHandler()` method can be used to facilitate arbitrary encodings:
 
@@ -381,7 +373,7 @@ public interface ResponseHandler<T> {
 }
 ```
 
-If a service returns an error response, the default error handler will throw a `WebServiceException` (a subclass of `IOException`). If the content type of the error response is "text/*", the deserialized response body will be provided in the exception message. 
+If a service returns an error response, the default error handler will throw a `WebServiceException` (a subclass of `IOException`). If the type of the error response is "text/plain", the deserialized response body will be provided in the exception message. 
 
 A custom error handler can be supplied via `setErrorHandler()`:
 
@@ -395,7 +387,7 @@ The following code demonstrates how `WebServiceProxy` might be used to access th
 
 ```java
 // GET /math/sum?a=2&b=4
-var webServiceProxy = new WebServiceProxy("GET", baseURL, "math/sum");
+var webServiceProxy = new WebServiceProxy("GET", baseURI, "math/sum");
 
 webServiceProxy.setArguments(mapOf(
     entry("a", 4),
@@ -407,7 +399,7 @@ System.out.println(webServiceProxy.invoke()); // 6.0
 
 ```java
 // GET /math/sum?values=1&values=2&values=3
-var webServiceProxy = new WebServiceProxy("GET", baseURL, "math/sum");
+var webServiceProxy = new WebServiceProxy("GET", baseURI, "math/sum");
 
 webServiceProxy.setArguments(mapOf(
     entry("values", listOf(1, 2, 3))
@@ -422,11 +414,11 @@ System.out.println(webServiceProxy.invoke()); // 6.0
 `WebServiceProxy` additionally provides the following methods to facilitate convenient, type-safe access to web APIs:
 
 ```java
-public static <T> T of(Class<T> type, URL baseURL) { ... }
-public static <T> T of(Class<T> type, URL baseURL, Consumer<WebServiceProxy> initializer) { ... }
+public static <T> T of(Class<T> type, URI baseURI) { ... }
+public static <T> T of(Class<T> type, URI baseURI, Consumer<WebServiceProxy> initializer) { ... }
 ```
 
-Both versions return an implementation of a given interface that submits requests to the provided URL. An optional initializer accepted by the second version will be called prior to each service invocation; for example, to apply common request headers.
+Both versions return an implementation of a given interface that submits requests to the provided URI. An optional initializer accepted by the second version will be called prior to each service invocation; for example, to apply common request headers.
 
 The `RequestMethod` and `ResourcePath` annotations are used as described [earlier](#webservice) for `WebService`. The optional `ServicePath` annotation can be used to associate a base path with a proxy type. Proxy methods must include a throws clause that declares `IOException`, so that callers can handle unexpected failures. For example:
 
@@ -448,7 +440,7 @@ public interface MathServiceProxy {
 ```
 
 ```java
-var mathServiceProxy = WebServiceProxy.of(MathServiceProxy.class, baseURL);
+var mathServiceProxy = WebServiceProxy.of(MathServiceProxy.class, baseURI);
 
 System.out.println(mathServiceProxy.getSum(4, 2)); // 6.0
 System.out.println(mathServiceProxy.getSum(listOf(1.0, 2.0, 3.0))); // 6.0
@@ -458,14 +450,6 @@ System.out.println(mathServiceProxy.getAverage(listOf(1.0, 2.0, 3.0, 4.0, 5.0)))
 
 The [`Name`](#custom-parameter-names) and [`Required`](#required-parameters) annotations may also be applied to proxy method parameters. Path variables and body content are handled as described for `WebService`. 
 
-The `FormData` annotation can be used to submit `POST` requests using the URL or multi-part encoding. For example:
-
-```java
-@RequestMethod("POST")
-@FormData(multipart = true)
-long uploadFile(@Required URL file) throws IOException;
-```
-
 Note that proxy types must be compiled with the `-parameters` flag so their method parameter names are available at runtime.
 
 ## JSONEncoder and JSONDecoder
@@ -605,12 +589,24 @@ System.out.println(text); // Hello, World!
 ## TemplateEncoder
 The `TemplateEncoder` class transforms an object hierarchy into an output format using a [template document](template-reference.md). Template syntax is based loosely on the [Mustache](https://mustache.github.io) specification and supports most Mustache features. 
 
-`TemplateEncoder` provides the following constructor, which accepts the location of a template document (typically as a resource on the application's classpath):
+`TemplateEncoder` provides two constructors that accept the location of a template document as a `URI`:
 
 ```java
-public TemplateEncoder(URL url) { ... }
+public TemplateEncoder(URI uri) { ... }
+public TemplateEncoder(URI uri, ContentType contentType) { ... }
 ```
 
+The optional `contentType` argument is used to apply an appropriate escape modifier, when applicable.
+
+The following constructors are also provided:
+
+```java
+public TemplateEncoder(Class<?> type, String name) { ... }
+public TemplateEncoder(Class<?> type, String name, ContentType contentType) { ... }
+```
+
+These determine the location of the template document via the provided type and resource name.
+
 Templates are applied via one of the following methods:
 
 ```java
diff --git a/kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java b/kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java
index edb1336da..9e3f7767c 100644
--- a/kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java
+++ b/kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java
@@ -191,11 +191,11 @@ public void close() throws IOException {
     }
 
     private static class TypedInvocationHandler implements InvocationHandler {
-        URL baseURL;
+        URI baseURI;
         Consumer<WebServiceProxy> initializer;
 
-        TypedInvocationHandler(URL baseURL, Consumer<WebServiceProxy> initializer) {
-            this.baseURL = baseURL;
+        TypedInvocationHandler(URI baseURI, Consumer<WebServiceProxy> initializer) {
+            this.baseURI = baseURI;
             this.initializer = initializer;
         }
 
@@ -259,15 +259,13 @@ public Object invoke(Object proxy, Method method, Object[] arguments) throws Thr
                     }
                 }
 
-                var url = baseURL.toURI().resolve(pathBuilder.toString()).toURL();
-
-                var webServiceProxy = new WebServiceProxy(requestMethod.value().toUpperCase(), url);
+                var webServiceProxy = new WebServiceProxy(requestMethod.value(), baseURI.resolve(pathBuilder.toString()));
 
                 if (initializer != null) {
                     initializer.accept(webServiceProxy);
                 }
 
-                var empty = switch (webServiceProxy.getMethod()) {
+                var empty = switch (webServiceProxy.method) {
                     case "POST", "PUT" -> {
                         var formData = method.getAnnotation(FormData.class);
 
@@ -328,7 +326,7 @@ public Object invoke(Object proxy, Method method, Object[] arguments) throws Thr
     }
 
     private String method;
-    private URL url;
+    private URI uri;
 
     private Encoding encoding = null;
 
@@ -365,22 +363,38 @@ public Object invoke(Object proxy, Method method, Object[] arguments) throws Thr
         throw new WebServiceException(message, statusCode);
     };
 
+    /**
+     * @deprecated Use {@link #WebServiceProxy(String, URI)} instead.
+     */
+    @Deprecated
+    public WebServiceProxy(String method, URL url) {
+        this(method, toURI(url));
+    }
+
     /**
      * Constructs a new web service proxy.
      *
      * @param method
      * The HTTP method.
      *
-     * @param url
-     * The resource URL.
+     * @param uri
+     * The resource URI.
      */
-    public WebServiceProxy(String method, URL url) {
-        if (method == null || url == null) {
+    public WebServiceProxy(String method, URI uri) {
+        if (method == null || uri == null) {
             throw new IllegalArgumentException();
         }
 
         this.method = method.toUpperCase();
-        this.url = url;
+        this.uri = uri;
+    }
+
+    /**
+     * @deprecated Use {@link #WebServiceProxy(String, URI, String, Object...)} instead.
+     */
+    @Deprecated
+    public WebServiceProxy(String method, URL baseURL, String path, Object... arguments) {
+        this(method, toURI(baseURL), path, arguments);
     }
 
     /**
@@ -389,46 +403,49 @@ public WebServiceProxy(String method, URL url) {
      * @param method
      * The HTTP method.
      *
-     * @param baseURL
-     * The base URL.
+     * @param baseURI
+     * The base URI.
      *
      * @param path
      * The path to the resource, relative to the base URL.
      *
      * @param arguments
      * Path format specifier arguments.
-     *
-     * @throws MalformedURLException
-     * If a URL cannot be constructed from the base URL and path.
      */
-    public WebServiceProxy(String method, URL baseURL, String path, Object... arguments) throws MalformedURLException {
-        this(method, baseURL);
+    public WebServiceProxy(String method, URI baseURI, String path, Object... arguments) {
+        this(method, baseURI.resolve(String.format(path, arguments)));
+    }
+
+    private static URI toURI(URL url) {
+        if (url == null) {
+            throw new IllegalArgumentException();
+        }
 
         try {
-            url = url.toURI().resolve(String.format(path, arguments)).toURL();
+            return url.toURI();
         } catch (URISyntaxException exception) {
-            throw new MalformedURLException(exception.getMessage());
+            throw new IllegalArgumentException(exception);
         }
     }
 
     /**
-     * Returns the HTTP method.
-     *
-     * @return
-     * The HTTP method.
+     * @deprecated This method will be removed in a future release.
      */
+    @Deprecated
     public String getMethod() {
         return method;
     }
 
     /**
-     * Returns the resource URL.
-     *
-     * @return
-     * The resource URL.
+     * @deprecated This method will be removed in a future release.
      */
+    @Deprecated
     public URL getURL() {
-        return url;
+        try {
+            return uri.toURL();
+        } catch (MalformedURLException exception) {
+            throw new IllegalStateException(exception);
+        }
     }
 
     /**
@@ -700,7 +717,7 @@ public <T> T invoke(ResponseHandler<T> responseHandler) throws IOException {
             throw new IllegalArgumentException();
         }
 
-        var url = this.url;
+        var uri = this.uri;
 
         RequestHandler requestHandler;
         if (method.equals("POST") && encoding != null) {
@@ -729,14 +746,11 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
             var query = encodeQuery();
 
             if (!query.isEmpty()) {
-                URI uri;
                 try {
-                    uri = new URI(String.format("%s?%s", url, query));
+                    uri = new URI(String.format("%s?%s", uri, query));
                 } catch (URISyntaxException exception) {
                     throw new MalformedURLException(exception.getMessage());
                 }
-
-                url = uri.toURL();
             }
 
             if (body != null) {
@@ -763,11 +777,11 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
         }
 
         if (monitorStream != null) {
-            monitorStream.println(String.format("%s %s", method, url));
+            monitorStream.println(String.format("%s %s", method, uri));
         }
 
         // Open URL connection
-        var connection = (HttpURLConnection)url.openConnection();
+        var connection = (HttpURLConnection)uri.toURL().openConnection();
 
         connection.setRequestMethod(method);
 
@@ -1002,6 +1016,14 @@ public int getStatusCode() {
         return statusCode;
     }
 
+    /**
+     * @deprecated Use {@link #of(Class, URI)} instead.
+     */
+    @Deprecated
+    public static <T> T of(Class<T> type, URL baseURL) {
+        return of(type, toURI(baseURL));
+    }
+
     /**
      * Creates a typed proxy for web service invocation.
      *
@@ -1011,14 +1033,22 @@ public int getStatusCode() {
      * @param type
      * The proxy type.
      *
-     * @param baseURL
-     * The base URL.
+     * @param baseURI
+     * The base URI.
      *
      * @return
      * The typed service proxy.
      */
-    public static <T> T of(Class<T> type, URL baseURL) {
-        return of(type, baseURL, null);
+    public static <T> T of(Class<T> type, URI baseURI) {
+        return of(type, baseURI, null);
+    }
+
+    /**
+     * @deprecated Use {@link #of(Class, URI, Consumer)} instead.
+     */
+    @Deprecated
+    public static <T> T of(Class<T> type, URL baseURL, Consumer<WebServiceProxy> initializer) {
+        return of(type, toURI(baseURL), initializer);
     }
 
     /**
@@ -1030,8 +1060,8 @@ public static <T> T of(Class<T> type, URL baseURL) {
      * @param type
      * The proxy type.
      *
-     * @param baseURL
-     * The base URL.
+     * @param baseURI
+     * The base URI.
      *
      * @param initializer
      * An initializer that will be called prior to each service invocation, or
@@ -1040,8 +1070,8 @@ public static <T> T of(Class<T> type, URL baseURL) {
      * @return
      * The typed web service proxy.
      */
-    public static <T> T of(Class<T> type, URL baseURL, Consumer<WebServiceProxy> initializer) {
-        if (type == null || baseURL == null) {
+    public static <T> T of(Class<T> type, URI baseURI, Consumer<WebServiceProxy> initializer) {
+        if (type == null || baseURI == null) {
             throw new IllegalArgumentException();
         }
 
@@ -1052,13 +1082,9 @@ public static <T> T of(Class<T> type, URL baseURL, Consumer<WebServiceProxy> ini
         var servicePath = type.getAnnotation(ServicePath.class);
 
         if (servicePath != null) {
-            try {
-                baseURL = baseURL.toURI().resolve(String.format("%s/", servicePath.value())).toURL();
-            } catch (URISyntaxException | MalformedURLException exception) {
-                throw new UnsupportedOperationException(exception);
-            }
+            baseURI = baseURI.resolve(String.format("%s/", servicePath.value()));
         }
 
-        return type.cast(Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, new TypedInvocationHandler(baseURL, initializer)));
+        return type.cast(Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, new TypedInvocationHandler(baseURI, initializer)));
     }
 }
diff --git a/kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java b/kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java
index ce66a7e36..876dd8f6d 100644
--- a/kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java
+++ b/kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java
@@ -232,14 +232,14 @@ public Object setValue(Object value) {
 
     // Record adapter
     private static class RecordAdapter extends AbstractMap<String, Object> {
-        Object object;
+        Object value;
 
         Map<String, Property> properties;
 
-        RecordAdapter(Object object) {
-            this.object = object;
+        RecordAdapter(Object value) {
+            this.value = value;
 
-            properties = getProperties(object.getClass());
+            properties = getProperties(value.getClass());
         }
 
         @Override
@@ -251,7 +251,7 @@ public Object get(Object key) {
             }
 
             try {
-                return adapt(property.accessor.invoke(object));
+                return adapt(property.accessor.invoke(value));
             } catch (IllegalAccessException | InvocationTargetException exception) {
                 throw new RuntimeException(exception);
             }
@@ -284,7 +284,7 @@ public Entry<String, Object> next() {
                             try {
                                 var property = entry.getValue();
 
-                                return new SimpleImmutableEntry<>(key, adapt(property.accessor.invoke(object)));
+                                return new SimpleImmutableEntry<>(key, adapt(property.accessor.invoke(value)));
                             } catch (IllegalAccessException | InvocationTargetException exception) {
                                 throw new RuntimeException(exception);
                             }
@@ -441,7 +441,7 @@ public Type getOwnerType() {
         }
     }
 
-    private Object object;
+    private Object bean;
 
     private Map<String, Property> properties;
 
@@ -455,17 +455,17 @@ public Type getOwnerType() {
     /**
      * Constructs a new bean adapter.
      *
-     * @param object
+     * @param bean
      * The bean instance.
      */
-    public BeanAdapter(Object object) {
-        if (object == null) {
+    public BeanAdapter(Object bean) {
+        if (bean == null) {
             throw new IllegalArgumentException();
         }
 
-        this.object = object;
+        this.bean = bean;
 
-        var type = object.getClass();
+        var type = bean.getClass();
 
         if (Proxy.class.isAssignableFrom(type)) {
             var interfaces = type.getInterfaces();
@@ -498,7 +498,7 @@ public Object get(Object key) {
 
         Object value;
         try {
-            value = property.accessor.invoke(object);
+            value = property.accessor.invoke(bean);
         } catch (IllegalAccessException | InvocationTargetException exception) {
             throw new RuntimeException(exception);
         }
@@ -531,7 +531,7 @@ public Object put(String key, Object value) {
         }
 
         try {
-            property.mutator.invoke(object, toGenericType(value, property.mutator.getGenericParameterTypes()[0]));
+            property.mutator.invoke(bean, toGenericType(value, property.mutator.getGenericParameterTypes()[0]));
         } catch (IllegalAccessException | InvocationTargetException exception) {
             throw new RuntimeException(exception);
         }
@@ -570,7 +570,7 @@ public Entry<String, Object> next() {
                         try {
                             var property = entry.getValue();
 
-                            var value = property.accessor.invoke(object);
+                            var value = property.accessor.invoke(bean);
 
                             if (property.accessor.getAnnotation(Required.class) != null && value == null) {
                                 throw new UnsupportedOperationException("Required value is not defined.");
@@ -1076,9 +1076,9 @@ private static Object toBean(Map<?, ?> map, Class<?> type) {
                 throw new RuntimeException(exception);
             }
 
-            Object object;
+            Object bean;
             try {
-                object = constructor.newInstance();
+                bean = constructor.newInstance();
             } catch (InstantiationException | IllegalAccessException | InvocationTargetException exception) {
                 throw new RuntimeException(exception);
             }
@@ -1097,13 +1097,13 @@ private static Object toBean(Map<?, ?> map, Class<?> type) {
                 }
 
                 try {
-                    property.mutator.invoke(object, toGenericType(value, property.mutator.getGenericParameterTypes()[0]));
+                    property.mutator.invoke(bean, toGenericType(value, property.mutator.getGenericParameterTypes()[0]));
                 } catch (IllegalAccessException | InvocationTargetException exception) {
                     throw new RuntimeException(exception);
                 }
             }
 
-            return object;
+            return bean;
         }
     }
 
diff --git a/kilo-client/src/main/java/org/httprpc/kilo/io/TemplateEncoder.java b/kilo-client/src/main/java/org/httprpc/kilo/io/TemplateEncoder.java
index 9dedaf717..8a00e14de 100644
--- a/kilo-client/src/main/java/org/httprpc/kilo/io/TemplateEncoder.java
+++ b/kilo-client/src/main/java/org/httprpc/kilo/io/TemplateEncoder.java
@@ -346,7 +346,7 @@ public Set<Entry<Object, Object>> entrySet() {
         }
     }
 
-    private URL url;
+    private URI uri;
     private Modifier contentTypeModifier;
 
     private ResourceBundle resourceBundle = null;
@@ -366,31 +366,78 @@ public Set<Entry<Object, Object>> entrySet() {
     private static final String KEY_REFERENCE = "~";
     private static final String SELF_REFERENCE = ".";
 
+    /**
+     * @deprecated Use {@link #TemplateEncoder(URI)} or
+     * {@link #TemplateEncoder(Class, String)} instead.
+     */
+    @Deprecated
+    public TemplateEncoder(URL url) {
+        this(toURI(url));
+    }
+
     /**
      * Constructs a new template encoder.
      *
-     * @param url
-     * The URL of the template.
+     * @param type
+     * The type used to resolve the template resource.
+     *
+     * @param name
+     * The name of the template resource.
      */
-    public TemplateEncoder(URL url) {
-        this(url, ContentType.MARKUP);
+    public TemplateEncoder(Class<?> type, String name) {
+        this(toURI(type, name));
+    }
+
+    /**
+     * Constructs a new template encoder.
+     *
+     * @param uri
+     * The URI of the template.
+     */
+    public TemplateEncoder(URI uri) {
+        this(uri, ContentType.MARKUP);
+    }
+
+    /**
+     * @deprecated Use {@link #TemplateEncoder(URI, ContentType)} or
+     * {@link #TemplateEncoder(Class, String, ContentType)} instead.
+     */
+    @Deprecated
+    public TemplateEncoder(URL url, ContentType contentType) {
+        this(toURI(url), contentType);
     }
 
     /**
      * Constructs a new template encoder.
      *
-     * @param url
-     * The URL of the template.
+     * @param type
+     * The type used to resolve the template resource.
+     *
+     * @param name
+     * The name of the template resource.
      *
      * @param contentType
-     * The content type.
+     * The template's content type.
      */
-    public TemplateEncoder(URL url, ContentType contentType) {
-        if (url == null || contentType == null) {
+    public TemplateEncoder(Class<?> type, String name, ContentType contentType) {
+        this(toURI(type, name), contentType);
+    }
+
+    /**
+     * Constructs a new template encoder.
+     *
+     * @param uri
+     * The URI of the template.
+     *
+     * @param contentType
+     * The template's content type.
+     */
+    public TemplateEncoder(URI uri, ContentType contentType) {
+        if (uri == null || contentType == null) {
             throw new IllegalArgumentException();
         }
 
-        this.url = url;
+        this.uri = uri;
 
         contentTypeModifier = switch (contentType) {
             case MARKUP -> new MarkupModifier();
@@ -400,6 +447,30 @@ public TemplateEncoder(URL url, ContentType contentType) {
         };
     }
 
+    private static URI toURI(URL url) {
+        if (url == null) {
+            throw new IllegalArgumentException();
+        }
+
+        try {
+            return url.toURI();
+        } catch (URISyntaxException exception) {
+            throw new IllegalArgumentException(exception);
+        }
+    }
+
+    private static URI toURI(Class<?> type, String resourceName) {
+        if (type == null || resourceName == null) {
+            throw new IllegalArgumentException();
+        }
+
+        try {
+            return type.getResource(resourceName).toURI();
+        } catch (URISyntaxException exception) {
+            throw new IllegalArgumentException(exception);
+        }
+    }
+
     /**
      * Returns the resource bundle.
      *
@@ -540,7 +611,7 @@ public void write(Object value, Writer writer, Locale locale, TimeZone timeZone)
         }
 
         if (value != null) {
-            try (var inputStream = url.openStream()) {
+            try (var inputStream = uri.toURL().openStream()) {
                 Reader reader = new PagedReader(new InputStreamReader(inputStream, getCharset()));
 
                 writer = new BufferedWriter(writer);
@@ -791,12 +862,7 @@ private void write(Object root, Writer writer, Locale locale, TimeZone timeZone,
                         }
                         case INCLUDE -> {
                             if (root != null) {
-                                URI uri;
-                                try {
-                                    uri = url.toURI();
-                                } catch (URISyntaxException exception) {
-                                    throw new IllegalStateException(exception);
-                                }
+                                var uri = this.uri;
 
                                 var jar = uri.getScheme().equals(JAR_SCHEME);
 
diff --git a/kilo-client/src/test/java/org/httprpc/kilo/io/TemplateEncoderTest.java b/kilo-client/src/test/java/org/httprpc/kilo/io/TemplateEncoderTest.java
index c5a7cb947..17dd4f0e3 100644
--- a/kilo-client/src/test/java/org/httprpc/kilo/io/TemplateEncoderTest.java
+++ b/kilo-client/src/test/java/org/httprpc/kilo/io/TemplateEncoderTest.java
@@ -34,7 +34,7 @@
 public class TemplateEncoderTest {
     @Test
     public void testNull() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("dictionary.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "dictionary.txt");
 
         var writer = new StringWriter();
 
@@ -45,7 +45,7 @@ public void testNull() throws IOException {
 
     @Test
     public void testMap() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("dictionary.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "dictionary.txt");
 
         var a = "abc";
         var b = 123;
@@ -66,7 +66,7 @@ public void testMap() throws IOException {
 
     @Test
     public void testPath() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("path.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "path.txt");
 
         var dictionary = mapOf(
             entry("a", mapOf(
@@ -86,7 +86,7 @@ public void testPath() throws IOException {
 
     @Test
     public void testConditionalSection1() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -97,7 +97,7 @@ public void testConditionalSection1() throws IOException {
 
     @Test
     public void testConditionalSection2a() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -108,7 +108,7 @@ public void testConditionalSection2a() throws IOException {
 
     @Test
     public void testConditionalSection2b() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -119,7 +119,7 @@ public void testConditionalSection2b() throws IOException {
 
     @Test
     public void testConditionalSection3a() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -130,7 +130,7 @@ public void testConditionalSection3a() throws IOException {
 
     @Test
     public void testConditionalSection3b() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -141,7 +141,7 @@ public void testConditionalSection3b() throws IOException {
 
     @Test
     public void testConditionalSection4a() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -152,7 +152,7 @@ public void testConditionalSection4a() throws IOException {
 
     @Test
     public void testConditionalSection4b() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -163,7 +163,7 @@ public void testConditionalSection4b() throws IOException {
 
     @Test
     public void testConditionalSection5() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "conditional.txt");
 
         var writer = new StringWriter();
 
@@ -174,7 +174,7 @@ public void testConditionalSection5() throws IOException {
 
     @Test
     public void testEmptyRepeatingSection() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating1.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating1.txt");
 
         var writer = new StringWriter();
 
@@ -185,7 +185,7 @@ public void testEmptyRepeatingSection() throws IOException {
 
     @Test
     public void testSingleElementRepeatingSection() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating1.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating1.txt");
 
         var a = "hello";
         var b = 1L;
@@ -205,7 +205,7 @@ public void testSingleElementRepeatingSection() throws IOException {
 
     @Test
     public void testMultiElementRepeatingSection() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating1.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating1.txt");
 
         var a1 = "hello";
         var b1 = 1L;
@@ -234,7 +234,7 @@ public void testMultiElementRepeatingSection() throws IOException {
 
     @Test
     public void testNestedRepeatingSection1() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating2.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating2.txt");
 
         var dictionary = mapOf(
             entry("abc", "ABC"),
@@ -257,7 +257,7 @@ public void testNestedRepeatingSection1() throws IOException {
 
     @Test
     public void testNestedRepeatingSection2() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating3.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating3.txt");
 
         var value = listOf(listOf(listOf(mapOf(entry("a", "hello")))));
 
@@ -270,7 +270,7 @@ public void testNestedRepeatingSection2() throws IOException {
 
     @Test
     public void testNestedEmptyRepeatingSection() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating3.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating3.txt");
 
         var writer = new StringWriter();
 
@@ -281,7 +281,7 @@ public void testNestedEmptyRepeatingSection() throws IOException {
 
     @Test
     public void testPrimitiveRepeatingSection() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating4.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating4.txt");
 
         var value = listOf("hello", 42, false);
 
@@ -294,7 +294,7 @@ public void testPrimitiveRepeatingSection() throws IOException {
 
     @Test
     public void testRepeatingSectionSeparator() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating5.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating5.txt");
 
         var value = listOf("a", "b", "c");
 
@@ -307,7 +307,7 @@ public void testRepeatingSectionSeparator() throws IOException {
 
     @Test
     public void testMapRepeatingSection1() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating6.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating6.txt");
 
         var value = mapOf(
             entry("entries", mapOf(
@@ -326,7 +326,7 @@ public void testMapRepeatingSection1() throws IOException {
 
     @Test
     public void testMapRepeatingSection2() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("repeating7.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "repeating7.txt");
 
         var value = mapOf(
             entry("entries", mapOf(
@@ -345,7 +345,7 @@ public void testMapRepeatingSection2() throws IOException {
 
     @Test
     public void testInvertedSection1() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -356,7 +356,7 @@ public void testInvertedSection1() throws IOException {
 
     @Test
     public void testInvertedSection2a() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -367,7 +367,7 @@ public void testInvertedSection2a() throws IOException {
 
     @Test
     public void testInvertedSection2b() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -378,7 +378,7 @@ public void testInvertedSection2b() throws IOException {
 
     @Test
     public void testInvertedSection3a() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -389,7 +389,7 @@ public void testInvertedSection3a() throws IOException {
 
     @Test
     public void testInvertedSection3b() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -400,7 +400,7 @@ public void testInvertedSection3b() throws IOException {
 
     @Test
     public void testInvertedSection4a() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -411,7 +411,7 @@ public void testInvertedSection4a() throws IOException {
 
     @Test
     public void testInvertedSection4b() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inverted.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inverted.txt");
 
         var writer = new StringWriter();
 
@@ -422,7 +422,7 @@ public void testInvertedSection4b() throws IOException {
 
     @Test
     public void testResources() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("resource1.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "resource1.txt");
 
         templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".resource"));
 
@@ -435,7 +435,7 @@ public void testResources() throws IOException {
 
     @Test
     public void testInheritance() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("inheritance.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "inheritance.txt");
 
         var dictionary = mapOf(
             entry("a", "$"),
@@ -464,7 +464,7 @@ public void testInheritance() throws IOException {
 
     @Test
     public void testComment() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("comment.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "comment.txt");
 
         var writer = new StringWriter();
 
@@ -475,7 +475,7 @@ public void testComment() throws IOException {
 
     @Test
     public void testFloatFormatModifier() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("format1.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "format1.txt");
 
         var writer = new StringWriter();
 
@@ -486,7 +486,7 @@ public void testFloatFormatModifier() throws IOException {
 
     @Test
     public void testDateFormatModifiers() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("format2.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "format2.txt");
 
         var date = new Date();
         var instant = date.toInstant();
@@ -529,7 +529,7 @@ public void testDateFormatModifiers() throws IOException {
 
     @Test
     public void testDefaultContentType() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("xml.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "xml.txt");
 
         templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".test"));
 
@@ -544,7 +544,7 @@ public void testDefaultContentType() throws IOException {
 
     @Test
     public void testJSONContentType() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("json.txt"), TemplateEncoder.ContentType.JSON);
+        var templateEncoder = new TemplateEncoder(getClass(), "json.txt", TemplateEncoder.ContentType.JSON);
 
         templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".test"));
 
@@ -561,7 +561,7 @@ public void testJSONContentType() throws IOException {
 
     @Test
     public void testCSVContentType() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("csv.txt"), TemplateEncoder.ContentType.CSV);
+        var templateEncoder = new TemplateEncoder(getClass(), "csv.txt", TemplateEncoder.ContentType.CSV);
 
         templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".test"));
 
@@ -581,7 +581,7 @@ public void testCSVContentType() throws IOException {
 
     @Test
     public void testUnspecifiedContentType() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("unspecified.txt"), TemplateEncoder.ContentType.UNSPECIFIED);
+        var templateEncoder = new TemplateEncoder(getClass(), "unspecified.txt", TemplateEncoder.ContentType.UNSPECIFIED);
 
         templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".test"));
 
@@ -594,7 +594,7 @@ public void testUnspecifiedContentType() throws IOException {
 
     @Test
     public void testSimpleInclude() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("master1.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "master1.txt");
 
         var writer = new StringWriter();
 
@@ -605,7 +605,7 @@ public void testSimpleInclude() throws IOException {
 
     @Test
     public void testSectionInclude() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("master2.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "master2.txt");
 
         var writer = new StringWriter();
 
@@ -616,7 +616,7 @@ public void testSectionInclude() throws IOException {
 
     @Test
     public void testRecursion() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("recursion.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "recursion.txt");
 
         var list = listOf(
             listOf(
@@ -639,7 +639,7 @@ public void testRecursion() throws IOException {
 
     @Test
     public void testEmptyRecursion() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("recursion.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "recursion.txt");
 
         var list = listOf();
 
@@ -652,7 +652,7 @@ public void testEmptyRecursion() throws IOException {
 
     @Test
     public void testInvalidPath1() {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("invalid-path.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "invalid-path.txt");
 
         var root = mapOf(
             entry("a", "xyz")
@@ -663,7 +663,7 @@ public void testInvalidPath1() {
 
     @Test
     public void testInvalidPath2() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("invalid-path.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "invalid-path.txt");
 
         var root = mapOf(
             entry("a", null)
@@ -678,7 +678,7 @@ public void testInvalidPath2() throws IOException {
 
     @Test
     public void testUppercaseModifier() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("upper.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "upper.txt");
 
         templateEncoder.bind("upper", (value, argument, locale, timeZone) -> value.toString().toUpperCase(locale));
 
@@ -691,7 +691,7 @@ public void testUppercaseModifier() throws IOException {
 
     @Test
     public void testInvalidModifier() {
-        var templateEncoder = new TemplateEncoder(getClass().getResource("invalid-modifier.txt"));
+        var templateEncoder = new TemplateEncoder(getClass(), "invalid-modifier.txt");
 
         var root = mapOf(
             entry("a", "xyz")
diff --git a/kilo-server/src/main/java/org/httprpc/kilo/IndexServlet.java b/kilo-server/src/main/java/org/httprpc/kilo/IndexServlet.java
index ed1ec05aa..8299f8110 100644
--- a/kilo-server/src/main/java/org/httprpc/kilo/IndexServlet.java
+++ b/kilo-server/src/main/java/org/httprpc/kilo/IndexServlet.java
@@ -51,7 +51,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         } else {
             response.setContentType("text/html;charset=UTF-8");
 
-            var templateEncoder = new TemplateEncoder(IndexServlet.class.getResource("index.html"));
+            var templateEncoder = new TemplateEncoder(IndexServlet.class, "index.html");
 
             templateEncoder.setResourceBundle(ResourceBundle.getBundle(IndexServlet.class.getName(), request.getLocale()));
 
diff --git a/kilo-server/src/main/java/org/httprpc/kilo/WebService.java b/kilo-server/src/main/java/org/httprpc/kilo/WebService.java
index 837ba46d9..e5dec6db5 100644
--- a/kilo-server/src/main/java/org/httprpc/kilo/WebService.java
+++ b/kilo-server/src/main/java/org/httprpc/kilo/WebService.java
@@ -832,7 +832,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
                 } else {
                     response.setContentType(String.format("%s;charset=%s", TEXT_HTML, UTF_8));
 
-                    var templateEncoder = new TemplateEncoder(WebService.class.getResource("api.html"));
+                    var templateEncoder = new TemplateEncoder(WebService.class, "api.html");
 
                     templateEncoder.setResourceBundle(ResourceBundle.getBundle(WebService.class.getName(), request.getLocale()));
 
diff --git a/kilo-test/src/main/java/org/httprpc/kilo/test/PetService.java b/kilo-test/src/main/java/org/httprpc/kilo/test/PetService.java
index 4fa8ad27c..f5e579899 100644
--- a/kilo-test/src/main/java/org/httprpc/kilo/test/PetService.java
+++ b/kilo-test/src/main/java/org/httprpc/kilo/test/PetService.java
@@ -83,7 +83,7 @@ public void getPetsStream(@Required String owner) throws SQLException, IOExcepti
             } else if (accept.equalsIgnoreCase(TEXT_HTML)) {
                 response.setContentType(TEXT_HTML);
 
-                var templateEncoder = new TemplateEncoder(getClass().getResource("pets.html"));
+                var templateEncoder = new TemplateEncoder(getClass(), "pets.html");
 
                 templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getName(), getRequest().getLocale()));
 
@@ -91,7 +91,7 @@ public void getPetsStream(@Required String owner) throws SQLException, IOExcepti
             } else if (accept.equalsIgnoreCase(TEXT_XML)) {
                 response.setContentType(TEXT_XML);
 
-                var templateEncoder = new TemplateEncoder(getClass().getResource("pets.xml"));
+                var templateEncoder = new TemplateEncoder(getClass(), "pets.xml");
 
                 templateEncoder.write(results, response.getOutputStream());
             } else {
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/AbstractTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/AbstractTest.java
deleted file mode 100644
index f6f248684..000000000
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/AbstractTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.httprpc.kilo.test;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-
-public abstract class AbstractTest {
-    protected URL baseURL;
-
-    protected AbstractTest() {
-        try {
-            baseURL = URI.create("http://localhost:8080/kilo-test/").toURL();
-        } catch (MalformedURLException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
-}
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/BulkUploadTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/BulkUploadTest.java
index b7c99baca..f80beb17c 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/BulkUploadTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/BulkUploadTest.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
-import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -63,19 +62,19 @@ public Map<String, Object> next() {
     }
 
     public static void main(String[] args) throws IOException {
-        var baseURL = URI.create("http://localhost:8080/kilo-test/bulk-upload/").toURL();
+        var baseURI = URI.create("http://localhost:8080/kilo-test/bulk-upload/");
 
         var t0 = System.currentTimeMillis();
 
-        logTiming(baseURL, "upload", 25000, t0);
+        logTiming(baseURI, "upload", 25000, t0);
 
         var t1 = System.currentTimeMillis();
 
-        logTiming(baseURL, "upload-batch", 500000, t1);
+        logTiming(baseURI, "upload-batch", 500000, t1);
     }
 
-    private static void logTiming(URL baseURL, String path, int count, long start) throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, path);
+    private static void logTiming(URI baseURI, String path, int count, long start) throws IOException {
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, path);
 
         webServiceProxy.setRequestHandler(new WebServiceProxy.RequestHandler() {
             @Override
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/CatalogTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/CatalogTest.java
index 37dfd5695..294d38c5c 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/CatalogTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/CatalogTest.java
@@ -19,14 +19,17 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.URI;
 
 import static org.httprpc.kilo.util.Collections.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class CatalogTest extends AbstractTest {
+public class CatalogTest {
+    private static final URI baseURI = URI.create("http://localhost:8080/kilo-test/");
+
     @Test
     public void testCatalog() throws IOException {
-        var catalogServiceProxy = WebServiceProxy.of(CatalogServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var catalogServiceProxy = WebServiceProxy.of(CatalogServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var item = BeanAdapter.coerce(mapOf(), ItemDetail.class);
 
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/DocumentationTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/DocumentationTest.java
index f6ca87568..814af32a7 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/DocumentationTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/DocumentationTest.java
@@ -19,12 +19,15 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.Map;
 
 import static org.httprpc.kilo.util.Collections.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class DocumentationTest extends AbstractTest {
+public class DocumentationTest {
+    private static final URI baseURI = URI.create("http://localhost:8080/kilo-test/");
+
     @Test
     public void testDocumentation() throws IOException {
         testDocumentation("math");
@@ -40,7 +43,7 @@ private void testDocumentation(String name) throws IOException {
             expected = (Map<?, ?>)jsonDecoder.read(inputStream);
         }
 
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, name);
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, name);
 
         webServiceProxy.setHeaders(mapOf(
             entry("Accept", "application/json")
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/EmployeesTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/EmployeesTest.java
index 1fb536e1d..81d35f2e8 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/EmployeesTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/EmployeesTest.java
@@ -18,21 +18,20 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
 import java.util.List;
 
 public class EmployeesTest {
     public static void main(String[] args) throws IOException {
-        var baseURL = URI.create("http://localhost:8080/kilo-test/").toURL();
+        var baseURI = URI.create("http://localhost:8080/kilo-test/");
 
-        logTiming(baseURL, "employees");
-        logTiming(baseURL, "employees/stream");
-        logTiming(baseURL, "employees/hibernate");
-        logTiming(baseURL, "employees/hibernate-stream");
+        logTiming(baseURI, "employees");
+        logTiming(baseURI, "employees/stream");
+        logTiming(baseURI, "employees/hibernate");
+        logTiming(baseURI, "employees/hibernate-stream");
     }
 
-    private static void logTiming(URL baseURL, String path) throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, path);
+    private static void logTiming(URI baseURI, String path) throws IOException {
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, path);
 
         var t0 = System.currentTimeMillis();
 
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/Examples.java b/kilo-test/src/test/java/org/httprpc/kilo/test/Examples.java
index a5d2037f1..c1443944f 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/Examples.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/Examples.java
@@ -37,9 +37,7 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
@@ -50,14 +48,7 @@ public interface Example {
         void execute() throws Exception;
     }
 
-    private static final URL baseURL;
-    static {
-        try {
-            baseURL = URI.create("http://localhost:8080/kilo-test/").toURL();
-        } catch (MalformedURLException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
+    private static final URI baseURI = URI.create("http://localhost:8080/kilo-test/");
 
     public static void main(String[] args) {
         execute("Math Service 1", Examples::mathService1);
@@ -91,7 +82,7 @@ private static void execute(String label, Example example) {
 
     public static void mathService1() throws IOException {
         // GET /math/sum?a=2&b=4
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "math/sum");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "math/sum");
 
         webServiceProxy.setArguments(mapOf(
             entry("a", 4),
@@ -103,7 +94,7 @@ public static void mathService1() throws IOException {
 
     public static void mathService2() throws IOException {
         // GET /math/sum?values=1&values=2&values=3
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "math/sum");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "math/sum");
 
         webServiceProxy.setArguments(mapOf(
             entry("values", listOf(1, 2, 3))
@@ -113,7 +104,7 @@ public static void mathService2() throws IOException {
     }
 
     public static void mathService3() throws IOException {
-        var mathServiceProxy = WebServiceProxy.of(MathServiceProxy.class, baseURL);
+        var mathServiceProxy = WebServiceProxy.of(MathServiceProxy.class, baseURI);
 
         System.out.println(mathServiceProxy.getSum(4, 2)); // 6.0
         System.out.println(mathServiceProxy.getSum(listOf(1.0, 2.0, 3.0))); // 6.0
@@ -204,14 +195,14 @@ public static void textEncoderAndDecoder() throws IOException {
         }
     }
 
-    public static void templateEncoder() throws IOException {
+    public static void templateEncoder() throws Exception {
         var map = mapOf(
             entry("a", "hello"),
             entry("b", 123),
             entry("c", true)
         );
 
-        var templateEncoder = new TemplateEncoder(Examples.class.getResource("example.html"));
+        var templateEncoder = new TemplateEncoder(Examples.class.getResource("example.html").toURI());
 
         templateEncoder.write(map, System.out);
     }
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/FilmsTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/FilmsTest.java
index e20d6be65..174bf6327 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/FilmsTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/FilmsTest.java
@@ -18,13 +18,16 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.URI;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class FilmsTest extends AbstractTest {
+public class FilmsTest {
+    private static final URI baseURI = URI.create("http://localhost:8080/kilo-test/");
+
     @Test
     public void testFilms() throws IOException {
-        var filmServiceProxy = WebServiceProxy.of(FilmServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var filmServiceProxy = WebServiceProxy.of(FilmServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var films = filmServiceProxy.getFilms("n*");
 
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/PetsTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/PetsTest.java
index b226c0e9a..aac368364 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/PetsTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/PetsTest.java
@@ -21,12 +21,15 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.List;
 
 import static org.httprpc.kilo.util.Collections.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class PetsTest extends AbstractTest {
+public class PetsTest {
+    private static final URI baseURI = URI.create("http://localhost:8080/kilo-test/");
+
     @Test
     public void testPets() throws IOException {
         testPetsJSON();
@@ -45,7 +48,7 @@ private void testPetsJSON() throws IOException {
             expected = (List<?>)jsonDecoder.read(inputStream);
         }
 
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "pets");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "pets");
 
         webServiceProxy.setArguments(mapOf(
             entry("owner", "Gwen")
@@ -66,7 +69,7 @@ private void testPetsStreamJSON() throws IOException {
             expected = (List<?>)jsonDecoder.read(inputStream);
         }
 
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "pets/stream");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "pets/stream");
 
         webServiceProxy.setHeaders(mapOf(
             entry("Accept", "application/json")
@@ -91,7 +94,7 @@ private void testPetsStreamCSV() throws IOException {
             expected = csvDecoder.read(inputStream);
         }
 
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "pets/stream");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "pets/stream");
 
         webServiceProxy.setHeaders(mapOf(
             entry("Accept", "text/csv")
@@ -129,7 +132,7 @@ private void testPetsStreamMarkup(String name, String mimeType) throws IOExcepti
             expected = textDecoder.read(inputStream);
         }
 
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "pets/stream");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "pets/stream");
 
         webServiceProxy.setHeaders(mapOf(
             entry("Accept", mimeType)
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/TiingoTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/TiingoTest.java
index 7ed2cb602..3fb38dde3 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/TiingoTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/TiingoTest.java
@@ -17,22 +17,13 @@
 import org.httprpc.kilo.WebServiceProxy;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 import java.time.LocalDate;
 
 import static org.httprpc.kilo.util.Collections.*;
 
 public class TiingoTest {
-    private static final URL baseURL;
-    static {
-        try {
-            baseURL = URI.create("https://api.tiingo.com").toURL();
-        } catch (MalformedURLException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
+    private static final URI baseURI = URI.create("https://api.tiingo.com");
 
     public static void main(String[] args) throws IOException {
         var token = System.getProperty("token");
@@ -50,7 +41,7 @@ public static void main(String[] args) throws IOException {
         var ticker = args[0];
 
         // Create service proxy
-        var tiingoServiceProxy = WebServiceProxy.of(TiingoServiceProxy.class, baseURL, webServiceProxy -> {
+        var tiingoServiceProxy = WebServiceProxy.of(TiingoServiceProxy.class, baseURI, webServiceProxy -> {
             webServiceProxy.setHeaders(mapOf(
                 entry("Authorization", String.format("Token %s", token))
             ));
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java
index ce135b1a5..c9022906f 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.SocketTimeoutException;
+import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.DayOfWeek;
@@ -41,7 +42,7 @@
 import static org.httprpc.kilo.util.Collections.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class WebServiceProxyTest extends AbstractTest {
+public class WebServiceProxyTest {
     public static class CustomException extends IOException {
         public CustomException(String message) {
             super(message);
@@ -60,9 +61,11 @@ public CustomException(String message) {
 
     private static final int EOF = -1;
 
+    private static final URI baseURI = URI.create("http://localhost:8080/kilo-test/");
+
     @Test
     public void testGet() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("string", "héllo&gøod+bye?"),
@@ -111,7 +114,7 @@ public void testGet() throws IOException {
 
     @Test
     public void testGetProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var result = testServiceProxy.testGet("héllo&gøod+bye?", listOf("a", "b", "c"), 123, setOf(1, 2, 3), 'a');
 
@@ -124,7 +127,7 @@ public void testGetProxy() throws IOException {
 
     @Test
     public void testKeys() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/a/%d/b/%s/c/%d/d/%s",
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/a/%d/b/%s/c/%d/d/%s",
             123,
             URLEncoder.encode("héllo", StandardCharsets.UTF_8),
             456,
@@ -145,7 +148,7 @@ public void testKeys() throws IOException {
 
     @Test
     public void testKeysProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL);
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
         var result = testServiceProxy.testKeys(123, "héllo", 456,"göodbye");
 
@@ -159,7 +162,7 @@ public void testKeysProxy() throws IOException {
 
     @Test
     public void testParameters() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/foo/%d/bar/%d", 1, 2);
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/foo/%d/bar/%d", 1, 2);
 
         webServiceProxy.setArguments(mapOf(
             entry("a", 3),
@@ -183,7 +186,7 @@ public void testParameters() throws IOException {
 
     @Test
     public void testParametersProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL);
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
         var result = testServiceProxy.testParameters(1, 2, 3, 4, listOf(5.0, 6.0, 7.0));
 
@@ -198,7 +201,7 @@ public void testParametersProxy() throws IOException {
 
     @Test
     public void testVarargs() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/varargs");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/varargs");
 
         webServiceProxy.setArguments(mapOf(
             entry("numbers", listOf(1, 2, 3))
@@ -218,7 +221,7 @@ public void testVarargs() throws IOException {
 
     @Test
     public void testVarargsProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var result = testServiceProxy.testVarargs(new int[] {1, 2, 3}, "abc", "def", "ghi");
 
@@ -230,7 +233,7 @@ public void testVarargsProxy() throws IOException {
 
     @Test
     public void testGetFibonacci() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/fibonacci");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/fibonacci");
 
         webServiceProxy.setArguments(mapOf(
             entry("count", 8)
@@ -245,7 +248,7 @@ public void testGetFibonacci() throws IOException {
 
     @Test
     public void testPost() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("string", "héllo&gøod+bye?"),
@@ -295,7 +298,7 @@ public void testPost() throws IOException {
 
     @Test
     public void testURLEncodedPost() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test");
 
         webServiceProxy.setEncoding(WebServiceProxy.Encoding.APPLICATION_X_WWW_FORM_URLENCODED);
 
@@ -343,7 +346,7 @@ public void testURLEncodedPost() throws IOException {
 
     @Test
     public void testURLEncodedPostProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var result = testServiceProxy.testURLEncodedPost("héllo&gøod+bye?", listOf("a", "b", "c"), 123, setOf(1, 2, 3));
 
@@ -360,7 +363,7 @@ public void testMultipartPost() throws IOException {
         var textTestURL = getClass().getResource("test.txt");
         var imageTestURL = getClass().getResource("test.jpg");
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test");
 
         webServiceProxy.setEncoding(WebServiceProxy.Encoding.MULTIPART_FORM_DATA);
 
@@ -415,7 +418,7 @@ public void testMultipartPostProxy() throws IOException {
         var textTestURL = getClass().getResource("test.txt");
         var imageTestURL = getClass().getResource("test.jpg");
 
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var result = testServiceProxy.testMultipartPost("héllo&gøod+bye?", listOf("a", "b", "c"), 123, setOf(1, 2, 3), textTestURL, imageTestURL);
 
@@ -434,7 +437,7 @@ public void testMultipartPostProxy() throws IOException {
     public void testListPost() throws IOException {
         var body = listOf(1, 2, 3);
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/list");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/list");
 
         webServiceProxy.setBody(body);
 
@@ -447,7 +450,7 @@ public void testListPost() throws IOException {
 
     @Test
     public void testUnsupportedListPost() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/list");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/list");
 
         webServiceProxy.setArguments(mapOf(
             entry("list", listOf(1, 2, 3))
@@ -464,7 +467,7 @@ public void testUnsupportedListPost() throws IOException {
 
     @Test
     public void testInvalidListPost() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/list");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/list");
 
         webServiceProxy.setBody("xyz");
 
@@ -477,7 +480,7 @@ public void testInvalidListPost() throws IOException {
 
     @Test
     public void testMalformedListPost() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/list");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/list");
 
         webServiceProxy.setRequestHandler(new WebServiceProxy.RequestHandler() {
             @Override
@@ -508,7 +511,7 @@ public void testMapPost() throws IOException {
             entry("c", 3.0)
         );
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/map");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/map");
 
         webServiceProxy.setBody(body);
 
@@ -529,7 +532,7 @@ public void testBodyPost() throws IOException {
             entry("flag", true)
         );
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/body");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/body");
 
         webServiceProxy.setBody(request);
 
@@ -551,7 +554,7 @@ public void testCoordinatesPost() throws IOException {
             entry("y", 2)
         );
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/coordinates");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/coordinates");
 
         webServiceProxy.setBody(request);
 
@@ -567,7 +570,7 @@ public void testCoordinatesPost() throws IOException {
     public void testImagePost() throws IOException {
         var imageTestURL = getClass().getResource("test.jpg");
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/image");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/image");
 
         webServiceProxy.setRequestHandler(new WebServiceProxy.RequestHandler() {
             @Override
@@ -595,7 +598,7 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
     public void testPut() throws IOException {
         var textTestURL = getClass().getResource("test.txt");
 
-        var webServiceProxy = new WebServiceProxy("PUT", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("PUT", baseURI, "test");
 
         webServiceProxy.setRequestHandler(new WebServiceProxy.RequestHandler() {
             @Override
@@ -627,7 +630,7 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
 
     @Test
     public void testEmptyPut() throws IOException {
-        var webServiceProxy = new WebServiceProxy("PUT", baseURL, "test/%d", 101);
+        var webServiceProxy = new WebServiceProxy("PUT", baseURI, "test/%d", 101);
 
         var result = webServiceProxy.invoke();
 
@@ -636,7 +639,7 @@ public void testEmptyPut() throws IOException {
 
     @Test
     public void testEmptyPutProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL);
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
         var result = testServiceProxy.testEmptyPut(101);
 
@@ -647,7 +650,7 @@ public void testEmptyPutProxy() throws IOException {
     public void testDelete() throws IOException {
         var id = 101;
 
-        var webServiceProxy = new WebServiceProxy("DELETE", baseURL, "test/%d", id);
+        var webServiceProxy = new WebServiceProxy("DELETE", baseURI, "test/%d", id);
 
         webServiceProxy.setMonitorStream(System.out);
 
@@ -658,7 +661,7 @@ public void testDelete() throws IOException {
 
     @Test
     public void testHeaders() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/headers");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/headers");
 
         webServiceProxy.setHeaders(mapOf(
             entry("X-Header-A", "abc"),
@@ -677,7 +680,7 @@ public void testHeaders() throws IOException {
 
     @Test
     public void testHeadersProxy() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL, webServiceProxy -> {
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI, webServiceProxy -> {
             webServiceProxy.setHeaders(mapOf(
                 entry("X-Header-A", "abc"),
                 entry("X-Header-B", 123)
@@ -696,7 +699,7 @@ public void testHeadersProxy() throws IOException {
 
     @Test
     public void testException() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/error");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/error");
 
         webServiceProxy.setMonitorStream(System.out);
 
@@ -708,7 +711,7 @@ public void testException() throws IOException {
 
     @Test
     public void testInvalidNumberArgument() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("string", "abc"),
@@ -724,7 +727,7 @@ public void testInvalidNumberArgument() throws IOException {
 
     @Test
     public void testInvalidDayOfWeekArgument() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("string", "abc"),
@@ -740,7 +743,7 @@ public void testInvalidDayOfWeekArgument() throws IOException {
 
     @Test
     public void testInvalidLocalDateArgument() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("string", "abc"),
@@ -756,7 +759,7 @@ public void testInvalidLocalDateArgument() throws IOException {
 
     @Test
     public void testMissingRequiredParameter() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("string", null)
@@ -772,28 +775,28 @@ public void testMissingRequiredParameter() throws IOException {
 
     @Test
     public void testMissingRequiredParameterProxy() {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL);
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
         assertThrows(IllegalArgumentException.class, () -> testServiceProxy.testGet(null, null, null, null, '\0'));
     }
 
     @Test
     public void testMissingProxyException() {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL);
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
         assertThrows(UnsupportedOperationException.class, testServiceProxy::testMissingException);
     }
 
     @Test
     public void testInvalidProxyException() {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL);
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
         assertThrows(UnsupportedOperationException.class, testServiceProxy::testInvalidException);
     }
 
     @Test
     public void testMissingRequiredProperty() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "test/body");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "test/body");
 
         webServiceProxy.setBody(mapOf());
 
@@ -807,7 +810,7 @@ public void testMissingRequiredProperty() throws IOException {
 
     @Test
     public void testTimeout() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test");
 
         webServiceProxy.setArguments(mapOf(
             entry("value", 123),
@@ -824,7 +827,7 @@ public void testTimeout() throws IOException {
 
     @Test
     public void testCustomException() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/error");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/error");
 
         webServiceProxy.setErrorHandler((errorStream, contentType, statusCode) -> {
             var textDecoder = new TextDecoder();
@@ -839,7 +842,7 @@ public void testCustomException() throws IOException {
 
     @Test
     public void testMathDelegation1() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/math/sum");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/math/sum");
 
         webServiceProxy.setArguments(mapOf(
             entry("a", 4),
@@ -855,7 +858,7 @@ public void testMathDelegation1() throws IOException {
 
     @Test
     public void testMathDelegation2() throws IOException {
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, "test/math/sum");
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, "test/math/sum");
 
         webServiceProxy.setArguments(mapOf(
             entry("values", listOf(1, 2, 3))
@@ -870,7 +873,7 @@ public void testMathDelegation2() throws IOException {
 
     @Test
     public void testFileUpload1() throws IOException {
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "file-upload");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "file-upload");
 
         webServiceProxy.setEncoding(WebServiceProxy.Encoding.MULTIPART_FORM_DATA);
 
@@ -885,7 +888,7 @@ public void testFileUpload1() throws IOException {
 
     @Test
     public void testFileUpload1Proxy() throws IOException {
-        var fileUploadServiceProxy = WebServiceProxy.of(FileUploadServiceProxy.class, baseURL);
+        var fileUploadServiceProxy = WebServiceProxy.of(FileUploadServiceProxy.class, baseURI);
 
         var result = fileUploadServiceProxy.uploadFile(getClass().getResource("test.txt"));
 
@@ -897,7 +900,7 @@ public void testFileUpload2() throws IOException {
         var textTestURL = getClass().getResource("test.txt");
         var imageTestURL = getClass().getResource("test.jpg");
 
-        var webServiceProxy = new WebServiceProxy("POST", baseURL, "file-upload");
+        var webServiceProxy = new WebServiceProxy("POST", baseURI, "file-upload");
 
         webServiceProxy.setEncoding(WebServiceProxy.Encoding.MULTIPART_FORM_DATA);
 
@@ -915,7 +918,7 @@ public void testFileUpload2Proxy() throws IOException {
         var textTestURL = getClass().getResource("test.txt");
         var imageTestURL = getClass().getResource("test.jpg");
 
-        var fileUploadServiceProxy = WebServiceProxy.of(FileUploadServiceProxy.class, baseURL);
+        var fileUploadServiceProxy = WebServiceProxy.of(FileUploadServiceProxy.class, baseURI);
 
         var result = fileUploadServiceProxy.uploadFiles(listOf(textTestURL, imageTestURL));
 
@@ -924,7 +927,7 @@ public void testFileUpload2Proxy() throws IOException {
 
     @Test
     public void testMembersProxy() throws IOException {
-        var memberServiceProxy = WebServiceProxy.of(MemberServiceProxy.class, baseURL);
+        var memberServiceProxy = WebServiceProxy.of(MemberServiceProxy.class, baseURI);
 
         var members = memberServiceProxy.getMembers("foo", "bar");
 
@@ -938,9 +941,9 @@ public void testMembersProxy() throws IOException {
 
     @Test
     public void testGreeting() throws IOException {
-        var contextPath = baseURL.getPath();
+        var contextPath = baseURI.getPath();
 
-        var webServiceProxy = new WebServiceProxy("GET", baseURL, contextPath.substring(0, contextPath.length() - 1));
+        var webServiceProxy = new WebServiceProxy("GET", baseURI, contextPath.substring(0, contextPath.length() - 1));
 
         var result = webServiceProxy.invoke();
 
@@ -949,7 +952,7 @@ public void testGreeting() throws IOException {
 
     @Test
     public void testDefaultProxyMethod() throws IOException {
-        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURL, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
+        var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI, webServiceProxy -> webServiceProxy.setMonitorStream(System.out));
 
         var result = testServiceProxy.getFibonacciSum(8);
 
diff --git a/kilo-test/src/test/java/org/httprpc/kilo/test/XMLTransformTest.java b/kilo-test/src/test/java/org/httprpc/kilo/test/XMLTransformTest.java
index 0d3e20516..e88b33e6d 100644
--- a/kilo-test/src/test/java/org/httprpc/kilo/test/XMLTransformTest.java
+++ b/kilo-test/src/test/java/org/httprpc/kilo/test/XMLTransformTest.java
@@ -73,7 +73,7 @@ private void transformXML2() throws Exception {
             document = documentBuilder.parse(inputStream);
         }
 
-        var templateEncoder = new TemplateEncoder(getClass().getResource("breakfast-menu.html"));
+        var templateEncoder = new TemplateEncoder(getClass(), "breakfast-menu.html");
 
         var homeDirectory = new File(System.getProperty("user.home"));
         var outputFile = new File(homeDirectory, "breakfast-menu-2.html");
diff --git a/kilo-test/src/test/kotlin/org/httprpc/kilo/test/UserTest.kt b/kilo-test/src/test/kotlin/org/httprpc/kilo/test/UserTest.kt
index 93f1a9314..35b667192 100644
--- a/kilo-test/src/test/kotlin/org/httprpc/kilo/test/UserTest.kt
+++ b/kilo-test/src/test/kotlin/org/httprpc/kilo/test/UserTest.kt
@@ -18,12 +18,11 @@ import org.httprpc.kilo.WebServiceProxy
 import org.httprpc.kilo.beans.BeanAdapter
 import org.httprpc.kilo.io.JSONEncoder
 import java.net.URI
-import java.net.URL
 
-val baseURL: URL = URI.create("https://jsonplaceholder.typicode.com").toURL()
+val baseURI: URI = URI.create("https://jsonplaceholder.typicode.com")
 
 fun main() {
-    val userServiceProxy = WebServiceProxy.of(UserServiceProxy::class.java, baseURL)
+    val userServiceProxy = WebServiceProxy.of(UserServiceProxy::class.java, baseURI)
 
     val users = userServiceProxy.getUsers()