From 059ef61a32c46504826e4998e077fc632c466432 Mon Sep 17 00:00:00 2001 From: Craig Day Date: Thu, 21 Sep 2023 11:59:32 -0700 Subject: [PATCH] regenerate options converters --- .../client/CachingRedisOptionsConverter.java | 28 +-- .../redis/client/PoolOptionsConverter.java | 16 +- .../client/RedisConnectOptionsConverter.java | 56 +++--- .../redis/client/RedisOptionsConverter.java | 164 ++++++++++++------ .../RedisSentinelConnectOptionsConverter.java | 14 +- .../redis/client/CachingRedisOptions.java | 3 +- .../io/vertx/redis/client/RedisOptions.java | 5 +- 7 files changed, 177 insertions(+), 109 deletions(-) diff --git a/src/main/generated/io/vertx/redis/client/CachingRedisOptionsConverter.java b/src/main/generated/io/vertx/redis/client/CachingRedisOptionsConverter.java index 55c4d84f..9c3cdccf 100644 --- a/src/main/generated/io/vertx/redis/client/CachingRedisOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/CachingRedisOptionsConverter.java @@ -20,6 +20,16 @@ public class CachingRedisOptionsConverter { public static void fromJson(Iterable> json, CachingRedisOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { + case "enabled": + if (member.getValue() instanceof Boolean) { + obj.setEnabled((Boolean)member.getValue()); + } + break; + case "maxCacheSize": + if (member.getValue() instanceof Number) { + obj.setMaxCacheSize(((Number)member.getValue()).intValue()); + } + break; case "maxAge": if (member.getValue() instanceof Number) { obj.setMaxAge(((Number)member.getValue()).longValue()); @@ -30,21 +40,11 @@ public static void fromJson(Iterable> json, obj.setMaxAgeUnit(java.util.concurrent.TimeUnit.valueOf((String)member.getValue())); } break; - case "maxCacheSize": - if (member.getValue() instanceof Number) { - obj.setMaxCacheSize(((Number)member.getValue()).intValue()); - } - break; case "mode": if (member.getValue() instanceof String) { obj.setMode(io.vertx.redis.client.ClientSideCacheMode.valueOf((String)member.getValue())); } break; - case "prefix": - if (member.getValue() instanceof String) { - obj.setPrefix((String)member.getValue()); - } - break; case "prefixes": if (member.getValue() instanceof JsonArray) { java.util.ArrayList list = new java.util.ArrayList<>(); @@ -55,6 +55,11 @@ public static void fromJson(Iterable> json, obj.setPrefixes(list); } break; + case "prefix": + if (member.getValue() instanceof String) { + obj.setPrefix((String)member.getValue()); + } + break; case "prefixs": if (member.getValue() instanceof JsonArray) { ((Iterable)member.getValue()).forEach( item -> { @@ -72,11 +77,12 @@ public static void toJson(CachingRedisOptions obj, JsonObject json) { } public static void toJson(CachingRedisOptions obj, java.util.Map json) { + json.put("enabled", obj.getEnabled()); + json.put("maxCacheSize", obj.getMaxCacheSize()); json.put("maxAge", obj.getMaxAge()); if (obj.getMaxAgeUnit() != null) { json.put("maxAgeUnit", obj.getMaxAgeUnit().name()); } - json.put("maxCacheSize", obj.getMaxCacheSize()); if (obj.getMode() != null) { json.put("mode", obj.getMode().name()); } diff --git a/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java b/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java index 653724b6..78af21c7 100644 --- a/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java @@ -20,6 +20,11 @@ public class PoolOptionsConverter { public static void fromJson(Iterable> json, PoolOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { + case "name": + if (member.getValue() instanceof String) { + obj.setName((String)member.getValue()); + } + break; case "cleanerInterval": if (member.getValue() instanceof Number) { obj.setCleanerInterval(((Number)member.getValue()).intValue()); @@ -35,11 +40,6 @@ public static void fromJson(Iterable> json, obj.setMaxWaiting(((Number)member.getValue()).intValue()); } break; - case "name": - if (member.getValue() instanceof String) { - obj.setName((String)member.getValue()); - } - break; case "recycleTimeout": if (member.getValue() instanceof Number) { obj.setRecycleTimeout(((Number)member.getValue()).intValue()); @@ -54,12 +54,12 @@ public static void toJson(PoolOptions obj, JsonObject json) { } public static void toJson(PoolOptions obj, java.util.Map json) { - json.put("cleanerInterval", obj.getCleanerInterval()); - json.put("maxSize", obj.getMaxSize()); - json.put("maxWaiting", obj.getMaxWaiting()); if (obj.getName() != null) { json.put("name", obj.getName()); } + json.put("cleanerInterval", obj.getCleanerInterval()); + json.put("maxSize", obj.getMaxSize()); + json.put("maxWaiting", obj.getMaxWaiting()); json.put("recycleTimeout", obj.getRecycleTimeout()); } } diff --git a/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java index 154d8119..20d4f4d2 100644 --- a/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java @@ -20,34 +20,44 @@ public class RedisConnectOptionsConverter { public static void fromJson(Iterable> json, RedisConnectOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { - case "connectionString": + case "maxNestedArrays": + if (member.getValue() instanceof Number) { + obj.setMaxNestedArrays(((Number)member.getValue()).intValue()); + } + break; + case "protocolNegotiation": + if (member.getValue() instanceof Boolean) { + obj.setProtocolNegotiation((Boolean)member.getValue()); + } + break; + case "password": if (member.getValue() instanceof String) { - obj.setConnectionString((String)member.getValue()); + obj.setPassword((String)member.getValue()); } break; - case "connectionStrings": + case "endpoints": if (member.getValue() instanceof JsonArray) { + java.util.ArrayList list = new java.util.ArrayList<>(); ((Iterable)member.getValue()).forEach( item -> { if (item instanceof String) - obj.addConnectionString((String)item); + list.add((String)item); }); + obj.setEndpoints(list); } break; case "endpoint": break; - case "endpoints": + case "connectionStrings": if (member.getValue() instanceof JsonArray) { - java.util.ArrayList list = new java.util.ArrayList<>(); ((Iterable)member.getValue()).forEach( item -> { if (item instanceof String) - list.add((String)item); + obj.addConnectionString((String)item); }); - obj.setEndpoints(list); } break; - case "maxNestedArrays": - if (member.getValue() instanceof Number) { - obj.setMaxNestedArrays(((Number)member.getValue()).intValue()); + case "connectionString": + if (member.getValue() instanceof String) { + obj.setConnectionString((String)member.getValue()); } break; case "maxWaitingHandlers": @@ -55,16 +65,6 @@ public static void fromJson(Iterable> json, obj.setMaxWaitingHandlers(((Number)member.getValue()).intValue()); } break; - case "password": - if (member.getValue() instanceof String) { - obj.setPassword((String)member.getValue()); - } - break; - case "protocolNegotiation": - if (member.getValue() instanceof Boolean) { - obj.setProtocolNegotiation((Boolean)member.getValue()); - } - break; } } } @@ -74,19 +74,19 @@ public static void toJson(RedisConnectOptions obj, JsonObject json) { } public static void toJson(RedisConnectOptions obj, java.util.Map json) { - if (obj.getEndpoint() != null) { - json.put("endpoint", obj.getEndpoint()); + json.put("maxNestedArrays", obj.getMaxNestedArrays()); + json.put("protocolNegotiation", obj.isProtocolNegotiation()); + if (obj.getPassword() != null) { + json.put("password", obj.getPassword()); } if (obj.getEndpoints() != null) { JsonArray array = new JsonArray(); obj.getEndpoints().forEach(item -> array.add(item)); json.put("endpoints", array); } - json.put("maxNestedArrays", obj.getMaxNestedArrays()); - json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers()); - if (obj.getPassword() != null) { - json.put("password", obj.getPassword()); + if (obj.getEndpoint() != null) { + json.put("endpoint", obj.getEndpoint()); } - json.put("protocolNegotiation", obj.isProtocolNegotiation()); + json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers()); } } diff --git a/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java index 7d00ea23..0f541e74 100644 --- a/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java @@ -20,17 +20,24 @@ public class RedisOptionsConverter { public static void fromJson(Iterable> json, RedisOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { - case "connectionString": + case "type": if (member.getValue() instanceof String) { - obj.setConnectionString((String)member.getValue()); + obj.setType(io.vertx.redis.client.RedisClientType.valueOf((String)member.getValue())); } break; - case "connectionStrings": + case "netClientOptions": + if (member.getValue() instanceof JsonObject) { + obj.setNetClientOptions(new io.vertx.core.net.NetClientOptions((io.vertx.core.json.JsonObject)member.getValue())); + } + break; + case "endpoints": if (member.getValue() instanceof JsonArray) { + java.util.ArrayList list = new java.util.ArrayList<>(); ((Iterable)member.getValue()).forEach( item -> { if (item instanceof String) - obj.addConnectionString((String)item); + list.add((String)item); }); + obj.setEndpoints(list); } break; case "endpoint": @@ -38,14 +45,22 @@ public static void fromJson(Iterable> json, obj.setEndpoint((String)member.getValue()); } break; - case "endpoints": + case "connectionStrings": if (member.getValue() instanceof JsonArray) { - java.util.ArrayList list = new java.util.ArrayList<>(); ((Iterable)member.getValue()).forEach( item -> { if (item instanceof String) - list.add((String)item); + obj.addConnectionString((String)item); }); - obj.setEndpoints(list); + } + break; + case "connectionString": + if (member.getValue() instanceof String) { + obj.setConnectionString((String)member.getValue()); + } + break; + case "maxWaitingHandlers": + if (member.getValue() instanceof Number) { + obj.setMaxWaitingHandlers(((Number)member.getValue()).intValue()); } break; case "masterName": @@ -53,11 +68,31 @@ public static void fromJson(Iterable> json, obj.setMasterName((String)member.getValue()); } break; + case "role": + if (member.getValue() instanceof String) { + obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue())); + } + break; + case "useReplicas": + if (member.getValue() instanceof String) { + obj.setUseReplicas(io.vertx.redis.client.RedisReplicas.valueOf((String)member.getValue())); + } + break; case "maxNestedArrays": if (member.getValue() instanceof Number) { obj.setMaxNestedArrays(((Number)member.getValue()).intValue()); } break; + case "tracingPolicy": + if (member.getValue() instanceof String) { + obj.setTracingPolicy(io.vertx.core.tracing.TracingPolicy.valueOf((String)member.getValue())); + } + break; + case "poolCleanerInterval": + if (member.getValue() instanceof Number) { + obj.setPoolCleanerInterval(((Number)member.getValue()).intValue()); + } + break; case "maxPoolSize": if (member.getValue() instanceof Number) { obj.setMaxPoolSize(((Number)member.getValue()).intValue()); @@ -68,14 +103,9 @@ public static void fromJson(Iterable> json, obj.setMaxPoolWaiting(((Number)member.getValue()).intValue()); } break; - case "maxWaitingHandlers": + case "poolRecycleTimeout": if (member.getValue() instanceof Number) { - obj.setMaxWaitingHandlers(((Number)member.getValue()).intValue()); - } - break; - case "netClientOptions": - if (member.getValue() instanceof JsonObject) { - obj.setNetClientOptions(new io.vertx.core.net.NetClientOptions((io.vertx.core.json.JsonObject)member.getValue())); + obj.setPoolRecycleTimeout(((Number)member.getValue()).intValue()); } break; case "password": @@ -83,9 +113,9 @@ public static void fromJson(Iterable> json, obj.setPassword((String)member.getValue()); } break; - case "poolCleanerInterval": - if (member.getValue() instanceof Number) { - obj.setPoolCleanerInterval(((Number)member.getValue()).intValue()); + case "protocolNegotiation": + if (member.getValue() instanceof Boolean) { + obj.setProtocolNegotiation((Boolean)member.getValue()); } break; case "poolName": @@ -93,34 +123,54 @@ public static void fromJson(Iterable> json, obj.setPoolName((String)member.getValue()); } break; - case "poolRecycleTimeout": + case "cachingOptions": + break; + case "cacheEnabled": + if (member.getValue() instanceof Boolean) { + obj.setCacheEnabled((Boolean)member.getValue()); + } + break; + case "cacheMaxSize": if (member.getValue() instanceof Number) { - obj.setPoolRecycleTimeout(((Number)member.getValue()).intValue()); + obj.setCacheMaxSize(((Number)member.getValue()).intValue()); } break; - case "protocolNegotiation": - if (member.getValue() instanceof Boolean) { - obj.setProtocolNegotiation((Boolean)member.getValue()); + case "cacheMaxAge": + if (member.getValue() instanceof Number) { + obj.setCacheMaxAge(((Number)member.getValue()).longValue()); } break; - case "role": + case "cacheMaxAgeUnit": if (member.getValue() instanceof String) { - obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue())); + obj.setCacheMaxAgeUnit(java.util.concurrent.TimeUnit.valueOf((String)member.getValue())); } break; - case "tracingPolicy": + case "cacheMode": if (member.getValue() instanceof String) { - obj.setTracingPolicy(io.vertx.core.tracing.TracingPolicy.valueOf((String)member.getValue())); + obj.setCacheMode(io.vertx.redis.client.ClientSideCacheMode.valueOf((String)member.getValue())); } break; - case "type": - if (member.getValue() instanceof String) { - obj.setType(io.vertx.redis.client.RedisClientType.valueOf((String)member.getValue())); + case "cachePrefixes": + if (member.getValue() instanceof JsonArray) { + java.util.ArrayList list = new java.util.ArrayList<>(); + ((Iterable)member.getValue()).forEach( item -> { + if (item instanceof String) + list.add((String)item); + }); + obj.setCachePrefixes(list); } break; - case "useReplicas": + case "cachePrefix": if (member.getValue() instanceof String) { - obj.setUseReplicas(io.vertx.redis.client.RedisReplicas.valueOf((String)member.getValue())); + obj.setCachePrefix((String)member.getValue()); + } + break; + case "cachePrefixs": + if (member.getValue() instanceof JsonArray) { + ((Iterable)member.getValue()).forEach( item -> { + if (item instanceof String) + obj.addCachePrefix((String)item); + }); } break; } @@ -132,44 +182,58 @@ public static void toJson(RedisOptions obj, JsonObject json) { } public static void toJson(RedisOptions obj, java.util.Map json) { - if (obj.getEndpoint() != null) { - json.put("endpoint", obj.getEndpoint()); + if (obj.getType() != null) { + json.put("type", obj.getType().name()); + } + if (obj.getNetClientOptions() != null) { + json.put("netClientOptions", obj.getNetClientOptions().toJson()); } if (obj.getEndpoints() != null) { JsonArray array = new JsonArray(); obj.getEndpoints().forEach(item -> array.add(item)); json.put("endpoints", array); } + if (obj.getEndpoint() != null) { + json.put("endpoint", obj.getEndpoint()); + } + json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers()); if (obj.getMasterName() != null) { json.put("masterName", obj.getMasterName()); } + if (obj.getRole() != null) { + json.put("role", obj.getRole().name()); + } + if (obj.getUseReplicas() != null) { + json.put("useReplicas", obj.getUseReplicas().name()); + } json.put("maxNestedArrays", obj.getMaxNestedArrays()); + if (obj.getTracingPolicy() != null) { + json.put("tracingPolicy", obj.getTracingPolicy().name()); + } + json.put("poolCleanerInterval", obj.getPoolCleanerInterval()); json.put("maxPoolSize", obj.getMaxPoolSize()); json.put("maxPoolWaiting", obj.getMaxPoolWaiting()); - json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers()); - if (obj.getNetClientOptions() != null) { - json.put("netClientOptions", obj.getNetClientOptions().toJson()); - } + json.put("poolRecycleTimeout", obj.getPoolRecycleTimeout()); if (obj.getPassword() != null) { json.put("password", obj.getPassword()); } - json.put("poolCleanerInterval", obj.getPoolCleanerInterval()); + json.put("protocolNegotiation", obj.isProtocolNegotiation()); if (obj.getPoolName() != null) { json.put("poolName", obj.getPoolName()); } - json.put("poolRecycleTimeout", obj.getPoolRecycleTimeout()); - json.put("protocolNegotiation", obj.isProtocolNegotiation()); - if (obj.getRole() != null) { - json.put("role", obj.getRole().name()); + json.put("cacheEnabled", obj.getCacheEnabled()); + json.put("cacheMaxSize", obj.getCacheMaxSize()); + json.put("cacheMaxAge", obj.getCacheMaxAge()); + if (obj.getCacheMaxAgeUnit() != null) { + json.put("cacheMaxAgeUnit", obj.getCacheMaxAgeUnit().name()); } - if (obj.getTracingPolicy() != null) { - json.put("tracingPolicy", obj.getTracingPolicy().name()); - } - if (obj.getType() != null) { - json.put("type", obj.getType().name()); + if (obj.getCacheMode() != null) { + json.put("cacheMode", obj.getCacheMode().name()); } - if (obj.getUseReplicas() != null) { - json.put("useReplicas", obj.getUseReplicas().name()); + if (obj.getCachePrefixes() != null) { + JsonArray array = new JsonArray(); + obj.getCachePrefixes().forEach(item -> array.add(item)); + json.put("cachePrefixes", array); } } } diff --git a/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java index 7ef7a1b8..ccf9b0fd 100644 --- a/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java @@ -20,14 +20,14 @@ public class RedisSentinelConnectOptionsConverter { public static void fromJson(Iterable> json, RedisSentinelConnectOptions obj) { for (java.util.Map.Entry member : json) { switch (member.getKey()) { - case "masterName": + case "role": if (member.getValue() instanceof String) { - obj.setMasterName((String)member.getValue()); + obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue())); } break; - case "role": + case "masterName": if (member.getValue() instanceof String) { - obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue())); + obj.setMasterName((String)member.getValue()); } break; } @@ -39,11 +39,11 @@ public static void toJson(RedisSentinelConnectOptions obj, JsonObject json) { } public static void toJson(RedisSentinelConnectOptions obj, java.util.Map json) { - if (obj.getMasterName() != null) { - json.put("masterName", obj.getMasterName()); - } if (obj.getRole() != null) { json.put("role", obj.getRole().name()); } + if (obj.getMasterName() != null) { + json.put("masterName", obj.getMasterName()); + } } } diff --git a/src/main/java/io/vertx/redis/client/CachingRedisOptions.java b/src/main/java/io/vertx/redis/client/CachingRedisOptions.java index c2672ac5..2bbc469f 100644 --- a/src/main/java/io/vertx/redis/client/CachingRedisOptions.java +++ b/src/main/java/io/vertx/redis/client/CachingRedisOptions.java @@ -19,7 +19,6 @@ import io.vertx.core.json.JsonObject; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; @@ -196,7 +195,7 @@ public List getPrefixes() { * @param prefixes the prefix list * @return fluent self */ - public CachingRedisOptions setPrefixes(Collection prefixes) { + public CachingRedisOptions setPrefixes(List prefixes) { this.prefixes.clear(); this.prefixes.addAll(prefixes); return this; diff --git a/src/main/java/io/vertx/redis/client/RedisOptions.java b/src/main/java/io/vertx/redis/client/RedisOptions.java index 5876a4b6..9feac4a5 100644 --- a/src/main/java/io/vertx/redis/client/RedisOptions.java +++ b/src/main/java/io/vertx/redis/client/RedisOptions.java @@ -23,7 +23,6 @@ import io.vertx.redis.client.impl.RedisURI; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; @@ -632,9 +631,9 @@ public List getCachePrefixes() { } /** - * @see CachingRedisOptions#setPrefixes(Collection) + * @see CachingRedisOptions#setPrefixes(List) */ - public RedisOptions setCachePrefixes(Collection cachePrefixes) { + public RedisOptions setCachePrefixes(List cachePrefixes) { cachingOptions.setPrefixes(cachePrefixes); return this; }