Skip to content

Commit d054548

Browse files
vongoslingvongosling
authored
Merge pull request #315 from supervate/optmizeCodeFormat
code-format: optmize or simplify some code.
2 parents d34f270 + c362df1 commit d054548

File tree

11 files changed

+34
-54
lines changed

11 files changed

+34
-54
lines changed

‎dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public void setReadOnlyDataStoreDirs(String readOnlyDataStoreDirs) {
463463

464464
private String selfAddress;
465465

466-
// groupId#selfIf -> address
466+
// groupId#selfId -> address
467467
private Map<String, String> peerAddressMap;
468468

469469
private final AtomicBoolean inited = new AtomicBoolean(false);

‎dledger/src/test/java/io/openmessaging/storage/dledger/AppendAndGetTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
2424
import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
2525
import io.openmessaging.storage.dledger.util.FileTestUtil;
26-
import java.io.File;
2726
import java.util.ArrayList;
2827
import java.util.List;
2928
import java.util.UUID;

‎dledger/src/test/java/io/openmessaging/storage/dledger/AppendAndPushTest.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.atomic.AtomicBoolean;
3535
import java.util.concurrent.atomic.AtomicInteger;
3636

37-
import org.awaitility.core.AssertionCondition;
3837
import org.junit.jupiter.api.Assertions;
3938
import org.junit.jupiter.api.Test;
4039
import org.mockito.Mockito;
@@ -59,7 +58,7 @@ public void testPushCommittedIndex() throws Exception {
5958
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
6059
appendEntryRequest.setBody(new byte[256]);
6160
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
62-
Assertions.assertTrue(future instanceof AppendFuture);
61+
Assertions.assertInstanceOf(AppendFuture.class, future);
6362
futures.add(future);
6463
}
6564
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
@@ -86,13 +85,12 @@ public void testPushNetworkOffline() throws Exception {
8685
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
8786
appendEntryRequest.setBody(new byte[128]);
8887
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
89-
Assertions.assertTrue(future instanceof AppendFuture);
88+
Assertions.assertInstanceOf(AppendFuture.class, future);
9089
futures.add(future);
9190
}
9291
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
9392
Thread.sleep(dLedgerServer0.getDLedgerConfig().getMaxWaitAckTimeMs() + 1000);
94-
for (int i = 0; i < futures.size(); i++) {
95-
CompletableFuture<AppendEntryResponse> future = futures.get(i);
93+
for (CompletableFuture<AppendEntryResponse> future : futures) {
9694
Assertions.assertTrue(future.isDone());
9795
Assertions.assertEquals(DLedgerResponseCode.WAIT_QUORUM_ACK_TIMEOUT.getCode(), future.get().getCode());
9896
}
@@ -104,7 +102,7 @@ public void testPushNetworkOffline() throws Exception {
104102
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
105103
appendEntryRequest.setBody(new byte[128]);
106104
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
107-
Assertions.assertTrue(future instanceof AppendFuture);
105+
Assertions.assertInstanceOf(AppendFuture.class, future);
108106
if (future.isDone()) {
109107
Assertions.assertEquals(DLedgerResponseCode.LEADER_PENDING_FULL.getCode(), future.get().getCode());
110108
hasWait = true;
@@ -126,12 +124,12 @@ public void testPushNetworkNotStable() throws Exception {
126124
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
127125
appendEntryRequest.setBody(new byte[128]);
128126
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
129-
Assertions.assertTrue(future instanceof AppendFuture);
127+
Assertions.assertInstanceOf(AppendFuture.class, future);
130128
future.whenComplete((x, ex) -> {
131129
sendSuccess.set(true);
132130
});
133131
Thread.sleep(500);
134-
Assertions.assertTrue(!sendSuccess.get());
132+
Assertions.assertFalse(sendSuccess.get());
135133
//start server1
136134
DLedgerServer dLedgerServer1 = launchServer(group, peers, "n1", "n0", DLedgerConfig.FILE);
137135
Thread.sleep(1500);
@@ -140,12 +138,12 @@ public void testPushNetworkNotStable() throws Exception {
140138
dLedgerServer1.shutdown();
141139
sendSuccess.set(false);
142140
future = dLedgerServer0.handleAppend(appendEntryRequest);
143-
Assertions.assertTrue(future instanceof AppendFuture);
141+
Assertions.assertInstanceOf(AppendFuture.class, future);
144142
future.whenComplete((x, ex) -> {
145143
sendSuccess.set(true);
146144
});
147145
Thread.sleep(500);
148-
Assertions.assertTrue(!sendSuccess.get());
146+
Assertions.assertFalse(sendSuccess.get());
149147
//restart server1
150148
dLedgerServer1 = launchServer(group, peers, "n1", "n0", DLedgerConfig.FILE);
151149
Thread.sleep(1500);

‎dledger/src/test/java/io/openmessaging/storage/dledger/BatchPushTest.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,12 @@ public void testBatchPushNetworkOffline() throws Exception {
122122
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
123123
appendEntryRequest.setBody(new byte[128]);
124124
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
125-
Assertions.assertTrue(future instanceof AppendFuture);
125+
Assertions.assertInstanceOf(AppendFuture.class, future);
126126
futures.add(future);
127127
}
128128
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
129129
Thread.sleep(dLedgerServer0.getDLedgerConfig().getMaxWaitAckTimeMs() + 1000);
130-
for (int i = 0; i < futures.size(); i++) {
131-
CompletableFuture<AppendEntryResponse> future = futures.get(i);
130+
for (CompletableFuture<AppendEntryResponse> future : futures) {
132131
Assertions.assertTrue(future.isDone());
133132
Assertions.assertEquals(DLedgerResponseCode.WAIT_QUORUM_ACK_TIMEOUT.getCode(), future.get().getCode());
134133
}
@@ -140,7 +139,7 @@ public void testBatchPushNetworkOffline() throws Exception {
140139
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
141140
appendEntryRequest.setBody(new byte[128]);
142141
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
143-
Assertions.assertTrue(future instanceof AppendFuture);
142+
Assertions.assertInstanceOf(AppendFuture.class, future);
144143
if (future.isDone()) {
145144
Assertions.assertEquals(DLedgerResponseCode.LEADER_PENDING_FULL.getCode(), future.get().getCode());
146145
hasWait = true;
@@ -162,12 +161,12 @@ public void testBatchPushNetworkNotStable() throws Exception {
162161
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
163162
appendEntryRequest.setBody(new byte[128]);
164163
CompletableFuture<AppendEntryResponse> future = dLedgerServer0.handleAppend(appendEntryRequest);
165-
Assertions.assertTrue(future instanceof AppendFuture);
164+
Assertions.assertInstanceOf(AppendFuture.class, future);
166165
future.whenComplete((x, ex) -> {
167166
sendSuccess.set(true);
168167
});
169168
Thread.sleep(500);
170-
Assertions.assertTrue(!sendSuccess.get());
169+
Assertions.assertFalse(sendSuccess.get());
171170
//start server1
172171
DLedgerServer dLedgerServer1 = launchServerEnableBatchPush(group, peers, "n1", "n0", DLedgerConfig.FILE);
173172
Thread.sleep(1500);
@@ -176,12 +175,12 @@ public void testBatchPushNetworkNotStable() throws Exception {
176175
dLedgerServer1.shutdown();
177176
sendSuccess.set(false);
178177
future = dLedgerServer0.handleAppend(appendEntryRequest);
179-
Assertions.assertTrue(future instanceof AppendFuture);
178+
Assertions.assertInstanceOf(AppendFuture.class, future);
180179
future.whenComplete((x, ex) -> {
181180
sendSuccess.set(true);
182181
});
183182
Thread.sleep(500);
184-
Assertions.assertTrue(!sendSuccess.get());
183+
Assertions.assertFalse(sendSuccess.get());
185184
//restart server1
186185
dLedgerServer1 = launchServerEnableBatchPush(group, peers, "n1", "n0", DLedgerConfig.FILE);
187186
Thread.sleep(1500);

‎dledger/src/test/java/io/openmessaging/storage/dledger/CommitIndexTest.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ public void testDisableFastAdvanceCommitIndex() throws Exception {
4949
DLedgerServer server0 = launchServer(group, peers, "n0", "n0");
5050
DLedgerServer server1 = launchServer(group, peers, "n1", "n0");
5151
DLedgerServer server2 = launchServer(group, peers, "n2", "n0");
52-
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(() -> {
53-
return server0.isLeader();
54-
});
52+
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(server0::isLeader);
5553
// at beginning, the commit index is -1
5654
Assertions.assertEquals(-1, server0.getMemberState().getCommittedIndex());
5755
Assertions.assertEquals(-1, server1.getMemberState().getCommittedIndex());
@@ -133,9 +131,7 @@ public void testDisableFastAdvanceCommitIndex() throws Exception {
133131

134132
// now restart n0
135133
DLedgerServer newServer0 = launchServer(group, peers, "n0", "n0");
136-
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(() -> {
137-
return newServer0.isLeader();
138-
});
134+
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(newServer0::isLeader);
139135
Assertions.assertEquals(1, newServer0.getMemberState().getCommittedIndex());
140136
}
141137

@@ -146,9 +142,7 @@ public void testEnableFastAdvanceCommitIndex() throws Exception {
146142
DLedgerServer server0 = launchServer(group, peers, "n0", "n0", true);
147143
DLedgerServer server1 = launchServer(group, peers, "n1", "n0", true);
148144
DLedgerServer server2 = launchServer(group, peers, "n2", "n0", true);
149-
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(() -> {
150-
return server0.isLeader();
151-
});
145+
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(server0::isLeader);
152146
// at beginning, the commit index is -1
153147
Assertions.assertEquals(-1, server0.getMemberState().getCommittedIndex());
154148
Assertions.assertEquals(-1, server1.getMemberState().getCommittedIndex());
@@ -232,9 +226,7 @@ public void testEnableFastAdvanceCommitIndex() throws Exception {
232226
// why not 3? because when leader change, n0 hava already advanced the commit index to 2 (commit index is not stale at that time),
233227
// so it is meaningless to append one more no-op entry to advance the commit index
234228
DLedgerServer newServer0 = launchServer(group, peers, "n0", "n0", true);
235-
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(() -> {
236-
return newServer0.isLeader();
237-
});
229+
await().atMost(6, TimeUnit.SECONDS).pollInterval(300, TimeUnit.MILLISECONDS).until(newServer0::isLeader);
238230
Assertions.assertEquals(2, newServer0.getMemberState().getCommittedIndex());
239231
}
240232
}

‎dledger/src/test/java/io/openmessaging/storage/dledger/LeaderElectorTest.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.junit.jupiter.api.Test;
2626

2727
import java.util.ArrayList;
28+
import java.util.Comparator;
2829
import java.util.List;
2930
import java.util.UUID;
3031
import java.util.concurrent.atomic.AtomicInteger;
@@ -80,15 +81,7 @@ public void testThreeServer() throws Exception {
8081
Assertions.assertNotNull(leaderServer);
8182

8283
for (int i = 0; i < 10; i++) {
83-
long maxTerm = servers.stream().max((o1, o2) -> {
84-
if (o1.getMemberState().currTerm() < o2.getMemberState().currTerm()) {
85-
return -1;
86-
} else if (o1.getMemberState().currTerm() > o2.getMemberState().currTerm()) {
87-
return 1;
88-
} else {
89-
return 0;
90-
}
91-
}).get().getMemberState().currTerm();
84+
long maxTerm = servers.stream().max(Comparator.comparingLong(o -> o.getMemberState().currTerm())).get().getMemberState().currTerm();
9285
DLedgerServer candidate = servers.get(i % servers.size());
9386
candidate.getDLedgerLeaderElector().testRevote(maxTerm + 1);
9487
Thread.sleep(2000);

‎dledger/src/test/java/io/openmessaging/storage/dledger/ServerTestHarness.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ protected synchronized DLedgerServer launchServer(String group, String peers, St
4444
}
4545

4646
protected synchronized DLedgerServer launchServer(String group, String peers, String selfId,
47-
String preferredLeaderId, boolean enbaleFastAdvanceCommitIndex) {
47+
String preferredLeaderId, boolean enableFastAdvanceCommitIndex) {
4848
DLedgerConfig config = new DLedgerConfig();
4949
config.setStoreBaseDir(getBaseDir() + File.separator + group);
5050
config.group(group).selfId(selfId).peers(peers);
5151
config.setStoreType(DLedgerConfig.FILE);
5252
config.setPreferredLeaderId(preferredLeaderId);
53-
config.setEnableFastAdvanceCommitIndex(enbaleFastAdvanceCommitIndex);
53+
config.setEnableFastAdvanceCommitIndex(enableFastAdvanceCommitIndex);
5454
DLedgerServer dLedgerServer = new DLedgerServer(config);
5555
dLedgerServer.startup();
5656
bases.add(config.getDefaultPath());
@@ -85,8 +85,8 @@ protected synchronized DLedgerServer launchServer(String group, String peers, St
8585

8686

8787
protected DLedgerServer launchServerWithStateMachineDisableSnapshot(String group, String peers,
88-
String selfIf, String leaderId, String storeType, int mappedFileSizeForEntryData, StateMachine stateMachine) {
89-
return this.launchServerWithStateMachine(group, peers, selfIf, leaderId, storeType, false, 0,
88+
String selfId, String leaderId, String storeType, int mappedFileSizeForEntryData, StateMachine stateMachine) {
89+
return this.launchServerWithStateMachine(group, peers, selfId, leaderId, storeType, false, 0,
9090
mappedFileSizeForEntryData, stateMachine);
9191
}
9292

‎dledger/src/test/java/io/openmessaging/storage/dledger/WriteTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void done(Status status) {
7777
try {
7878
latch.await();
7979
} catch (InterruptedException e) {
80-
Assertions.assertTrue(false);
80+
Assertions.fail();
8181
}
8282
}
8383

@@ -110,7 +110,7 @@ public void done(Status status) {
110110
try {
111111
latch.await();
112112
} catch (InterruptedException e) {
113-
Assertions.assertTrue(false);
113+
Assertions.fail();
114114
}
115115
}
116116

@@ -138,7 +138,7 @@ public void done(Status status) {
138138
try {
139139
latch.await();
140140
} catch (InterruptedException e) {
141-
Assertions.assertTrue(false);
141+
Assertions.fail();
142142
}
143143
}
144144

@@ -171,7 +171,7 @@ public void done(Status status) {
171171
try {
172172
latch.await();
173173
} catch (InterruptedException e) {
174-
Assertions.assertTrue(false);
174+
Assertions.fail();
175175
}
176176
}
177177

‎dledger/src/test/java/io/openmessaging/storage/dledger/entry/DLedgerEntryCoderTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public void testEncodeDecode() {
6969
public void testCompareEntry() {
7070
DLedgerEntry entry = new DLedgerEntry();
7171
DLedgerEntry other = new DLedgerEntry();
72-
Assertions.assertTrue(!entry.equals(null));
7372
Assertions.assertEquals(entry, other);
7473
Assertions.assertEquals(other, entry);
7574
Assertions.assertEquals(other.hashCode(), entry.hashCode());

‎dledger/src/test/java/io/openmessaging/storage/dledger/statemachine/MockSnapshotFile.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class MockSnapshotFile {
1111

12-
private static Logger logger = LoggerFactory.getLogger(MockSnapshotFile.class);
12+
private static final Logger logger = LoggerFactory.getLogger(MockSnapshotFile.class);
1313

1414
private final String snapshotStorePath;
1515

@@ -29,10 +29,10 @@ public boolean save(final long value) {
2929

3030
public long load() throws IOException {
3131
String str = IOUtils.file2String(new File(snapshotStorePath));
32-
if (str != null && str.length() != 0) {
32+
if (str != null && !str.isEmpty()) {
3333
return Long.parseLong(str);
3434
} else {
3535
throw new IOException("Unable to load snapshot data from " + snapshotStorePath);
3636
}
3737
}
38-
}
38+
}

0 commit comments

Comments
 (0)