smashed bug

Author: Rene Sprietsma

src/main/java/com/github/spriet2000/vertx/handlers/core/BiHandlers.java

@@ -17,5 +17,5 @@ public interface BiHandlers<E, A> {
 
     BiHandlersImpl<E, A> andThen(BiHandlersImpl<E, A>... handlers);
 
-    List<BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>> handlers();
+    List<BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>> list();
 }

src/main/java/com/github/spriet2000/vertx/handlers/core/impl/BiHandlersImpl.java

@@ -11,17 +11,17 @@
 
 public final class BiHandlersImpl<E, A> implements BiHandlers<E, A> {
 
-    private List<BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>> handlers;
+    private List<BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>> list = new ArrayList<>();
 
     public BiHandlersImpl() {
     }
 
     @Override
     public BiConsumer<E, A> apply(BiConsumer<E, Throwable> exceptionHandler, BiConsumer<E, A> successHandler) {
         BiConsumer<E, A> last = successHandler;
-        for (int i = handlers.size() - 1; i >= 0; i--) {
+        for (int i = list().size() - 1; i >= 0; i--) {
             final BiConsumer<E, A> previous = last;
-            last = handlers.get(i).apply(
+            last = list().get(i).apply(
                     exceptionHandler,
                     previous);
         }
@@ -32,32 +32,29 @@ public BiConsumer<E, A> apply(BiConsumer<E, Throwable> exceptionHandler, BiConsu
     @SafeVarargs
     public final BiHandlersImpl<E, A> andThen(BiConsumer<E, A>... consumers) {
         for (BiConsumer<E, A> consumer : consumers) {
-            handlers().add((f, n) -> consumer);
+            list().add((f, n) -> consumer);
         }
         return this;
     }
 
     @Override
     @SafeVarargs
     public final BiHandlersImpl<E, A> andThen(BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>... handlers) {
-        Collections.addAll(handlers(), handlers);
+        Collections.addAll(list(), handlers);
         return this;
     }
 
     @Override
     @SafeVarargs
     public final BiHandlersImpl<E, A> andThen(BiHandlersImpl<E, A>... handlers) {
         for (BiHandlersImpl<E, A> handler : handlers) {
-            handlers().addAll(handler.handlers().stream().collect(Collectors.toList()));
+            list().addAll(handler.list().stream().collect(Collectors.toList()));
         }
         return this;
     }
 
     @Override
-    public List<BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>> handlers() {
-        if (handlers == null) {
-            handlers = new ArrayList<>();
-        }
-        return handlers;
+    public List<BiFunction<BiConsumer<E, Throwable>, BiConsumer<E, A>, BiConsumer<E, A>>> list() {
+        return list;
     }
 }

src/main/java/com/github/spriet2000/vertx/handlers/http/impl/ServerRequestHandlers.java

@@ -20,49 +20,53 @@ public ServerRequestHandlers() {
     @SafeVarargs
     public ServerRequestHandlers(BiFunction<BiConsumer<HttpServerRequest, Throwable>, BiConsumer<HttpServerRequest, A>,
             BiConsumer<HttpServerRequest, A>>... handlers) {
-        Collections.addAll(biHandlers.handlers(), handlers);
+        Collections.addAll(biHandlers.list(), handlers);
     }
 
     @SafeVarargs
     public ServerRequestHandlers(ServerRequestHandlers<A>... handlers) {
         for (ServerRequestHandlers<A> handler : handlers) {
-            biHandlers.handlers().addAll(handler.handlers().stream().collect(Collectors.toList()));
+            biHandlers.list().addAll(handler.list().stream().collect(Collectors.toList()));
         }
     }
 
-    @SafeVarargs
-    public static <A> ServerRequestHandlers<A> build(ServerRequestHandlers<A>... handlers) {
-        return new ServerRequestHandlers<>(handlers);
+    @Override
+    public BiConsumer<HttpServerRequest, A> apply(BiConsumer<HttpServerRequest, Throwable> exceptionHandler,
+                                                  BiConsumer<HttpServerRequest, A> successHandler) {
+        return biHandlers.apply(exceptionHandler, successHandler);
     }
 
-    @SafeVarargs
-    public static <A> ServerRequestHandlers<A> build(BiFunction<BiConsumer<HttpServerRequest, Throwable>,
-            BiConsumer<HttpServerRequest, A>, BiConsumer<HttpServerRequest, A>>... handlers) {
-        return new ServerRequestHandlers<>(handlers);
+    @Override
+    public BiHandlersImpl<HttpServerRequest, A> andThen(BiConsumer<HttpServerRequest, A>... biConsumers) {
+        return biHandlers.andThen(biConsumers);
     }
 
     @Override
-    public BiConsumer<HttpServerRequest, A> apply(BiConsumer<HttpServerRequest, Throwable> exceptionHandler, BiConsumer<HttpServerRequest, A> successHandler) {
-        return biHandlers.apply(exceptionHandler, successHandler);
+    public BiHandlersImpl<HttpServerRequest, A> andThen(BiFunction<BiConsumer<HttpServerRequest, Throwable>,
+            BiConsumer<HttpServerRequest, A>, BiConsumer<HttpServerRequest, A>>... list) {
+        return biHandlers.andThen(list);
     }
 
     @Override
-    public BiHandlersImpl<HttpServerRequest, A> andThen(BiConsumer<HttpServerRequest, A>... consumers) {
-        return biHandlers.andThen(consumers);
+    public BiHandlersImpl<HttpServerRequest, A> andThen(BiHandlersImpl<HttpServerRequest, A>... biHandlers) {
+        return this.biHandlers.andThen(biHandlers);
     }
 
     @Override
-    public BiHandlersImpl<HttpServerRequest, A> andThen(BiFunction<BiConsumer<HttpServerRequest, Throwable>, BiConsumer<HttpServerRequest, A>, BiConsumer<HttpServerRequest, A>>... handlers) {
-        return null;
+    public List<BiFunction<BiConsumer<HttpServerRequest, Throwable>, BiConsumer<HttpServerRequest, A>,
+            BiConsumer<HttpServerRequest, A>>> list() {
+        return biHandlers.list();
     }
 
-    @Override
-    public BiHandlersImpl<HttpServerRequest, A> andThen(BiHandlersImpl<HttpServerRequest, A>... handlers) {
-        return biHandlers.andThen(handlers);
+    @SafeVarargs
+    public static <A> ServerRequestHandlers<A> build(ServerRequestHandlers<A>... handlers) {
+        return new ServerRequestHandlers<>(handlers);
     }
 
-    @Override
-    public List<BiFunction<BiConsumer<HttpServerRequest, Throwable>, BiConsumer<HttpServerRequest, A>, BiConsumer<HttpServerRequest, A>>> handlers() {
-        return biHandlers.handlers();
+    @SafeVarargs
+    public static <A> ServerRequestHandlers<A> build(BiFunction<BiConsumer<HttpServerRequest, Throwable>,
+            BiConsumer<HttpServerRequest, A>, BiConsumer<HttpServerRequest, A>>... handlers) {
+        return new ServerRequestHandlers<>(handlers);
     }
+
 }