Skip to content

Commit cbe76df

Browse files
vietjvietj
committed
Adapt to EventLoopContext interface removal
1 parent d55c915 commit cbe76df

File tree

5 files changed

+114
-115
lines changed

5 files changed

+114
-115
lines changed

‎src/main/generated/io/vertx/redis/client/PoolOptionsConverter.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ public class PoolOptionsConverter {
2020
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PoolOptions obj) {
2121
for (java.util.Map.Entry<String, Object> member : json) {
2222
switch (member.getKey()) {
23+
case "name":
24+
if (member.getValue() instanceof String) {
25+
obj.setName((String)member.getValue());
26+
}
27+
break;
2328
case "cleanerInterval":
2429
if (member.getValue() instanceof Number) {
2530
obj.setCleanerInterval(((Number)member.getValue()).intValue());
@@ -35,11 +40,6 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
3540
obj.setMaxWaiting(((Number)member.getValue()).intValue());
3641
}
3742
break;
38-
case "name":
39-
if (member.getValue() instanceof String) {
40-
obj.setName((String)member.getValue());
41-
}
42-
break;
4343
case "recycleTimeout":
4444
if (member.getValue() instanceof Number) {
4545
obj.setRecycleTimeout(((Number)member.getValue()).intValue());
@@ -54,12 +54,12 @@ public static void toJson(PoolOptions obj, JsonObject json) {
5454
}
5555

5656
public static void toJson(PoolOptions obj, java.util.Map<String, Object> json) {
57-
json.put("cleanerInterval", obj.getCleanerInterval());
58-
json.put("maxSize", obj.getMaxSize());
59-
json.put("maxWaiting", obj.getMaxWaiting());
6057
if (obj.getName() != null) {
6158
json.put("name", obj.getName());
6259
}
60+
json.put("cleanerInterval", obj.getCleanerInterval());
61+
json.put("maxSize", obj.getMaxSize());
62+
json.put("maxWaiting", obj.getMaxWaiting());
6363
json.put("recycleTimeout", obj.getRecycleTimeout());
6464
}
6565
}

‎src/main/generated/io/vertx/redis/client/RedisConnectOptionsConverter.java

+28-28
Original file line numberDiff line numberDiff line change
@@ -20,51 +20,51 @@ public class RedisConnectOptionsConverter {
2020
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, RedisConnectOptions obj) {
2121
for (java.util.Map.Entry<String, Object> member : json) {
2222
switch (member.getKey()) {
23-
case "connectionString":
23+
case "maxNestedArrays":
24+
if (member.getValue() instanceof Number) {
25+
obj.setMaxNestedArrays(((Number)member.getValue()).intValue());
26+
}
27+
break;
28+
case "protocolNegotiation":
29+
if (member.getValue() instanceof Boolean) {
30+
obj.setProtocolNegotiation((Boolean)member.getValue());
31+
}
32+
break;
33+
case "password":
2434
if (member.getValue() instanceof String) {
25-
obj.setConnectionString((String)member.getValue());
35+
obj.setPassword((String)member.getValue());
2636
}
2737
break;
28-
case "connectionStrings":
38+
case "endpoints":
2939
if (member.getValue() instanceof JsonArray) {
40+
java.util.ArrayList<java.lang.String> list = new java.util.ArrayList<>();
3041
((Iterable<Object>)member.getValue()).forEach( item -> {
3142
if (item instanceof String)
32-
obj.addConnectionString((String)item);
43+
list.add((String)item);
3344
});
45+
obj.setEndpoints(list);
3446
}
3547
break;
3648
case "endpoint":
3749
break;
38-
case "endpoints":
50+
case "connectionStrings":
3951
if (member.getValue() instanceof JsonArray) {
40-
java.util.ArrayList<java.lang.String> list = new java.util.ArrayList<>();
4152
((Iterable<Object>)member.getValue()).forEach( item -> {
4253
if (item instanceof String)
43-
list.add((String)item);
54+
obj.addConnectionString((String)item);
4455
});
45-
obj.setEndpoints(list);
4656
}
4757
break;
48-
case "maxNestedArrays":
49-
if (member.getValue() instanceof Number) {
50-
obj.setMaxNestedArrays(((Number)member.getValue()).intValue());
58+
case "connectionString":
59+
if (member.getValue() instanceof String) {
60+
obj.setConnectionString((String)member.getValue());
5161
}
5262
break;
5363
case "maxWaitingHandlers":
5464
if (member.getValue() instanceof Number) {
5565
obj.setMaxWaitingHandlers(((Number)member.getValue()).intValue());
5666
}
5767
break;
58-
case "password":
59-
if (member.getValue() instanceof String) {
60-
obj.setPassword((String)member.getValue());
61-
}
62-
break;
63-
case "protocolNegotiation":
64-
if (member.getValue() instanceof Boolean) {
65-
obj.setProtocolNegotiation((Boolean)member.getValue());
66-
}
67-
break;
6868
}
6969
}
7070
}
@@ -74,19 +74,19 @@ public static void toJson(RedisConnectOptions obj, JsonObject json) {
7474
}
7575

7676
public static void toJson(RedisConnectOptions obj, java.util.Map<String, Object> json) {
77-
if (obj.getEndpoint() != null) {
78-
json.put("endpoint", obj.getEndpoint());
77+
json.put("maxNestedArrays", obj.getMaxNestedArrays());
78+
json.put("protocolNegotiation", obj.isProtocolNegotiation());
79+
if (obj.getPassword() != null) {
80+
json.put("password", obj.getPassword());
7981
}
8082
if (obj.getEndpoints() != null) {
8183
JsonArray array = new JsonArray();
8284
obj.getEndpoints().forEach(item -> array.add(item));
8385
json.put("endpoints", array);
8486
}
85-
json.put("maxNestedArrays", obj.getMaxNestedArrays());
86-
json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers());
87-
if (obj.getPassword() != null) {
88-
json.put("password", obj.getPassword());
87+
if (obj.getEndpoint() != null) {
88+
json.put("endpoint", obj.getEndpoint());
8989
}
90-
json.put("protocolNegotiation", obj.isProtocolNegotiation());
90+
json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers());
9191
}
9292
}

‎src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java

+67-67
Original file line numberDiff line numberDiff line change
@@ -20,107 +20,107 @@ public class RedisOptionsConverter {
2020
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, RedisOptions obj) {
2121
for (java.util.Map.Entry<String, Object> member : json) {
2222
switch (member.getKey()) {
23-
case "connectionString":
23+
case "type":
2424
if (member.getValue() instanceof String) {
25-
obj.setConnectionString((String)member.getValue());
25+
obj.setType(io.vertx.redis.client.RedisClientType.valueOf((String)member.getValue()));
2626
}
2727
break;
28-
case "connectionStrings":
28+
case "netClientOptions":
29+
if (member.getValue() instanceof JsonObject) {
30+
obj.setNetClientOptions(new io.vertx.core.net.NetClientOptions((io.vertx.core.json.JsonObject)member.getValue()));
31+
}
32+
break;
33+
case "endpoints":
2934
if (member.getValue() instanceof JsonArray) {
35+
java.util.ArrayList<java.lang.String> list = new java.util.ArrayList<>();
3036
((Iterable<Object>)member.getValue()).forEach( item -> {
3137
if (item instanceof String)
32-
obj.addConnectionString((String)item);
38+
list.add((String)item);
3339
});
40+
obj.setEndpoints(list);
3441
}
3542
break;
3643
case "endpoint":
3744
if (member.getValue() instanceof String) {
3845
obj.setEndpoint((String)member.getValue());
3946
}
4047
break;
41-
case "endpoints":
48+
case "connectionStrings":
4249
if (member.getValue() instanceof JsonArray) {
43-
java.util.ArrayList<java.lang.String> list = new java.util.ArrayList<>();
4450
((Iterable<Object>)member.getValue()).forEach( item -> {
4551
if (item instanceof String)
46-
list.add((String)item);
52+
obj.addConnectionString((String)item);
4753
});
48-
obj.setEndpoints(list);
4954
}
5055
break;
51-
case "masterName":
56+
case "connectionString":
5257
if (member.getValue() instanceof String) {
53-
obj.setMasterName((String)member.getValue());
58+
obj.setConnectionString((String)member.getValue());
5459
}
5560
break;
56-
case "maxNestedArrays":
61+
case "maxWaitingHandlers":
5762
if (member.getValue() instanceof Number) {
58-
obj.setMaxNestedArrays(((Number)member.getValue()).intValue());
63+
obj.setMaxWaitingHandlers(((Number)member.getValue()).intValue());
5964
}
6065
break;
61-
case "maxPoolSize":
62-
if (member.getValue() instanceof Number) {
63-
obj.setMaxPoolSize(((Number)member.getValue()).intValue());
66+
case "masterName":
67+
if (member.getValue() instanceof String) {
68+
obj.setMasterName((String)member.getValue());
6469
}
6570
break;
66-
case "maxPoolWaiting":
67-
if (member.getValue() instanceof Number) {
68-
obj.setMaxPoolWaiting(((Number)member.getValue()).intValue());
71+
case "role":
72+
if (member.getValue() instanceof String) {
73+
obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue()));
6974
}
7075
break;
71-
case "maxWaitingHandlers":
72-
if (member.getValue() instanceof Number) {
73-
obj.setMaxWaitingHandlers(((Number)member.getValue()).intValue());
76+
case "useReplicas":
77+
if (member.getValue() instanceof String) {
78+
obj.setUseReplicas(io.vertx.redis.client.RedisReplicas.valueOf((String)member.getValue()));
7479
}
7580
break;
76-
case "netClientOptions":
77-
if (member.getValue() instanceof JsonObject) {
78-
obj.setNetClientOptions(new io.vertx.core.net.NetClientOptions((io.vertx.core.json.JsonObject)member.getValue()));
81+
case "maxNestedArrays":
82+
if (member.getValue() instanceof Number) {
83+
obj.setMaxNestedArrays(((Number)member.getValue()).intValue());
7984
}
8085
break;
81-
case "password":
86+
case "tracingPolicy":
8287
if (member.getValue() instanceof String) {
83-
obj.setPassword((String)member.getValue());
88+
obj.setTracingPolicy(io.vertx.core.tracing.TracingPolicy.valueOf((String)member.getValue()));
8489
}
8590
break;
8691
case "poolCleanerInterval":
8792
if (member.getValue() instanceof Number) {
8893
obj.setPoolCleanerInterval(((Number)member.getValue()).intValue());
8994
}
9095
break;
91-
case "poolName":
92-
if (member.getValue() instanceof String) {
93-
obj.setPoolName((String)member.getValue());
94-
}
95-
break;
96-
case "poolRecycleTimeout":
96+
case "maxPoolSize":
9797
if (member.getValue() instanceof Number) {
98-
obj.setPoolRecycleTimeout(((Number)member.getValue()).intValue());
98+
obj.setMaxPoolSize(((Number)member.getValue()).intValue());
9999
}
100100
break;
101-
case "protocolNegotiation":
102-
if (member.getValue() instanceof Boolean) {
103-
obj.setProtocolNegotiation((Boolean)member.getValue());
101+
case "maxPoolWaiting":
102+
if (member.getValue() instanceof Number) {
103+
obj.setMaxPoolWaiting(((Number)member.getValue()).intValue());
104104
}
105105
break;
106-
case "role":
107-
if (member.getValue() instanceof String) {
108-
obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue()));
106+
case "poolRecycleTimeout":
107+
if (member.getValue() instanceof Number) {
108+
obj.setPoolRecycleTimeout(((Number)member.getValue()).intValue());
109109
}
110110
break;
111-
case "tracingPolicy":
111+
case "password":
112112
if (member.getValue() instanceof String) {
113-
obj.setTracingPolicy(io.vertx.core.tracing.TracingPolicy.valueOf((String)member.getValue()));
113+
obj.setPassword((String)member.getValue());
114114
}
115115
break;
116-
case "type":
117-
if (member.getValue() instanceof String) {
118-
obj.setType(io.vertx.redis.client.RedisClientType.valueOf((String)member.getValue()));
116+
case "protocolNegotiation":
117+
if (member.getValue() instanceof Boolean) {
118+
obj.setProtocolNegotiation((Boolean)member.getValue());
119119
}
120120
break;
121-
case "useReplicas":
121+
case "poolName":
122122
if (member.getValue() instanceof String) {
123-
obj.setUseReplicas(io.vertx.redis.client.RedisReplicas.valueOf((String)member.getValue()));
123+
obj.setPoolName((String)member.getValue());
124124
}
125125
break;
126126
}
@@ -132,44 +132,44 @@ public static void toJson(RedisOptions obj, JsonObject json) {
132132
}
133133

134134
public static void toJson(RedisOptions obj, java.util.Map<String, Object> json) {
135-
if (obj.getEndpoint() != null) {
136-
json.put("endpoint", obj.getEndpoint());
135+
if (obj.getType() != null) {
136+
json.put("type", obj.getType().name());
137+
}
138+
if (obj.getNetClientOptions() != null) {
139+
json.put("netClientOptions", obj.getNetClientOptions().toJson());
137140
}
138141
if (obj.getEndpoints() != null) {
139142
JsonArray array = new JsonArray();
140143
obj.getEndpoints().forEach(item -> array.add(item));
141144
json.put("endpoints", array);
142145
}
146+
if (obj.getEndpoint() != null) {
147+
json.put("endpoint", obj.getEndpoint());
148+
}
149+
json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers());
143150
if (obj.getMasterName() != null) {
144151
json.put("masterName", obj.getMasterName());
145152
}
153+
if (obj.getRole() != null) {
154+
json.put("role", obj.getRole().name());
155+
}
156+
if (obj.getUseReplicas() != null) {
157+
json.put("useReplicas", obj.getUseReplicas().name());
158+
}
146159
json.put("maxNestedArrays", obj.getMaxNestedArrays());
160+
if (obj.getTracingPolicy() != null) {
161+
json.put("tracingPolicy", obj.getTracingPolicy().name());
162+
}
163+
json.put("poolCleanerInterval", obj.getPoolCleanerInterval());
147164
json.put("maxPoolSize", obj.getMaxPoolSize());
148165
json.put("maxPoolWaiting", obj.getMaxPoolWaiting());
149-
json.put("maxWaitingHandlers", obj.getMaxWaitingHandlers());
150-
if (obj.getNetClientOptions() != null) {
151-
json.put("netClientOptions", obj.getNetClientOptions().toJson());
152-
}
166+
json.put("poolRecycleTimeout", obj.getPoolRecycleTimeout());
153167
if (obj.getPassword() != null) {
154168
json.put("password", obj.getPassword());
155169
}
156-
json.put("poolCleanerInterval", obj.getPoolCleanerInterval());
170+
json.put("protocolNegotiation", obj.isProtocolNegotiation());
157171
if (obj.getPoolName() != null) {
158172
json.put("poolName", obj.getPoolName());
159173
}
160-
json.put("poolRecycleTimeout", obj.getPoolRecycleTimeout());
161-
json.put("protocolNegotiation", obj.isProtocolNegotiation());
162-
if (obj.getRole() != null) {
163-
json.put("role", obj.getRole().name());
164-
}
165-
if (obj.getTracingPolicy() != null) {
166-
json.put("tracingPolicy", obj.getTracingPolicy().name());
167-
}
168-
if (obj.getType() != null) {
169-
json.put("type", obj.getType().name());
170-
}
171-
if (obj.getUseReplicas() != null) {
172-
json.put("useReplicas", obj.getUseReplicas().name());
173-
}
174174
}
175175
}

‎src/main/generated/io/vertx/redis/client/RedisSentinelConnectOptionsConverter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public class RedisSentinelConnectOptionsConverter {
2020
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, RedisSentinelConnectOptions obj) {
2121
for (java.util.Map.Entry<String, Object> member : json) {
2222
switch (member.getKey()) {
23-
case "masterName":
23+
case "role":
2424
if (member.getValue() instanceof String) {
25-
obj.setMasterName((String)member.getValue());
25+
obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue()));
2626
}
2727
break;
28-
case "role":
28+
case "masterName":
2929
if (member.getValue() instanceof String) {
30-
obj.setRole(io.vertx.redis.client.RedisRole.valueOf((String)member.getValue()));
30+
obj.setMasterName((String)member.getValue());
3131
}
3232
break;
3333
}
@@ -39,11 +39,11 @@ public static void toJson(RedisSentinelConnectOptions obj, JsonObject json) {
3939
}
4040

4141
public static void toJson(RedisSentinelConnectOptions obj, java.util.Map<String, Object> json) {
42-
if (obj.getMasterName() != null) {
43-
json.put("masterName", obj.getMasterName());
44-
}
4542
if (obj.getRole() != null) {
4643
json.put("role", obj.getRole().name());
4744
}
45+
if (obj.getMasterName() != null) {
46+
json.put("masterName", obj.getMasterName());
47+
}
4848
}
4949
}

0 commit comments

Comments
 (0)