Update WebService.

Author: gk-brown

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

@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.util.Locale;
+import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.TreeMap;
 
@@ -32,15 +33,13 @@
  */
 @WebServlet(urlPatterns = {"", "*.html"}, loadOnStartup = Integer.MAX_VALUE)
 public class IndexServlet extends HttpServlet {
-    private TreeMap<String, WebService.ServiceDescriptor> serviceDescriptors = new TreeMap<>();
+    private Map<String, WebService.ServiceDescriptor> serviceDescriptors = new TreeMap<>();
 
     private static final String HTML_EXTENSION = ".html";
 
     @Override
     public void init() {
-        var instances = WebService.getInstances();
-
-        for (var entry : instances.entrySet()) {
+        for (var entry : WebService.instances.entrySet()) {
             var type = entry.getKey();
             var instance = entry.getValue();
 
@@ -56,7 +55,7 @@ public void init() {
                     field.setAccessible(true);
 
                     try {
-                        field.set(instance, instances.get(fieldType));
+                        field.set(instance, WebService.instances.get(fieldType));
                     } catch (IllegalAccessException exception) {
                         throw new UnsupportedOperationException(exception);
                     }

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

@@ -774,6 +774,20 @@ private enum Verb {
     private static class Resource {
         Map<String, Resource> resources = new TreeMap<>();
         Map<Verb, List<Method>> handlerLists = new TreeMap<>();
+
+        static final Comparator<Method> handlerComparator;
+        static {
+            var nameComparator = Comparator.comparing(Method::getName);
+            var parameterCountComparator = Comparator.comparing(Method::getParameterCount);
+
+            handlerComparator = nameComparator.thenComparing(parameterCountComparator.reversed());
+        }
+
+        void sort() {
+            for (var handlerList : handlerLists.values()) {
+                handlerList.sort(handlerComparator);
+            }
+        }
     }
 
     private Resource root;
@@ -814,15 +828,7 @@ private static class Resource {
     private static final ThreadLocal<HttpServletRequest> request = new ThreadLocal<>();
     private static final ThreadLocal<HttpServletResponse> response = new ThreadLocal<>();
 
-    private static final Comparator<Method> handlerComparator;
-    static {
-        var nameComparator = Comparator.comparing(Method::getName);
-        var parameterCountComparator = Comparator.comparing(Method::getParameterCount);
-
-        handlerComparator = nameComparator.thenComparing(parameterCountComparator.reversed());
-    }
-
-    private static final Map<Class<? extends WebService>, WebService> instances = new HashMap<>();
+    static final Map<Class<? extends WebService>, WebService> instances = synchronizedMapOf(new HashMap<>());
 
     /**
      * Returns a service instance.
@@ -838,20 +844,10 @@ private static class Resource {
      * exists.
      */
     @SuppressWarnings("unchecked")
-    public static synchronized <T extends WebService> T getInstance(Class<T> type) {
+    public static <T extends WebService> T getInstance(Class<T> type) {
         return (T)instances.get(type);
     }
 
-    /**
-     * Returns a map of all active service instances.
-     *
-     * @return
-     * A map of all active service instances, keyed by type.
-     */
-    public static synchronized Map<Class<? extends WebService>, WebService> getInstances() {
-        return immutableMapOf(instances);
-    }
-
     @Override
     public void init() throws ServletException {
         var type = getClass();
@@ -915,25 +911,11 @@ public void init() throws ServletException {
             resource.handlerLists.computeIfAbsent(verb, key -> new LinkedList<>()).add(handler);
         }
 
-        sort(root);
-
         serviceDescriptor = new ServiceDescriptor(path, type);
 
         describeResource(path, root);
 
-        synchronized (WebService.class) {
-            instances.put(type, this);
-        }
-    }
-
-    private static void sort(Resource root) {
-        for (var handlerList : root.handlerLists.values()) {
-            handlerList.sort(handlerComparator);
-        }
-
-        for (var resource : root.resources.values()) {
-            sort(resource);
-        }
+        instances.put(type, this);
     }
 
     @Override
@@ -1472,6 +1454,8 @@ public ServiceDescriptor getServiceDescriptor() {
     }
 
     private void describeResource(String path, Resource resource) {
+        resource.sort();
+
         if (!resource.handlerLists.isEmpty()) {
             var endpoint = new EndpointDescriptor(path);