From 86462a9ad96d8ab341c2493e228e91c254d1cc31 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Thu, 30 Nov 2023 15:13:33 +0100 Subject: [PATCH] Use @JsonGen annotation --- .../io/vertx/redis/client/PoolOptionsConverter.java | 6 +++--- .../redis/client/RedisClusterConnectOptionsConverter.java | 6 +++--- .../io/vertx/redis/client/RedisConnectOptionsConverter.java | 6 +++--- .../io/vertx/redis/client/RedisOptionsConverter.java | 6 +++--- .../redis/client/RedisSentinelConnectOptionsConverter.java | 6 +++--- .../client/RedisStandaloneConnectOptionsConverter.java | 6 +++--- src/main/java/io/vertx/redis/client/PoolOptions.java | 4 +++- .../io/vertx/redis/client/RedisClusterConnectOptions.java | 4 +++- .../java/io/vertx/redis/client/RedisConnectOptions.java | 4 +++- src/main/java/io/vertx/redis/client/RedisOptions.java | 4 +++- .../io/vertx/redis/client/RedisSentinelConnectOptions.java | 4 +++- .../vertx/redis/client/RedisStandaloneConnectOptions.java | 4 +++- 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java b/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java index 78af21c7..c7886dc2 100644 --- a/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java @@ -17,7 +17,7 @@ public class PoolOptionsConverter { 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, PoolOptions obj) { + static void fromJson(Iterable> json, PoolOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "name": @@ -49,11 +49,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(PoolOptions obj, JsonObject json) { + static void toJson(PoolOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(PoolOptions obj, java.util.Map json) { + static void toJson(PoolOptions obj, java.util.Map json) { if (obj.getName() != null) { json.put("name", obj.getName()); } diff --git a/src/main/generated/io/vertx/redis/client/RedisClusterConnectOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisClusterConnectOptionsConverter.java index 5c4d6cdf..bd9bbd2a 100644 --- a/src/main/generated/io/vertx/redis/client/RedisClusterConnectOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisClusterConnectOptionsConverter.java @@ -17,7 +17,7 @@ public class RedisClusterConnectOptionsConverter { 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, RedisClusterConnectOptions obj) { + static void fromJson(Iterable> json, RedisClusterConnectOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "useReplicas": @@ -34,11 +34,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(RedisClusterConnectOptions obj, JsonObject json) { + static void toJson(RedisClusterConnectOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(RedisClusterConnectOptions obj, java.util.Map json) { + static void toJson(RedisClusterConnectOptions obj, java.util.Map json) { if (obj.getUseReplicas() != null) { json.put("useReplicas", obj.getUseReplicas().name()); } diff --git a/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java index 20d4f4d2..536719eb 100644 --- a/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java @@ -17,7 +17,7 @@ public class RedisConnectOptionsConverter { 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, RedisConnectOptions obj) { + static void fromJson(Iterable> json, RedisConnectOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "maxNestedArrays": @@ -69,11 +69,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(RedisConnectOptions obj, JsonObject json) { + static void toJson(RedisConnectOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(RedisConnectOptions obj, java.util.Map json) { + static void toJson(RedisConnectOptions obj, java.util.Map json) { json.put("maxNestedArrays", obj.getMaxNestedArrays()); json.put("protocolNegotiation", obj.isProtocolNegotiation()); if (obj.getPassword() != null) { diff --git a/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java index ccdb38d0..ff4b7da5 100644 --- a/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java @@ -17,7 +17,7 @@ public class RedisOptionsConverter { 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, RedisOptions obj) { + static void fromJson(Iterable> json, RedisOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "type": @@ -132,11 +132,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(RedisOptions obj, JsonObject json) { + static void toJson(RedisOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(RedisOptions obj, java.util.Map json) { + static void toJson(RedisOptions obj, java.util.Map json) { if (obj.getType() != null) { json.put("type", obj.getType().name()); } diff --git a/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java index ccf9b0fd..021758ee 100644 --- a/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java @@ -17,7 +17,7 @@ public class RedisSentinelConnectOptionsConverter { 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, RedisSentinelConnectOptions obj) { + static void fromJson(Iterable> json, RedisSentinelConnectOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { case "role": @@ -34,11 +34,11 @@ public static void fromJson(Iterable> json, } } - public static void toJson(RedisSentinelConnectOptions obj, JsonObject json) { + static void toJson(RedisSentinelConnectOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(RedisSentinelConnectOptions obj, java.util.Map json) { + static void toJson(RedisSentinelConnectOptions obj, java.util.Map json) { if (obj.getRole() != null) { json.put("role", obj.getRole().name()); } diff --git a/src/main/generated/io/vertx/redis/client/RedisStandaloneConnectOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisStandaloneConnectOptionsConverter.java index 79e707e5..934389c7 100644 --- a/src/main/generated/io/vertx/redis/client/RedisStandaloneConnectOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisStandaloneConnectOptionsConverter.java @@ -17,17 +17,17 @@ public class RedisStandaloneConnectOptionsConverter { 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, RedisStandaloneConnectOptions obj) { + static void fromJson(Iterable> json, RedisStandaloneConnectOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { } } } - public static void toJson(RedisStandaloneConnectOptions obj, JsonObject json) { + static void toJson(RedisStandaloneConnectOptions obj, JsonObject json) { toJson(obj, json.getMap()); } - public static void toJson(RedisStandaloneConnectOptions obj, java.util.Map json) { + static void toJson(RedisStandaloneConnectOptions obj, java.util.Map json) { } } diff --git a/src/main/java/io/vertx/redis/client/PoolOptions.java b/src/main/java/io/vertx/redis/client/PoolOptions.java index 3a4d8473..595b00a8 100644 --- a/src/main/java/io/vertx/redis/client/PoolOptions.java +++ b/src/main/java/io/vertx/redis/client/PoolOptions.java @@ -16,11 +16,13 @@ package io.vertx.redis.client; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import java.util.UUID; -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class PoolOptions { private String name; diff --git a/src/main/java/io/vertx/redis/client/RedisClusterConnectOptions.java b/src/main/java/io/vertx/redis/client/RedisClusterConnectOptions.java index 7e6a378b..ec5bb690 100644 --- a/src/main/java/io/vertx/redis/client/RedisClusterConnectOptions.java +++ b/src/main/java/io/vertx/redis/client/RedisClusterConnectOptions.java @@ -16,11 +16,13 @@ package io.vertx.redis.client; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import java.util.List; -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class RedisClusterConnectOptions extends RedisConnectOptions { private RedisReplicas useReplicas; diff --git a/src/main/java/io/vertx/redis/client/RedisConnectOptions.java b/src/main/java/io/vertx/redis/client/RedisConnectOptions.java index 5eb7c79e..8f909869 100644 --- a/src/main/java/io/vertx/redis/client/RedisConnectOptions.java +++ b/src/main/java/io/vertx/redis/client/RedisConnectOptions.java @@ -16,12 +16,14 @@ package io.vertx.redis.client; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import java.util.ArrayList; import java.util.List; -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public abstract class RedisConnectOptions { private volatile String password; diff --git a/src/main/java/io/vertx/redis/client/RedisOptions.java b/src/main/java/io/vertx/redis/client/RedisOptions.java index 76250416..feea2a7c 100644 --- a/src/main/java/io/vertx/redis/client/RedisOptions.java +++ b/src/main/java/io/vertx/redis/client/RedisOptions.java @@ -17,6 +17,7 @@ import io.vertx.codegen.annotations.DataObject; import io.vertx.codegen.annotations.GenIgnore; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import io.vertx.core.net.NetClientOptions; import io.vertx.core.tracing.TracingPolicy; @@ -30,7 +31,8 @@ * * @author Paulo Lopes */ -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class RedisOptions { /** diff --git a/src/main/java/io/vertx/redis/client/RedisSentinelConnectOptions.java b/src/main/java/io/vertx/redis/client/RedisSentinelConnectOptions.java index 157435c1..22181893 100644 --- a/src/main/java/io/vertx/redis/client/RedisSentinelConnectOptions.java +++ b/src/main/java/io/vertx/redis/client/RedisSentinelConnectOptions.java @@ -16,11 +16,13 @@ package io.vertx.redis.client; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import java.util.List; -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class RedisSentinelConnectOptions extends RedisConnectOptions { private RedisRole role; diff --git a/src/main/java/io/vertx/redis/client/RedisStandaloneConnectOptions.java b/src/main/java/io/vertx/redis/client/RedisStandaloneConnectOptions.java index a514662e..e00237b2 100644 --- a/src/main/java/io/vertx/redis/client/RedisStandaloneConnectOptions.java +++ b/src/main/java/io/vertx/redis/client/RedisStandaloneConnectOptions.java @@ -16,11 +16,13 @@ package io.vertx.redis.client; import io.vertx.codegen.annotations.DataObject; +import io.vertx.codegen.json.annotations.JsonGen; import io.vertx.core.json.JsonObject; import java.util.List; -@DataObject(generateConverter = true) +@DataObject +@JsonGen(publicConverter = false) public class RedisStandaloneConnectOptions extends RedisConnectOptions { public RedisStandaloneConnectOptions(RedisOptions options) {