making it vertx3 3.1.0 compatible

pom.xml

@@ -50,10 +50,10 @@
     <mods.directory>target/mods</mods.directory>
 
     <!--Dependency versions-->
-    <vertx.version>2.1.5</vertx.version>
+    <vertx.version>3.1.0</vertx.version>
     <vertx.testtools.version>2.0.3-final</vertx.testtools.version>
-    <junit.version>4.11</junit.version>
-    <assertj.version>3.0.0</assertj.version>
+    <junit.version>4.12</junit.version>
+    <assertj.version>3.2.0</assertj.version>
 
     <!--Plugin versions-->
     <maven.compiler.plugin.version>3.0</maven.compiler.plugin.version>
@@ -75,12 +75,6 @@
       <version>${vertx.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-platform</artifactId>
-      <version>${vertx.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-hazelcast</artifactId>
@@ -120,48 +114,6 @@
   <build>
     <plugins>
 
-      <!-- The vert.x Maven plugin -->
-      <plugin>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-maven-plugin</artifactId>
-        <version>${maven.vertx.plugin.version}</version>
-        <!--
-        You can specify extra config to the plugin as required here
-        <configuration>
-           <configFile>/path/to/MyVerticle.conf</configFile>
-           <instances>1</instances>
-           <classpath>src/main/resources/:src/test/resources/:target/classes/:target/test-classes/</classpath>
-        </configuration>
-        -->
-        <!-- Make sure that the plugin uses the vert.x versions from this pom.xml not from its own pom.xml -->
-        <dependencies>
-          <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-platform</artifactId>
-            <version>${vertx.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-            <version>${vertx.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-hazelcast</artifactId>
-            <version>${vertx.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>PullInDeps</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>pullInDeps</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Other plugins required by the build -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -278,23 +230,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/mod.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>assemble</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <reporting>

src/main/java/org/simondean/vertx/async/AsyncResultHandlerWrapper.java

@@ -1,26 +1,27 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResult;
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.AsyncResultHandler;
 
 public class AsyncResultHandlerWrapper<T, R> implements AsyncResultHandler<R> {
-  private final AsyncResultHandler<T> handler;
 
-  public AsyncResultHandlerWrapper(AsyncResultHandler<T> handler) {
-    this.handler = handler;
-  }
+    private final AsyncResultHandler<T> handler;
 
-  public static <T, R> AsyncResultHandler<R> wrap(AsyncResultHandler<T> handler) {
-    return new AsyncResultHandlerWrapper<>(handler);
-  }
+    public AsyncResultHandlerWrapper(AsyncResultHandler<T> handler) {
+        this.handler = handler;
+    }
 
-  @Override
-  public void handle(AsyncResult<R> asyncResult) {
-    if (asyncResult.failed()) {
-      handler.handle(DefaultAsyncResult.fail(asyncResult.cause()));
-      return;
+    public static <T, R> AsyncResultHandler<R> wrap(AsyncResultHandler<T> handler) {
+        return new AsyncResultHandlerWrapper<>(handler);
     }
 
-    handler.handle(DefaultAsyncResult.succeed((T) asyncResult.result()));
-  }
+    @Override
+    public void handle(AsyncResult<R> asyncResult) {
+        if (asyncResult.failed()) {
+            handler.handle(DefaultAsyncResult.fail(asyncResult.cause()));
+            return;
+        }
+
+        handler.handle(DefaultAsyncResult.succeed((T) asyncResult.result()));
+    }
 }

src/main/java/org/simondean/vertx/async/DefaultAsyncResult.java

@@ -1,53 +1,54 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResult;
+import io.vertx.core.AsyncResult;
 
 public class DefaultAsyncResult<T> implements AsyncResult<T> {
-  private Throwable cause;
-  private T result;
 
-  public DefaultAsyncResult(Throwable cause, T result) {
-    this.cause = cause;
-    this.result = result;
-  }
+    private Throwable cause;
+    private T result;
 
-  public static <T> AsyncResult<T> succeed(T result) {
-    return new DefaultAsyncResult<>(null, result);
-  }
+    public DefaultAsyncResult(Throwable cause, T result) {
+        this.cause = cause;
+        this.result = result;
+    }
 
-  public static AsyncResult<Void> succeed() {
-    return succeed(null);
-  }
+    public static <T> AsyncResult<T> succeed(T result) {
+        return new DefaultAsyncResult<>(null, result);
+    }
 
-  public static <T> AsyncResult<T> fail(Throwable cause) {
-    if (cause == null) {
-      throw new IllegalArgumentException("cause argument cannot be null");
+    public static AsyncResult<Void> succeed() {
+        return succeed(null);
     }
 
-    return new DefaultAsyncResult<>(cause, null);
-  }
+    public static <T> AsyncResult<T> fail(Throwable cause) {
+        if (cause == null) {
+            throw new IllegalArgumentException("cause argument cannot be null");
+        }
 
-  public static <T> AsyncResult<T> fail(AsyncResult<?> result) {
-    return fail(result.cause());
-  }
+        return new DefaultAsyncResult<>(cause, null);
+    }
 
-  @Override
-  public T result() {
-    return result;
-  }
+    public static <T> AsyncResult<T> fail(AsyncResult<?> result) {
+        return fail(result.cause());
+    }
 
-  @Override
-  public Throwable cause() {
-    return cause;
-  }
+    @Override
+    public T result() {
+        return result;
+    }
 
-  @Override
-  public boolean succeeded() {
-    return cause == null;
-  }
+    @Override
+    public Throwable cause() {
+        return cause;
+    }
+
+    @Override
+    public boolean succeeded() {
+        return cause == null;
+    }
 
-  @Override
-  public boolean failed() {
-    return cause != null;
-  }
+    @Override
+    public boolean failed() {
+        return cause != null;
+    }
 }

src/main/java/org/simondean/vertx/async/EachBuilder.java

@@ -1,7 +1,7 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
-import org.vertx.java.core.Vertx;
+import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.Vertx;
 
 public interface EachBuilder {
   void run(Vertx vertx, AsyncResultHandler<Void> handler);

src/main/java/org/simondean/vertx/async/Forever.java

@@ -1,7 +1,7 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
-import org.vertx.java.core.Vertx;
+import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.Vertx;
 
 public interface Forever {
   void run(Vertx vertx, AsyncResultHandler<Void> handler);

src/main/java/org/simondean/vertx/async/ForeverBuilder.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.Consumer;
 

src/main/java/org/simondean/vertx/async/IterableBuilder.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.BiConsumer;
 

src/main/java/org/simondean/vertx/async/Retry.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 public interface Retry<T> {
   void run(AsyncResultHandler<T> handler);

src/main/java/org/simondean/vertx/async/RetryBuilder.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.Consumer;
 

src/main/java/org/simondean/vertx/async/Series.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.List;
 import java.util.function.Consumer;

src/main/java/org/simondean/vertx/async/Waterfall.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.BiConsumer;
 

src/main/java/org/simondean/vertx/async/WaterfallBuilder.java

@@ -1,6 +1,6 @@
 package org.simondean.vertx.async;
 
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.Consumer;
 

src/main/java/org/simondean/vertx/async/internal/DefaultWaterfall.java

@@ -1,7 +1,7 @@
 package org.simondean.vertx.async.internal;
 
 import org.simondean.vertx.async.Waterfall;
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;

src/main/java/org/simondean/vertx/async/internal/EachBuilderImpl.java

@@ -3,8 +3,8 @@
 import org.simondean.vertx.async.DefaultAsyncResult;
 import org.simondean.vertx.async.EachBuilder;
 import org.simondean.vertx.async.ObjectWrapper;
-import org.vertx.java.core.AsyncResultHandler;
-import org.vertx.java.core.Vertx;
+import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.Vertx;
 
 import java.util.ArrayList;
 import java.util.function.BiConsumer;

src/main/java/org/simondean/vertx/async/internal/ForeverBuilderImpl.java

@@ -2,7 +2,7 @@
 
 import org.simondean.vertx.async.Forever;
 import org.simondean.vertx.async.ForeverBuilder;
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.Consumer;
 

src/main/java/org/simondean/vertx/async/internal/ForeverImpl.java

@@ -3,8 +3,8 @@
 import org.simondean.vertx.async.DefaultAsyncResult;
 import org.simondean.vertx.async.Forever;
 import org.simondean.vertx.async.FunctionWrapper;
-import org.vertx.java.core.AsyncResultHandler;
-import org.vertx.java.core.Vertx;
+import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.Vertx;
 
 import java.util.function.Consumer;
 

src/main/java/org/simondean/vertx/async/internal/IterableBuilderImpl.java

@@ -2,7 +2,7 @@
 
 import org.simondean.vertx.async.EachBuilder;
 import org.simondean.vertx.async.IterableBuilder;
-import org.vertx.java.core.AsyncResultHandler;
+import io.vertx.core.AsyncResultHandler;
 
 import java.util.function.BiConsumer;