Skip to content

Commit 57f466b

Browse files
simbahebinbosimbahebinbo
committed
升级 redis 版本和依赖包版本
1 parent 9fa7a12 commit 57f466b

15 files changed

+160
-159
lines changed

‎src/test/java/redis/embedded/JedisBaseTest.java

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ protected void writeSuccess(Jedis jedis) {
2929
}
3030

3131
private void msetSuccess(Jedis jedis) {
32-
key1 = RandomStringUtils.randomAlphabetic(5, 100);
33-
key2 = RandomStringUtils.randomAlphabetic(5, 100);
34-
key3 = RandomStringUtils.randomAlphabetic(5, 100);
32+
key1 = RandomStringUtils.secure().nextAlphabetic(5, 100);
33+
key2 = RandomStringUtils.secure().nextAlphabetic(5, 100);
34+
key3 = RandomStringUtils.secure().nextAlphabetic(5, 100);
3535

36-
value1 = RandomStringUtils.randomAlphanumeric(5, 100);
37-
value2 = RandomStringUtils.randomAlphanumeric(5, 100);
38-
value3 = RandomStringUtils.randomAlphanumeric(5, 100);
36+
value1 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
37+
value2 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
38+
value3 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
3939

4040
log.info("key1:" + key1 + " value1:" + value1);
4141
log.info("key2:" + key2 + " value2:" + value2);
@@ -45,13 +45,13 @@ private void msetSuccess(Jedis jedis) {
4545
}
4646

4747
private void setSuccess(Jedis jedis) {
48-
key4 = RandomStringUtils.randomAlphabetic(5, 100);
49-
key5 = RandomStringUtils.randomAlphabetic(5, 100);
50-
key6 = RandomStringUtils.randomAlphabetic(5, 100);
48+
key4 = RandomStringUtils.secure().nextAlphabetic(5, 100);
49+
key5 = RandomStringUtils.secure().nextAlphabetic(5, 100);
50+
key6 = RandomStringUtils.secure().nextAlphabetic(5, 100);
5151

52-
value4 = RandomStringUtils.randomAlphanumeric(5, 100);
53-
value5 = RandomStringUtils.randomAlphanumeric(5, 100);
54-
value6 = RandomStringUtils.randomAlphanumeric(5, 100);
52+
value4 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
53+
value5 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
54+
value6 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
5555

5656
log.info("key4:" + key4 + " value4:" + value4);
5757
log.info("key5:" + key5 + " value5:" + value5);
@@ -67,27 +67,27 @@ protected void writeFail(Jedis jedis) {
6767
}
6868

6969
private void msetFail(Jedis jedis) {
70-
key1 = RandomStringUtils.randomAlphabetic(5, 100);
71-
key2 = RandomStringUtils.randomAlphabetic(5, 100);
72-
key3 = RandomStringUtils.randomAlphabetic(5, 100);
70+
key1 = RandomStringUtils.secure().nextAlphabetic(5, 100);
71+
key2 = RandomStringUtils.secure().nextAlphabetic(5, 100);
72+
key3 = RandomStringUtils.secure().nextAlphabetic(5, 100);
7373

74-
value1 = RandomStringUtils.randomAlphanumeric(5, 100);
75-
value2 = RandomStringUtils.randomAlphanumeric(5, 100);
76-
value3 = RandomStringUtils.randomAlphanumeric(5, 100);
74+
value1 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
75+
value2 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
76+
value3 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
7777
log.info("key1:" + key1 + " value1:" + value1);
7878
log.info("key2:" + key2 + " value2:" + value2);
7979
log.info("key3:" + key3 + " value3:" + value3);
8080
Assertions.assertThrows(Exception.class, () -> jedis.mset(key1, value1, key2, value2));
8181
}
8282

8383
private void setFail(Jedis jedis) {
84-
key4 = RandomStringUtils.randomAlphabetic(5, 100);
85-
key5 = RandomStringUtils.randomAlphabetic(5, 100);
86-
key6 = RandomStringUtils.randomAlphabetic(5, 100);
84+
key4 = RandomStringUtils.secure().nextAlphabetic(5, 100);
85+
key5 = RandomStringUtils.secure().nextAlphabetic(5, 100);
86+
key6 = RandomStringUtils.secure().nextAlphabetic(5, 100);
8787

88-
value4 = RandomStringUtils.randomAlphanumeric(5, 100);
89-
value5 = RandomStringUtils.randomAlphanumeric(5, 100);
90-
value6 = RandomStringUtils.randomAlphanumeric(5, 100);
88+
value4 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
89+
value5 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
90+
value6 = RandomStringUtils.secure().nextAlphanumeric(5, 100);
9191
log.info("key4:" + key4 + " value4:" + value4);
9292
log.info("key5:" + key5 + " value5:" + value5);
9393
log.info("key6:" + key6 + " value6:" + value6);
@@ -109,9 +109,9 @@ private void mgetSuccess(Jedis jedis) {
109109
log.info("key1:" + key1 + " value1:" + value1);
110110
log.info("key2:" + key2 + " value2:" + value2);
111111
log.info("key3:" + key3 + " value3:" + value3);
112-
String newValue1 = jedis.mget(key1).get(0);
113-
String newValue2 = jedis.mget(key2).get(0);
114-
String newValue3 = jedis.mget(key3).get(0);
112+
String newValue1 = jedis.mget(key1).getFirst();
113+
String newValue2 = jedis.mget(key2).getFirst();
114+
String newValue3 = jedis.mget(key3).getFirst();
115115
log.info("key1:" + key1 + " newValue1:" + newValue1);
116116
log.info("key2:" + key2 + " newValue2:" + newValue2);
117117
log.info("key3:" + key3 + " newValue3:" + newValue3);
@@ -176,9 +176,9 @@ private void mgetNothing(Jedis jedis) {
176176
log.info("key2:" + key2 + " value2:" + value2);
177177
log.info("key3:" + key3 + " value3:" + value3);
178178

179-
String newValue1 = jedis.mget(key1).get(0);
180-
String newValue2 = jedis.mget(key2).get(0);
181-
String newValue3 = jedis.mget(key3).get(0);
179+
String newValue1 = jedis.mget(key1).getFirst();
180+
String newValue2 = jedis.mget(key2).getFirst();
181+
String newValue3 = jedis.mget(key3).getFirst();
182182
log.info("key1:" + key1 + " newValue1:" + newValue1);
183183
log.info("key2:" + key2 + " newValue2:" + newValue2);
184184
log.info("key3:" + key3 + " newValue3:" + newValue3);

‎src/test/java/redis/embedded/ModeBunchTest.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public void setUp() {
3535
masterName2 = RandomStringUtils.secure().nextAlphabetic(50, 100);
3636
masterName3 = RandomStringUtils.secure().nextAlphabetic(50, 100);
3737
sentinelHost = CommonConstant.DEFAULT_REDIS_HOST;
38-
sentinelPort = RandomUtils.secure().randomInt(10001, 11000);
38+
sentinelPort = (Integer) RandomUtils.secure().randomInt(10001, 11000);
3939
serverHost = CommonConstant.DEFAULT_REDIS_HOST;
40-
serverPort = RandomUtils.secure().randomInt(11001, 12000);
40+
serverPort = (Integer) RandomUtils.secure().randomInt(11001, 12000);
4141
}
4242

4343
@Test
@@ -47,7 +47,7 @@ public void testSimpleOperationsAfterRunWithSingleMasterNoSlave() {
4747
RedisBunch redisBunch =
4848
RedisBunch.builder()
4949
.sentinelPorts(sentinelPorts)
50-
.replicationGroup(masterName, 0)
50+
.replicationGroup(masterName, (Integer) 0)
5151
.build();
5252
redisBunch.start();
5353

@@ -69,7 +69,7 @@ public void testSimpleOperationsAfterRunWithSingleMasterSingleSlave() {
6969
RedisBunch redisBunch =
7070
RedisBunch.builder()
7171
.sentinelPorts(sentinelPorts)
72-
.replicationGroup(masterName, 1)
72+
.replicationGroup(masterName, (Integer) 1)
7373
.build();
7474
redisBunch.start();
7575

@@ -91,7 +91,7 @@ public void testSimpleOperationsAfterRunWithSingleMasterMultipleSlaves() {
9191
RedisBunch redisBunch =
9292
RedisBunch.builder()
9393
.sentinelPorts(sentinelPorts)
94-
.replicationGroup(masterName, 2)
94+
.replicationGroup(masterName, (Integer) 2)
9595
.build();
9696
redisBunch.start();
9797

@@ -109,14 +109,14 @@ public void testSimpleOperationsAfterRunWithSingleMasterMultipleSlaves() {
109109
@Test
110110
public void testSimpleOperationsAfterRunWithTwoSentinelsSingleMasterMultipleSlaves() {
111111
Integer sentinelPort1 = sentinelPort;
112-
Integer sentinelPort2 = sentinelPort + 1;
112+
Integer sentinelPort2 = (Integer) (sentinelPort + 1);
113113

114114
Set<Integer> sentinelPorts = Set.of(sentinelPort1, sentinelPort2);
115115

116116
RedisBunch redisBunch =
117117
RedisBunch.builder()
118118
.sentinelPorts(sentinelPorts)
119-
.replicationGroup(masterName, 2)
119+
.replicationGroup(masterName, (Integer) 2)
120120
.build();
121121
redisBunch.start();
122122

@@ -134,14 +134,14 @@ public void testSimpleOperationsAfterRunWithTwoSentinelsSingleMasterMultipleSlav
134134
@Test
135135
public void testSimpleOperationsAfterRunWithTwoPredefinedSentinelsSingleMasterMultipleSlaves() {
136136
Integer sentinelPort1 = sentinelPort;
137-
Integer sentinelPort2 = sentinelPort + 1;
137+
Integer sentinelPort2 = (Integer) (sentinelPort + 1);
138138

139139
Set<Integer> sentinelPorts = Set.of(sentinelPort1, sentinelPort2);
140140

141141
RedisBunch redisBunch =
142142
RedisBunch.builder()
143143
.sentinelPorts(sentinelPorts)
144-
.replicationGroup(masterName, 2)
144+
.replicationGroup(masterName, (Integer) 2)
145145
.build();
146146
redisBunch.start();
147147

@@ -159,18 +159,18 @@ public void testSimpleOperationsAfterRunWithTwoPredefinedSentinelsSingleMasterMu
159159
@Test
160160
public void testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersSingleSlavePerMaster() {
161161
Integer sentinelPort1 = sentinelPort;
162-
Integer sentinelPort2 = sentinelPort + 1;
163-
Integer sentinelPort3 = sentinelPort + 2;
162+
Integer sentinelPort2 = (Integer) (sentinelPort + 1);
163+
Integer sentinelPort3 = (Integer) (sentinelPort + 2);
164164

165165
Set<Integer> sentinelPorts = Set.of(sentinelPort1, sentinelPort2, sentinelPort3);
166166

167167
RedisBunch redisBunch =
168168
RedisBunch.builder()
169169
.sentinelPorts(sentinelPorts)
170-
.quorumSize(2)
171-
.replicationGroup(masterName1, 1)
172-
.replicationGroup(masterName2, 1)
173-
.replicationGroup(masterName3, 1)
170+
.quorumSize((Integer) 2)
171+
.replicationGroup(masterName1, (Integer) 1)
172+
.replicationGroup(masterName2, (Integer) 1)
173+
.replicationGroup(masterName3, (Integer) 1)
174174
.build();
175175
redisBunch.start();
176176

@@ -200,19 +200,19 @@ public void testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersSingleSlav
200200
public void
201201
testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersSingleSlavePerMasterEphemeral() {
202202
Integer sentinelPort1 = sentinelPort;
203-
Integer sentinelPort2 = sentinelPort + 1;
204-
Integer sentinelPort3 = sentinelPort + 2;
203+
Integer sentinelPort2 = (Integer) (sentinelPort + 1);
204+
Integer sentinelPort3 = (Integer) (sentinelPort + 2);
205205

206206
Set<Integer> sentinelPorts = Set.of(sentinelPort1, sentinelPort2, sentinelPort3);
207207

208208
RedisBunch redisBunch =
209209
RedisBunch.builder()
210210
.ephemeral()
211211
.sentinelPorts(sentinelPorts)
212-
.quorumSize(2)
213-
.replicationGroup(masterName1, 1)
214-
.replicationGroup(masterName2, 1)
215-
.replicationGroup(masterName3, 1)
212+
.quorumSize((Integer) 2)
213+
.replicationGroup(masterName1, (Integer) 1)
214+
.replicationGroup(masterName2, (Integer) 1)
215+
.replicationGroup(masterName3, (Integer) 1)
216216
.build();
217217
redisBunch.start();
218218

@@ -243,18 +243,18 @@ public void testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersSingleSlav
243243
public void
244244
testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersTwoSlavePerMaster() {
245245
Integer sentinelPort1 = sentinelPort;
246-
Integer sentinelPort2 = sentinelPort + 1;
247-
Integer sentinelPort3 = sentinelPort + 2;
246+
Integer sentinelPort2 = (Integer) (sentinelPort + 1);
247+
Integer sentinelPort3 = (Integer) (sentinelPort + 2);
248248

249249
Integer serverPort1 = serverPort;
250-
Integer serverPort2 = serverPort + 1;
251-
Integer serverPort3 = serverPort + 2;
252-
Integer serverPort4 = serverPort + 3;
253-
Integer serverPort5 = serverPort + 4;
254-
Integer serverPort6 = serverPort + 5;
255-
Integer serverPort7 = serverPort + 6;
256-
Integer serverPort8 = serverPort + 7;
257-
Integer serverPort9 = serverPort + 8;
250+
Integer serverPort2 = (Integer) (serverPort + 1);
251+
Integer serverPort3 = (Integer) (serverPort + 2);
252+
Integer serverPort4 = (Integer) (serverPort + 3);
253+
Integer serverPort5 = (Integer) (serverPort + 4);
254+
Integer serverPort6 = (Integer) (serverPort + 5);
255+
Integer serverPort7 = (Integer) (serverPort + 6);
256+
Integer serverPort8 = (Integer) (serverPort + 7);
257+
Integer serverPort9 = (Integer) (serverPort + 8);
258258

259259

260260
Set<Integer> sentinelPorts = Set.of(sentinelPort1, sentinelPort2, sentinelPort3);
@@ -266,10 +266,10 @@ public void testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersSingleSlav
266266
RedisBunch.builder()
267267
.ephemeral()
268268
.sentinelPorts(sentinelPorts)
269-
.quorumSize(2)
270-
.serverPorts(serverPorts1).replicationGroup(masterName1, 2)
271-
.serverPorts(serverPorts2).replicationGroup(masterName2, 2)
272-
.serverPorts(serverPorts3).replicationGroup(masterName3, 2)
269+
.quorumSize((Integer) 2)
270+
.serverPorts(serverPorts1).replicationGroup(masterName1, (Integer) 2)
271+
.serverPorts(serverPorts2).replicationGroup(masterName2, (Integer) 2)
272+
.serverPorts(serverPorts3).replicationGroup(masterName3, (Integer) 2)
273273
.build();
274274
redisBunch.start();
275275

‎src/test/java/redis/embedded/ModeClusterTest.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,45 @@
1818
@Slf4j
1919
@NotThreadSafe
2020
public class ModeClusterTest extends JedisClusterBaseTest {
21-
private int nodePort1;
21+
private Integer nodePort1;
2222
private String nodeHost1;
2323

24-
private int nodePort2;
24+
private Integer nodePort2;
2525
private String nodeHost2;
2626

27-
private int nodePort3;
27+
private Integer nodePort3;
2828
private String nodeHost3;
2929

30-
private int nodePort4;
30+
private Integer nodePort4;
3131
private String nodeHost4;
3232

33-
private int nodePort5;
33+
private Integer nodePort5;
3434
private String nodeHost5;
3535

36-
private int nodePort6;
36+
private Integer nodePort6;
3737
private String nodeHost6;
3838

39-
private int nodePort7;
39+
private Integer nodePort7;
4040
private String nodeHost7;
4141

4242

4343
@BeforeEach
4444
public void setUp() {
4545
super.setUp();
4646
nodeHost1 = CommonConstant.DEFAULT_REDIS_HOST;
47-
nodePort1 = RandomUtils.secure().randomInt(10001, 11000);
47+
nodePort1 = (Integer) RandomUtils.secure().randomInt(10001, 11000);
4848
nodeHost2 = CommonConstant.DEFAULT_REDIS_HOST;
49-
nodePort2 = RandomUtils.secure().randomInt(11001, 12000);
49+
nodePort2 = (Integer) RandomUtils.secure().randomInt(11001, 12000);
5050
nodeHost3 = CommonConstant.DEFAULT_REDIS_HOST;
51-
nodePort3 = RandomUtils.secure().randomInt(12001, 13000);
51+
nodePort3 = (Integer) RandomUtils.secure().randomInt(12001, 13000);
5252
nodeHost4 = CommonConstant.DEFAULT_REDIS_HOST;
53-
nodePort4 = RandomUtils.secure().randomInt(13001, 14000);
53+
nodePort4 = (Integer) RandomUtils.secure().randomInt(13001, 14000);
5454
nodeHost5 = CommonConstant.DEFAULT_REDIS_HOST;
55-
nodePort5 = RandomUtils.secure().randomInt(14001, 15000);
55+
nodePort5 = (Integer) RandomUtils.secure().randomInt(14001, 15000);
5656
nodeHost6 = CommonConstant.DEFAULT_REDIS_HOST;
57-
nodePort6 = RandomUtils.secure().randomInt(15001, 16000);
57+
nodePort6 = (Integer) RandomUtils.secure().randomInt(15001, 16000);
5858
nodeHost7 = CommonConstant.DEFAULT_REDIS_HOST;
59-
nodePort7 = RandomUtils.secure().randomInt(16001, 17000);
59+
nodePort7 = (Integer) RandomUtils.secure().randomInt(16001, 17000);
6060
}
6161

6262

@@ -99,7 +99,7 @@ public void shouldFailWhenThreeMastersOneSlaves() {
9999
RedisCluster redisCluster =
100100
RedisCluster.builder()
101101
.nodePorts(nodePorts)
102-
.clusterReplicas(1)
102+
.clusterReplicas((Integer) 1)
103103
.build();
104104
redisCluster.start();
105105
redisCluster.stop();
@@ -118,7 +118,7 @@ public void shouldFailWhenThreeMastersTwoSlaves() {
118118
RedisCluster redisCluster =
119119
RedisCluster.builder()
120120
.nodePorts(nodePorts)
121-
.clusterReplicas(1)
121+
.clusterReplicas((Integer) 1)
122122
.build();
123123
redisCluster.start();
124124
redisCluster.stop();
@@ -133,7 +133,7 @@ public void testSimpleOperationsAfterRunWithThreeMastersThreeSlavesCluster() {
133133
RedisCluster redisCluster =
134134
RedisCluster.builder()
135135
.nodePorts(nodePorts)
136-
.clusterReplicas(1)
136+
.clusterReplicas((Integer) 1)
137137
.build();
138138
redisCluster.start();
139139
// 等待主从同步
@@ -163,7 +163,7 @@ public void testSimpleOperationsAfterRunWithThreeMastersFourSlavesCluster() {
163163
RedisCluster redisCluster =
164164
RedisCluster.builder()
165165
.nodePorts(nodePorts)
166-
.clusterReplicas(1)
166+
.clusterReplicas((Integer) 1)
167167
.build();
168168
redisCluster.start();
169169
// 等待主从同步
@@ -199,7 +199,7 @@ public void shouldFailWhenThreeMastersFourSlavesCluster() {
199199
RedisCluster redisCluster =
200200
RedisCluster.builder()
201201
.nodePorts(nodePorts)
202-
.clusterReplicas(2)
202+
.clusterReplicas((Integer) 2)
203203
.build();
204204
redisCluster.start();
205205
redisCluster.stop();
@@ -242,3 +242,4 @@ public void shouldFailWhenOneNodes() {
242242
});
243243
}
244244
}
245+

0 commit comments

Comments
 (0)