Skip to content

Commit 13e0a7b

Browse files
authored
[improve][ci] Fixes apache#23079: Checkstyle checks applied to all test (apache#24492)
1 parent e0efcbb commit 13e0a7b

1,135 files changed

Lines changed: 13360 additions & 11058 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerBase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.pulsar.client;
2020

2121
import static org.mockito.Mockito.spy;
22-
2322
import com.google.common.collect.Sets;
2423
import java.util.HashMap;
2524
import java.util.Map;

bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ public class TlsProducerConsumerTest extends TlsProducerConsumerBase {
3434

3535
/**
3636
* verifies that messages whose size is larger than 2^14 bytes (max size of single TLS chunk) can be
37-
* produced/consumed
37+
* produced/consumed.
3838
*
3939
* @throws Exception
4040
*/
4141
@Test(timeOut = 30000)
4242
public void testTlsLargeSizeMessage() throws Exception {
4343
log.info("-- Starting {} test --", methodName);
4444

45-
final int MESSAGE_SIZE = 16 * 1024 + 1;
46-
log.info("-- message size {} --", MESSAGE_SIZE);
45+
final int messageSize = 16 * 1024 + 1;
46+
log.info("-- message size {} --", messageSize);
4747

4848
internalSetUpForClient(true, pulsar.getBrokerServiceUrlTls());
4949
internalSetUpForNamespace();
@@ -54,15 +54,15 @@ public void testTlsLargeSizeMessage() throws Exception {
5454
Producer<byte[]> producer = pulsarClient.newProducer().topic("persistent://my-property/use/my-ns/my-topic1")
5555
.create();
5656
for (int i = 0; i < 10; i++) {
57-
byte[] message = new byte[MESSAGE_SIZE];
57+
byte[] message = new byte[messageSize];
5858
Arrays.fill(message, (byte) i);
5959
producer.send(message);
6060
}
6161

6262
Message<byte[]> msg = null;
6363
for (int i = 0; i < 10; i++) {
6464
msg = consumer.receive(5, TimeUnit.SECONDS);
65-
byte[] expected = new byte[MESSAGE_SIZE];
65+
byte[] expected = new byte[messageSize];
6666
Arrays.fill(expected, (byte) i);
6767
Assert.assertEquals(expected, msg.getData());
6868
}
@@ -76,8 +76,8 @@ public void testTlsLargeSizeMessage() throws Exception {
7676
public void testTlsClientAuthOverBinaryProtocol() throws Exception {
7777
log.info("-- Starting {} test --", methodName);
7878

79-
final int MESSAGE_SIZE = 16 * 1024 + 1;
80-
log.info("-- message size {} --", MESSAGE_SIZE);
79+
final int messageSize = 16 * 1024 + 1;
80+
log.info("-- message size {} --", messageSize);
8181
internalSetUpForNamespace();
8282

8383
// Test 1 - Using TLS on binary protocol without sending certs - expect failure
@@ -106,8 +106,8 @@ public void testTlsClientAuthOverBinaryProtocol() throws Exception {
106106
public void testTlsClientAuthOverHTTPProtocol() throws Exception {
107107
log.info("-- Starting {} test --", methodName);
108108

109-
final int MESSAGE_SIZE = 16 * 1024 + 1;
110-
log.info("-- message size {} --", MESSAGE_SIZE);
109+
final int messageSize = 16 * 1024 + 1;
110+
log.info("-- message size {} --", messageSize);
111111
internalSetUpForNamespace();
112112

113113
// Test 1 - Using TLS on https without sending certs - expect failure

buildtools/src/main/resources/pulsar/suppressions.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@
3737
<suppress checks=".*" files=".+[\\/]generated-sources[\\/].+\.java"/>
3838
<suppress checks=".*" files=".+[\\/]generated-test-sources[\\/].+\.java"/>
3939

40-
<!-- suppress most all checks expect below-->
41-
<suppress checks="^(?!.*(UnusedImports|IllegalImport)).*$" files=".*[\\/]src[\\/]test[\\/].*"/>
40+
<!-- suppress LineLength due to usage of multi-line String with split function -->
41+
<suppress files="ExtensibleLoadManagerImplTest.java" checks="LineLength"/>
42+
<suppress files="BundleSplitterTaskTest.java" checks="TodoComment"/>
43+
<suppress files="BlobStoreTestBase.java" checks="TodoComment"/>
44+
<suppress files="BlobStoreManagedLedgerOffloaderBase.java" checks="TodoComment"/>
45+
<suppress files="DebeziumMsSqlSourceTester.java" checks="RegexpSinglelineJava"/>
46+
<suppress files="DebeziumOracleDbSourceTester.java" checks="RegexpSinglelineJava"/>
47+
<suppress files="PulsarIODebeziumSourceRunner.java" checks="RegexpSinglelineJava"/>
4248

4349
<suppress checks="IllegalImport" files="ProxyServiceStarter.java"/>
4450

buildtools/src/test/java/org/apache/pulsar/tests/BetweenTestClassesListenerAdapterTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,9 @@ public void afterClass() {
353353

354354
@Override
355355
public String toString() {
356-
return "FactoryMethodCase{" +
357-
"id=" + id +
358-
'}';
356+
return "FactoryMethodCase{"
357+
+ "id=" + id
358+
+ '}';
359359
}
360360
}
361361

@@ -387,9 +387,9 @@ public void testWithDataProvider(int id) {
387387

388388
@Override
389389
public String toString() {
390-
return "FactoryMethodCaseWithoutAfterClass{" +
391-
"id=" + id +
392-
'}';
390+
return "FactoryMethodCaseWithoutAfterClass{"
391+
+ "id=" + id
392+
+ '}';
393393
}
394394
}
395395
}

buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportSuccessTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.testng.annotations.Test;
2525

2626
/**
27-
* Tests that TestRetrySupport doesn't call setup & cleanup when tests are successful
27+
* Tests that TestRetrySupport doesn't call setup & cleanup when tests are successful.
2828
*/
2929
public class TestRetrySupportSuccessTest extends TestRetrySupport {
3030
private int setupCallCount;

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheManagerTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@
2020

2121
import static org.mockito.ArgumentMatchers.anyLong;
2222
import static org.mockito.Mockito.mock;
23-
import static org.mockito.Mockito.when;
2423
import static org.mockito.Mockito.verify;
24+
import static org.mockito.Mockito.when;
2525
import static org.testng.Assert.assertEquals;
2626
import static org.testng.Assert.assertFalse;
2727
import static org.testng.Assert.assertTrue;
28-
2928
import java.util.ArrayList;
3029
import java.util.List;
3130
import java.util.Optional;
3231
import java.util.Random;
3332
import java.util.concurrent.CountDownLatch;
3433
import java.util.concurrent.TimeUnit;
35-
3634
import lombok.Cleanup;
3735
import org.apache.bookkeeper.client.api.ReadHandle;
3836
import org.apache.bookkeeper.mledger.AsyncCallbacks;
@@ -397,7 +395,7 @@ void entryCacheDisabledAsyncReadEntry() throws Exception {
397395
when(ml1.getLastConfirmedEntry()).thenReturn(PositionFactory.create(1L, 1L));
398396
when(ml1.getOptionalLedgerInfo(lh.getId())).thenReturn(Optional.of(mock(
399397
MLDataFormats.ManagedLedgerInfo.LedgerInfo.class)));
400-
entryCache.asyncReadEntry(lh, PositionFactory.create(1L,1L), new AsyncCallbacks.ReadEntryCallback() {
398+
entryCache.asyncReadEntry(lh, PositionFactory.create(1L, 1L), new AsyncCallbacks.ReadEntryCallback() {
401399
public void readEntryComplete(Entry entry, Object ctx) {
402400
Assert.assertNotEquals(entry, null);
403401
entry.release();

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import static org.testng.Assert.assertEquals;
2828
import static org.testng.Assert.assertNull;
2929
import static org.testng.Assert.assertTrue;
30-
3130
import io.netty.buffer.Unpooled;
3231
import java.util.ArrayList;
3332
import java.util.List;

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/InflightReadsLimiterIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void testPreciseLimitation(String missingCase) throws Exception {
8686
final RangeEntryCacheManagerImpl rangeEntryCacheManager =
8787
(RangeEntryCacheManagerImpl) factory.getEntryCacheManager();
8888
final InflightReadsLimiter limiter = rangeEntryCacheManager.getInflightReadsLimiter();
89-
final long totalCapacity =limiter.getRemainingBytes();
89+
final long totalCapacity = limiter.getRemainingBytes();
9090
// final ManagedCursorImpl c1 = (ManagedCursorImpl) ml.openCursor("c1");
9191
for (byte i = 1; i < 127; i++) {
9292
log.info("add entry: " + i);
@@ -111,7 +111,7 @@ public void testPreciseLimitation(String missingCase) throws Exception {
111111
readCompleteSignal1.await();
112112
Object res = invocation.callRealMethod();
113113
return res;
114-
} else if(secondReadEntries.contains(firstEntry)) {
114+
} else if (secondReadEntries.contains(firstEntry)) {
115115
final CompletableFuture res = new CompletableFuture<>();
116116
threadFactory.newThread(() -> {
117117
try {

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorConcurrencyTest.java

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import static org.testng.Assert.assertEquals;
2222
import static org.testng.Assert.assertFalse;
2323
import static org.testng.Assert.assertNull;
24-
2524
import com.google.common.collect.Lists;
26-
2725
import java.util.ArrayList;
2826
import java.util.List;
2927
import java.util.concurrent.CompletableFuture;
@@ -135,7 +133,7 @@ public void testCloseAndRead() throws Exception {
135133

136134
final ManagedCursor cursor = ledger.openCursor("c1");
137135
final CompletableFuture<String> closeFuture = new CompletableFuture<>();
138-
final String CLOSED = "closed";
136+
final String closed = "closed";
139137

140138
final List<Position> addedEntries = new ArrayList();
141139

@@ -182,7 +180,7 @@ public void testCloseAndRead() throws Exception {
182180
@Override
183181
public void closeComplete(Object ctx) {
184182
log.info("Successfully closed cursor ledger");
185-
closeFuture.complete(CLOSED);
183+
closeFuture.complete(closed);
186184
}
187185

188186
@Override
@@ -206,7 +204,7 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) {
206204
counter.await();
207205

208206
assertFalse(gotException.get());
209-
assertEquals(closeFuture.get(), CLOSED);
207+
assertEquals(closeFuture.get(), closed);
210208
}
211209

212210
@Test(timeOut = 30000)
@@ -270,27 +268,27 @@ public void testConcurrentIndividualDeletes() throws Exception {
270268

271269
final ManagedCursor cursor = ledger.openCursor("c1");
272270

273-
final int N = 1000;
274-
final List<Position> addedEntries = Lists.newArrayListWithExpectedSize(N);
271+
final int num = 1000;
272+
final List<Position> addedEntries = Lists.newArrayListWithExpectedSize(num);
275273

276-
for (int i = 0; i < N; i++) {
274+
for (int i = 0; i < num; i++) {
277275
Position pos = ledger.addEntry("entry".getBytes());
278276
addedEntries.add(pos);
279277
}
280278

281-
final int Threads = 10;
282-
final CyclicBarrier barrier = new CyclicBarrier(Threads);
283-
final CountDownLatch counter = new CountDownLatch(Threads);
279+
final int threads = 10;
280+
final CyclicBarrier barrier = new CyclicBarrier(threads);
281+
final CountDownLatch counter = new CountDownLatch(threads);
284282
final AtomicBoolean gotException = new AtomicBoolean(false);
285283

286-
for (int thread = 0; thread < Threads; thread++) {
284+
for (int thread = 0; thread < threads; thread++) {
287285
final int myThread = thread;
288286
cachedExecutor.execute(() -> {
289287
try {
290288
barrier.await();
291289

292-
for (int i = 0; i < N; i++) {
293-
int threadId = i % Threads;
290+
for (int i = 0; i < num; i++) {
291+
int threadId = i % threads;
294292
if (threadId == myThread) {
295293
cursor.delete(addedEntries.get(i));
296294
}
@@ -321,8 +319,8 @@ public void testConcurrentReadOfSameEntry() throws Exception {
321319
cursors.add(cursor);
322320
}
323321

324-
final int N = 100;
325-
for (int i = 0; i < N; i++) {
322+
final int num = 100;
323+
for (int i = 0; i < num; i++) {
326324
ledger.addEntry(("entry" + i).getBytes());
327325
}
328326
long currentLedger = cursors.get(0).getMarkDeletedPosition().getLedgerId();
@@ -341,7 +339,7 @@ public void testConcurrentReadOfSameEntry() throws Exception {
341339
cachedExecutor.execute(() -> {
342340
try {
343341
barrier.await();
344-
for (int j = 0; j < N; j++) {
342+
for (int j = 0; j < num; j++) {
345343
String expected = "entry" + j;
346344
String data = new String(cursor.readEntries(1).get(0).getDataAndRelease());
347345
if ((!expected.equals(data)) && result.get() == null) {
@@ -368,10 +366,10 @@ public void testConcurrentIndividualDeletesWithGetNthEntry() throws Exception {
368366

369367
final ManagedCursor cursor = ledger.openCursor("c1");
370368

371-
final int N = 1000;
372-
final List<Position> addedEntries = Lists.newArrayListWithExpectedSize(N);
369+
final int num = 1000;
370+
final List<Position> addedEntries = Lists.newArrayListWithExpectedSize(num);
373371

374-
for (int i = 0; i < N; i++) {
372+
for (int i = 0; i < num; i++) {
375373
Position pos = ledger.addEntry("entry".getBytes());
376374
addedEntries.add(pos);
377375
}
@@ -407,7 +405,7 @@ public void deleteFailed(ManagedLedgerException exception, Object ctx) {
407405

408406
counter.await();
409407

410-
final int readEntries = N - deleteEntries;
408+
final int readEntries = num - deleteEntries;
411409
final CountDownLatch readCounter = new CountDownLatch(readEntries);
412410
final AtomicInteger successReadEntries = new AtomicInteger(0);
413411
for (int i = 1; i <= readEntries; i++) {

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,14 @@ public List<Entry> replayEntries(Set<? extends Position> positions) {
290290
}
291291

292292
@Override
293-
public Set<? extends Position> asyncReplayEntries(Set<? extends Position> positions, ReadEntriesCallback callback, Object ctx) {
293+
public Set<? extends Position> asyncReplayEntries(Set<? extends Position> positions,
294+
ReadEntriesCallback callback, Object ctx) {
294295
return Sets.newConcurrentHashSet();
295296
}
296297

297298
@Override
298-
public Set<? extends Position> asyncReplayEntries(Set<? extends Position> positions, ReadEntriesCallback callback, Object ctx, boolean sortEntries) {
299+
public Set<? extends Position> asyncReplayEntries(Set<? extends Position> positions,
300+
ReadEntriesCallback callback, Object ctx, boolean sortEntries) {
299301
return Sets.newConcurrentHashSet();
300302
}
301303

@@ -321,12 +323,12 @@ public boolean cancelPendingReadRequest() {
321323
}
322324

323325
@Override
324-
public Entry getNthEntry(int N, IndividualDeletedEntries deletedEntries) {
326+
public Entry getNthEntry(int num, IndividualDeletedEntries deletedEntries) {
325327
return null;
326328
}
327329

328330
@Override
329-
public void asyncGetNthEntry(int N, IndividualDeletedEntries deletedEntries, ReadEntryCallback callback,
331+
public void asyncGetNthEntry(int num, IndividualDeletedEntries deletedEntries, ReadEntryCallback callback,
330332
Object ctx) {
331333
}
332334

@@ -449,29 +451,29 @@ public void testSlowestReadPositionForActiveCursors() {
449451
assertNull(container.getSlowestReaderPosition());
450452

451453
// Add no durable cursor
452-
Position position = PositionFactory.create(5,5);
454+
Position position = PositionFactory.create(5, 5);
453455
ManagedCursor cursor1 = spy(new MockManagedCursor(container, "test1", position));
454456
doReturn(false).when(cursor1).isDurable();
455457
doReturn(position).when(cursor1).getReadPosition();
456458
container.add(cursor1, position);
457459
assertEquals(container.getSlowestReaderPosition(), PositionFactory.create(5, 5));
458460

459461
// Add no durable cursor
460-
position = PositionFactory.create(1,1);
462+
position = PositionFactory.create(1, 1);
461463
ManagedCursor cursor2 = spy(new MockManagedCursor(container, "test2", position));
462464
doReturn(false).when(cursor2).isDurable();
463465
doReturn(position).when(cursor2).getReadPosition();
464466
container.add(cursor2, position);
465467
assertEquals(container.getSlowestReaderPosition(), PositionFactory.create(1, 1));
466468

467469
// Move forward cursor, cursor1 = 5:5, cursor2 = 5:6, slowest is 5:5
468-
position = PositionFactory.create(5,6);
470+
position = PositionFactory.create(5, 6);
469471
container.cursorUpdated(cursor2, position);
470472
doReturn(position).when(cursor2).getReadPosition();
471473
assertEquals(container.getSlowestReaderPosition(), PositionFactory.create(5, 5));
472474

473475
// Move forward cursor, cursor1 = 5:8, cursor2 = 5:6, slowest is 5:6
474-
position = PositionFactory.create(5,8);
476+
position = PositionFactory.create(5, 8);
475477
doReturn(position).when(cursor1).getReadPosition();
476478
container.cursorUpdated(cursor1, position);
477479
assertEquals(container.getSlowestReaderPosition(), PositionFactory.create(5, 6));

0 commit comments

Comments
 (0)