Update to vertx 1.3 API

gradle.properties

@@ -13,13 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=1.0-SNAPSHOT
+version=1.3-SNAPSHOT
 group=org.vert-x
 modulename=vertx-junit-annotations
-gradleVersion=1.1
+gradleVersion=1.3
 
-vertxVersion=1.2.3.final
+vertxVersion=1.3.0.final
 rhinoVersion=1.7R4
-springVersion=3.1.2.RELEASE
 
 junitVersion=4.10

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip

src/main/java/org/vertx/java/test/TestVerticle.java

@@ -41,6 +41,8 @@
 
   String jsonConfig() default "{}";
 
+  String includes() default "";
+
   String[] urls() default {};
 
 }

src/main/java/org/vertx/java/test/VertxHandlerMapping.java

@@ -0,0 +1,25 @@
+package org.vertx.java.test;
+
+import org.vertx.java.core.Handler;
+import org.vertx.java.core.eventbus.Message;
+
+public class VertxHandlerMapping<T, M extends Message<T>> {
+
+  private final String address;
+
+  private final Handler<?> handler;
+
+  public VertxHandlerMapping(String address, Handler<M> handler) {
+    this.address = address;
+    this.handler = handler;
+  }
+
+  public String getAddress() {
+    return address;
+  }
+
+  public Handler<?> getHandler() {
+    return handler;
+  }
+
+}

src/main/java/org/vertx/java/test/VertxTestBase.java

@@ -16,6 +16,9 @@
 package org.vertx.java.test;
 
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -40,6 +43,9 @@ public abstract class VertxTestBase implements VertxAware, VerticleManagerAware
 
   private VerticleManager manager;
 
+  @SuppressWarnings("rawtypes")
+  private Map<String, VertxHandlerMapping> mappings = new HashMap<>();
+
   private static long AWAIT_TIMEOUT = 5000L;
 
   protected VertxTestBase() {
@@ -99,25 +105,31 @@ protected final void testMessageEcho(String address, String message) throws Exce
 
   protected final <T, M extends Message<T>> String registerHandler(String address, Handler<M> handler) {
     final CountDownLatch latch = new CountDownLatch(1);
-    String handlerId = vertx.eventBus().registerHandler(address, handler, new SimpleLatchAsyncResultHandler(latch));
+    vertx.eventBus().registerHandler(address, handler, new SimpleLatchAsyncResultHandler(latch));
     await(latch);
-    return handlerId;
+    String id = UUID.randomUUID().toString();
+    mappings.put(id, new VertxHandlerMapping<T,M>(address, handler));
+    return id;
   }
 
   protected final <T, M extends Message<T>> String registerLocalHandler(String address, Handler<M> handler) {
     final CountDownLatch latch = new CountDownLatch(1);
-    String handlerId = vertx.eventBus().registerLocalHandler(address, handler);
+    vertx.eventBus().registerLocalHandler(address, handler);
     await(latch);
-    return handlerId;
+    String id = UUID.randomUUID().toString();
+    mappings.put(id, new VertxHandlerMapping<T,M>(address, handler));
+    return id;
   }
 
   protected final void unregisterHandlers(String... handlers) {
     unregisterHandlers(Arrays.asList(handlers));
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   protected final void unregisterHandlers(Iterable<String> iterable) {
-    for (String handler : iterable) {
-      vertx.eventBus().unregisterHandler(handler);
+    for (String id : iterable) {
+      VertxHandlerMapping mapping = mappings.get(id);
+      vertx.eventBus().unregisterHandler(mapping.getAddress(), mapping.getHandler());
     }
   }
 

src/main/java/org/vertx/java/test/utils/DeploymentUtils.java

@@ -43,7 +43,10 @@ public static Map<Annotation, String> deployVerticles(VerticleManager manager, F
         URL[] urls = findVerticleURLs(v);
 
         LOG.log(Level.FINE, "DeploymentUtils.deployVerticle(%s)%n", v);
-        manager.deployVerticle(v.worker(), v.main(), config, urls, v.instances(), modDir, handler);
+
+        // we are having to set null here which is not that clever
+        String includes = ("".equals(v.includes())) ? null : v.includes();
+        manager.deployVerticle(v.worker(), v.main(), config, urls, v.instances(), modDir, includes, handler);
       }
 
       await(latch);

src/test/resources/langs.properties

@@ -0,0 +1,13 @@
+# Mapping between main file extensions and the verticle factory for the class
+
+java=org.vertx.java.deploy.impl.java.JavaVerticleFactory
+class=org.vertx.java.deploy.impl.java.JavaVerticleFactory
+js=org.vertx.java.deploy.impl.rhino.RhinoVerticleFactory
+coffee=org.vertx.java.deploy.impl.rhino.RhinoVerticleFactory
+rb=org.vertx.java.deploy.impl.jruby.JRubyVerticleFactory
+groovy=org.vertx.groovy.deploy.impl.groovy.GroovyVerticleFactory
+py=org.vertx.java.deploy.impl.jython.JythonVerticleFactory
+
+# Default - if none match this will be assumed
+
+default=org.vertx.java.deploy.impl.java.JavaVerticleFactory