diff --git a/src/main/generated/io/vertx/proton/ProtonClientOptionsConverter.java b/src/main/generated/io/vertx/proton/ProtonClientOptionsConverter.java index e373449..4b53b29 100644 --- a/src/main/generated/io/vertx/proton/ProtonClientOptionsConverter.java +++ b/src/main/generated/io/vertx/proton/ProtonClientOptionsConverter.java @@ -20,11 +20,6 @@ public class ProtonClientOptionsConverter { static void fromJson(Iterable> json, ProtonClientOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { - case "openSslEngineOptions": - if (member.getValue() instanceof JsonObject) { - obj.setOpenSslEngineOptions(new io.vertx.core.net.OpenSSLEngineOptions((io.vertx.core.json.JsonObject)member.getValue())); - } - break; case "enabledSaslMechanisms": if (member.getValue() instanceof JsonArray) { ((Iterable)member.getValue()).forEach( item -> { @@ -62,9 +57,6 @@ static void toJson(ProtonClientOptions obj, JsonObject json) { } static void toJson(ProtonClientOptions obj, java.util.Map json) { - if (obj.getOpenSslEngineOptions() != null) { - json.put("openSslEngineOptions", obj.getOpenSslEngineOptions().toJson()); - } if (obj.getEnabledSaslMechanisms() != null) { JsonArray array = new JsonArray(); obj.getEnabledSaslMechanisms().forEach(item -> array.add(item)); diff --git a/src/main/generated/io/vertx/proton/ProtonServerOptionsConverter.java b/src/main/generated/io/vertx/proton/ProtonServerOptionsConverter.java index 87373e3..aa72a25 100644 --- a/src/main/generated/io/vertx/proton/ProtonServerOptionsConverter.java +++ b/src/main/generated/io/vertx/proton/ProtonServerOptionsConverter.java @@ -20,11 +20,6 @@ public class ProtonServerOptionsConverter { static void fromJson(Iterable> json, ProtonServerOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { - case "openSslEngineOptions": - if (member.getValue() instanceof JsonObject) { - obj.setOpenSslEngineOptions(new io.vertx.core.net.OpenSSLEngineOptions((io.vertx.core.json.JsonObject)member.getValue())); - } - break; case "heartbeat": if (member.getValue() instanceof Number) { obj.setHeartbeat(((Number)member.getValue()).intValue()); @@ -44,9 +39,6 @@ static void toJson(ProtonServerOptions obj, JsonObject json) { } static void toJson(ProtonServerOptions obj, java.util.Map json) { - if (obj.getOpenSslEngineOptions() != null) { - json.put("openSslEngineOptions", obj.getOpenSslEngineOptions().toJson()); - } json.put("heartbeat", obj.getHeartbeat()); json.put("maxFrameSize", obj.getMaxFrameSize()); } diff --git a/src/main/java/io/vertx/proton/ProtonClientOptions.java b/src/main/java/io/vertx/proton/ProtonClientOptions.java index 8c2a3fb..35bd4a4 100644 --- a/src/main/java/io/vertx/proton/ProtonClientOptions.java +++ b/src/main/java/io/vertx/proton/ProtonClientOptions.java @@ -22,6 +22,7 @@ import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; import io.vertx.core.net.JdkSSLEngineOptions; @@ -39,7 +40,8 @@ /** * Options for configuring {@link io.vertx.proton.ProtonClient} connect operations. */ -@DataObject(generateConverter = true, publicConverter = false) +@DataObject +@JsonGen(publicConverter = false) public class ProtonClientOptions extends NetClientOptions { private Set enabledSaslMechanisms = new LinkedHashSet<>(); diff --git a/src/main/java/io/vertx/proton/ProtonLinkOptions.java b/src/main/java/io/vertx/proton/ProtonLinkOptions.java index 87a4db9..a6834c8 100644 --- a/src/main/java/io/vertx/proton/ProtonLinkOptions.java +++ b/src/main/java/io/vertx/proton/ProtonLinkOptions.java @@ -16,12 +16,14 @@ package io.vertx.proton; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; /** * Options for configuring link attributes. */ -@DataObject(generateConverter = true, publicConverter = false) +@DataObject +@JsonGen(publicConverter = false) public class ProtonLinkOptions { private String linkName; private boolean dynamic; diff --git a/src/main/java/io/vertx/proton/ProtonServerOptions.java b/src/main/java/io/vertx/proton/ProtonServerOptions.java index 9cb1674..0e524b0 100644 --- a/src/main/java/io/vertx/proton/ProtonServerOptions.java +++ b/src/main/java/io/vertx/proton/ProtonServerOptions.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.ClientAuth; import io.vertx.core.json.JsonObject; @@ -36,7 +37,8 @@ /** * Options for configuring {@link io.vertx.proton.ProtonServer} creation. */ -@DataObject(generateConverter = true, publicConverter = false) +@DataObject +@JsonGen(publicConverter = false) public class ProtonServerOptions extends NetServerOptions { private int heartbeat; diff --git a/src/main/java/io/vertx/proton/ProtonTransportOptions.java b/src/main/java/io/vertx/proton/ProtonTransportOptions.java index a18e22b..bd009a6 100644 --- a/src/main/java/io/vertx/proton/ProtonTransportOptions.java +++ b/src/main/java/io/vertx/proton/ProtonTransportOptions.java @@ -16,12 +16,14 @@ package io.vertx.proton; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; /** * Options for configuring transport layer */ -@DataObject(generateConverter = true, publicConverter = false) +@DataObject +@JsonGen(publicConverter = false) public class ProtonTransportOptions { private int heartbeat;