> {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/datagram/DatagramPacket.java b/vertx-core/src/main/java/io/vertx/core/datagram/DatagramPacket.java
index a050b9cf479..c7924058b37 100644
--- a/vertx-core/src/main/java/io/vertx/core/datagram/DatagramPacket.java
+++ b/vertx-core/src/main/java/io/vertx/core/datagram/DatagramPacket.java
@@ -11,8 +11,8 @@
package io.vertx.core.datagram;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.core.buffer.Buffer;
-import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.net.SocketAddress;
/**
@@ -20,7 +20,7 @@
*
* @author Norman Maurer
*/
-@VertxGen
+@DataObject
public interface DatagramPacket {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/dns/MxRecord.java b/vertx-core/src/main/java/io/vertx/core/dns/MxRecord.java
index e09f5d92d95..e598428d94d 100644
--- a/vertx-core/src/main/java/io/vertx/core/dns/MxRecord.java
+++ b/vertx-core/src/main/java/io/vertx/core/dns/MxRecord.java
@@ -11,14 +11,14 @@
package io.vertx.core.dns;
-import io.vertx.codegen.annotations.VertxGen;
+import io.vertx.codegen.annotations.DataObject;
/**
* Represent a Mail-Exchange-Record (MX) which was resolved for a domain.
*
* @author Norman Maurer
*/
-@VertxGen
+@DataObject
public interface MxRecord {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/dns/SrvRecord.java b/vertx-core/src/main/java/io/vertx/core/dns/SrvRecord.java
index 09140ed3538..cd56bc14acb 100644
--- a/vertx-core/src/main/java/io/vertx/core/dns/SrvRecord.java
+++ b/vertx-core/src/main/java/io/vertx/core/dns/SrvRecord.java
@@ -11,15 +11,15 @@
package io.vertx.core.dns;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.Nullable;
-import io.vertx.codegen.annotations.VertxGen;
/**
* Represent a Service-Record (SRV) which was resolved for a domain.
*
* @author Norman Maurer
*/
-@VertxGen
+@DataObject
public interface SrvRecord {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/file/FileProps.java b/vertx-core/src/main/java/io/vertx/core/file/FileProps.java
index 9f199aacd12..d077c6c50ef 100644
--- a/vertx-core/src/main/java/io/vertx/core/file/FileProps.java
+++ b/vertx-core/src/main/java/io/vertx/core/file/FileProps.java
@@ -11,6 +11,7 @@
package io.vertx.core.file;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.VertxGen;
/**
@@ -19,7 +20,7 @@
*
* @author Tim Fox
*/
-@VertxGen
+@DataObject
public interface FileProps {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/file/FileSystemProps.java b/vertx-core/src/main/java/io/vertx/core/file/FileSystemProps.java
index e18b54b2dcd..7901360f4c8 100644
--- a/vertx-core/src/main/java/io/vertx/core/file/FileSystemProps.java
+++ b/vertx-core/src/main/java/io/vertx/core/file/FileSystemProps.java
@@ -11,6 +11,7 @@
package io.vertx.core.file;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.VertxGen;
/**
@@ -19,7 +20,7 @@
*
* @author Tim Fox
*/
-@VertxGen
+@DataObject
public interface FileSystemProps {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/http/Cookie.java b/vertx-core/src/main/java/io/vertx/core/http/Cookie.java
index 9fcebf301b0..44d73e2f254 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/Cookie.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/Cookie.java
@@ -11,6 +11,7 @@
package io.vertx.core.http;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.Fluent;
import io.vertx.codegen.annotations.Nullable;
import io.vertx.codegen.annotations.VertxGen;
@@ -21,7 +22,7 @@
*
* All cookies must have a name and a value and can optionally have other fields set such as path, domain, etc.
*/
-@VertxGen
+@DataObject
public interface Cookie {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/http/HttpFrame.java b/vertx-core/src/main/java/io/vertx/core/http/HttpFrame.java
index 35e43b9e6f9..4428bba8481 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/HttpFrame.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/HttpFrame.java
@@ -12,6 +12,7 @@
package io.vertx.core.http;
import io.vertx.codegen.annotations.CacheReturn;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.buffer.Buffer;
@@ -20,7 +21,7 @@
*
* @author Julien Viet
*/
-@VertxGen
+@DataObject
public interface HttpFrame {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/http/WebSocketFrame.java b/vertx-core/src/main/java/io/vertx/core/http/WebSocketFrame.java
index 0d446c45d9a..2ad1be5cc3c 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/WebSocketFrame.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/WebSocketFrame.java
@@ -12,6 +12,7 @@
package io.vertx.core.http;
import io.vertx.codegen.annotations.CacheReturn;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.impl.ws.WebSocketFrameImpl;
@@ -31,7 +32,7 @@
* @author Tim Fox
* @version $Rev: 2080 $, $Date: 2010-01-26 18:04:19 +0900 (Tue, 26 Jan 2010) $
*/
-@VertxGen
+@DataObject
public interface WebSocketFrame {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/net/SelfSignedCertificate.java b/vertx-core/src/main/java/io/vertx/core/net/SelfSignedCertificate.java
index 313a52cf8eb..5a406f2b601 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/SelfSignedCertificate.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/SelfSignedCertificate.java
@@ -11,6 +11,7 @@
package io.vertx.core.net;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.net.impl.SelfSignedCertificateImpl;
@@ -21,7 +22,7 @@
*
* @author Julien Ponge
*/
-@VertxGen
+@DataObject
public interface SelfSignedCertificate {
/**
diff --git a/vertx-core/src/main/java/io/vertx/core/parsetools/JsonEvent.java b/vertx-core/src/main/java/io/vertx/core/parsetools/JsonEvent.java
index b0219a58e4c..fcd10f64aea 100644
--- a/vertx-core/src/main/java/io/vertx/core/parsetools/JsonEvent.java
+++ b/vertx-core/src/main/java/io/vertx/core/parsetools/JsonEvent.java
@@ -12,6 +12,7 @@
package io.vertx.core.parsetools;
import com.fasterxml.jackson.core.type.TypeReference;
+import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.GenIgnore;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.buffer.Buffer;
@@ -25,7 +26,7 @@
*
* @author Julien Viet
*/
-@VertxGen
+@DataObject
public interface JsonEvent {
/**