From 55227790cb75f13cbcda764cc269efa02da652ae Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Thu, 30 Nov 2023 15:10:02 +0100 Subject: [PATCH] Use @JsonGen annotation --- src/main/generated/io/vertx/ext/stomp/FrameConverter.java | 6 +++--- .../io/vertx/ext/stomp/StompClientOptionsConverter.java | 6 +++--- .../io/vertx/ext/stomp/StompServerOptionsConverter.java | 6 +++--- src/main/java/io/vertx/ext/stomp/Frame.java | 4 +++- src/main/java/io/vertx/ext/stomp/StompClientOptions.java | 4 +++- src/main/java/io/vertx/ext/stomp/StompServerOptions.java | 4 +++- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/generated/io/vertx/ext/stomp/FrameConverter.java b/src/main/generated/io/vertx/ext/stomp/FrameConverter.java index 6fba61d..2679295 100644 --- a/src/main/generated/io/vertx/ext/stomp/FrameConverter.java +++ b/src/main/generated/io/vertx/ext/stomp/FrameConverter.java @@ -17,7 +17,7 @@ public class FrameConverter { private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER; private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER; - public static void fromJson(Iterable> json, Frame obj) { + static void fromJson(Iterable> json, Frame obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "headers": @@ -63,11 +63,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(Frame obj, JsonObject json) { + static void toJson(Frame obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(Frame obj, java.util.Map json) { + static void toJson(Frame obj, java.util.Map json) { if (obj.getHeaders() != null) { JsonObject map = new JsonObject(); obj.getHeaders().forEach((key, value) -> map.put(key, value)); diff --git a/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java b/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java index d2cb6bf..aaa115c 100644 --- a/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java +++ b/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java @@ -17,7 +17,7 @@ public class StompClientOptionsConverter { private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER; private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER; - public static void fromJson(Iterable> json, StompClientOptions obj) { + static void fromJson(Iterable> json, StompClientOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "host": @@ -84,11 +84,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(StompClientOptions obj, JsonObject json) { + static void toJson(StompClientOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(StompClientOptions obj, java.util.Map json) { + static void toJson(StompClientOptions obj, java.util.Map json) { if (obj.getHost() != null) { json.put("host", obj.getHost()); } diff --git a/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java b/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java index 2537b4a..707c718 100644 --- a/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java +++ b/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java @@ -17,7 +17,7 @@ public class StompServerOptionsConverter { private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER; private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER; - public static void fromJson(Iterable> json, StompServerOptions obj) { + static void fromJson(Iterable> json, StompServerOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "maxBodyLength": @@ -99,11 +99,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(StompServerOptions obj, JsonObject json) { + static void toJson(StompServerOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(StompServerOptions obj, java.util.Map json) { + static void toJson(StompServerOptions obj, java.util.Map json) { json.put("maxBodyLength", obj.getMaxBodyLength()); json.put("maxHeaderLength", obj.getMaxHeaderLength()); json.put("maxHeaders", obj.getMaxHeaders()); diff --git a/src/main/java/io/vertx/ext/stomp/Frame.java b/src/main/java/io/vertx/ext/stomp/Frame.java index c2eebfe..700093c 100644 --- a/src/main/java/io/vertx/ext/stomp/Frame.java +++ b/src/main/java/io/vertx/ext/stomp/Frame.java @@ -18,6 +18,7 @@ import io.vertx.codegen.annotations.DataObject; import io.vertx.codegen.annotations.GenIgnore; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; import io.vertx.ext.stomp.impl.FrameException; @@ -41,7 +42,8 @@ * * @author Clement Escoffier */ -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class Frame { // General headers diff --git a/src/main/java/io/vertx/ext/stomp/StompClientOptions.java b/src/main/java/io/vertx/ext/stomp/StompClientOptions.java index 868bdcb..107756a 100644 --- a/src/main/java/io/vertx/ext/stomp/StompClientOptions.java +++ b/src/main/java/io/vertx/ext/stomp/StompClientOptions.java @@ -17,6 +17,7 @@ package io.vertx.ext.stomp; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import io.vertx.core.net.NetClientOptions; @@ -30,7 +31,8 @@ * * @author Clement Escoffier */ -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class StompClientOptions extends NetClientOptions implements StompOptions { // The default value of reuse address for stomp client diff --git a/src/main/java/io/vertx/ext/stomp/StompServerOptions.java b/src/main/java/io/vertx/ext/stomp/StompServerOptions.java index 85786a1..1192af9 100644 --- a/src/main/java/io/vertx/ext/stomp/StompServerOptions.java +++ b/src/main/java/io/vertx/ext/stomp/StompServerOptions.java @@ -17,6 +17,7 @@ package io.vertx.ext.stomp; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.Handler; import io.vertx.core.json.JsonObject; import io.vertx.core.net.NetServerOptions; @@ -29,7 +30,8 @@ * * @author Clement Escoffier */ -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class StompServerOptions extends NetServerOptions implements StompOptions { public static final int DEFAULT_MAX_HEADER_LENGTH = 1024 * 10;