Skip to content

Commit bb2846f

Browse files
emeroademeroad
committed
[#noissue] Cleanup
1 parent cae18d8 commit bb2846f

File tree

275 files changed

+3588
-4025
lines changed

Some content is hidden

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

275 files changed

+3588
-4025
lines changed

‎batch/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/FileDescriptorDataCollector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void collect() {
6363
for(String agentId : agentIds) {
6464
List<FileDescriptorBo> fileDescriptorBoList = fileDescriptorDao.getAgentStatList(agentId, range);
6565

66-
if (fileDescriptorBoList.size() == 0) {
66+
if (fileDescriptorBoList.isEmpty()) {
6767
continue;
6868
}
6969

‎batch/src/test/java/com/navercorp/pinpoint/batch/BatchConfigurationTest.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
package com.navercorp.pinpoint.batch;
1818

1919
import com.navercorp.pinpoint.batch.common.BatchConfiguration;
20-
import org.junit.jupiter.api.Assertions;
2120
import org.junit.jupiter.api.Test;
2221
import org.junit.jupiter.api.extension.ExtendWith;
2322
import org.springframework.beans.factory.annotation.Autowired;
2423
import org.springframework.test.context.ContextConfiguration;
2524
import org.springframework.test.context.TestPropertySource;
2625
import org.springframework.test.context.junit.jupiter.SpringExtension;
2726

28-
import java.util.Arrays;
27+
import java.util.List;
28+
29+
import static org.assertj.core.api.Assertions.assertThat;
2930

3031
/**
3132
* @author Woonduk Kang(emeroad)
@@ -41,21 +42,21 @@ public class BatchConfigurationTest {
4142

4243
@Test
4344
public void test() {
44-
Assertions.assertEquals("release", configuration.getBatchEnv());
45-
Assertions.assertEquals(Arrays.asList("1", "2"), configuration.getFlinkServerList());
45+
assertThat(configuration)
46+
.extracting(BatchConfiguration::getBatchEnv, BatchConfiguration::getFlinkServerList)
47+
.containsExactly("release", List.of("1", "2"));
4648
}
4749

4850
@Test
4951
public void cleanupInactiveAgentsConfigurationTest() {
5052
configuration.setup();
5153

52-
boolean enableCleanupInactiveAgents = configuration.isEnableCleanupInactiveAgents();
53-
String cleanupInactiveAgentsCron = configuration.getCleanupInactiveAgentsCron();
54-
int cleanupInactiveAgentsDurationDays = configuration.getCleanupInactiveAgentsDurationDays();
54+
assertThat(configuration)
55+
.extracting(BatchConfiguration::isEnableCleanupInactiveAgents,
56+
BatchConfiguration::getCleanupInactiveAgentsCron,
57+
BatchConfiguration::getCleanupInactiveAgentsDurationDays)
58+
.containsExactly(false, "0 0 0 29 2 ?", 30);
5559

56-
Assertions.assertEquals(false, enableCleanupInactiveAgents);
57-
Assertions.assertEquals("0 0 0 29 2 ?", cleanupInactiveAgentsCron);
58-
Assertions.assertEquals(30, cleanupInactiveAgentsDurationDays);
5960
}
6061

6162
}

‎batch/src/test/java/com/navercorp/pinpoint/batch/DefaultDividerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import java.util.Map;
2424

25-
import static org.junit.jupiter.api.Assertions.assertEquals;
25+
import static org.assertj.core.api.Assertions.assertThat;
2626

2727
/**
2828
* @author minwoo.jung
@@ -33,7 +33,7 @@ public class DefaultDividerTest {
3333
public void devide() {
3434
DefaultDivider defaultDivider = new DefaultDivider();
3535
Map<String, ExecutionContext> map = defaultDivider.divide("test_partition", "test");
36-
assertEquals(1, map.size());
36+
assertThat(map).hasSize(1);
3737
}
3838

3939
}

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmPartitionerTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
package com.navercorp.pinpoint.batch.alarm;
1818

1919
import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
20-
import org.junit.jupiter.api.Assertions;
2120
import org.junit.jupiter.api.Test;
2221
import org.springframework.batch.item.ExecutionContext;
2322

2423
import java.util.Map;
2524
import java.util.Optional;
2625

26+
import static org.assertj.core.api.Assertions.assertThat;
27+
2728
public class AlarmPartitionerTest {
2829

2930
private static ApplicationIndexDao dao;
@@ -32,6 +33,6 @@ public class AlarmPartitionerTest {
3233
public void partitionTest() {
3334
AlarmPartitioner partitioner = new AlarmPartitioner(Optional.empty());
3435
Map<String, ExecutionContext> partitions = partitioner.partition(0);
35-
Assertions.assertEquals(1, partitions.size());
36+
assertThat(partitions).hasSize(1);
3637
}
3738
}

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmProcessorTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.List;
1818
import java.util.Map;
1919

20-
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.assertj.core.api.Assertions.assertThat;
2121
import static org.junit.jupiter.api.Assertions.assertFalse;
2222
import static org.junit.jupiter.api.Assertions.assertNotNull;
2323
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -92,7 +92,8 @@ public void test() {
9292
verify(dataCollectorFactory).createDataCollector(any(), any(), any(), anyLong());
9393

9494
assertNotNull(appChecker, "processed object is null");
95-
assertEquals(2, appChecker.getChildren().size(), "rules should be propagated");
95+
assertThat(appChecker.getChildren())
96+
.as("rules should be propagated").hasSize(2);
9697
assertTrue(appChecker.getChildren().get(0).isDetected());
9798
assertFalse(appChecker.getChildren().get(1).isDetected());
9899
}

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateCheckerTest.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.ArrayList;
3939
import java.util.List;
4040

41+
import static org.assertj.core.api.Assertions.assertThat;
4142
import static org.mockito.Mockito.when;
4243

4344
/**
@@ -67,10 +68,11 @@ public class DataSourceConnectionUsageRateCheckerTest {
6768
public void before() {
6869
Range range = Range.newUncheckedRange(START_TIME_MILLIS, CURRENT_TIME_MILLIS);
6970

70-
List<DataSourceListBo> dataSourceListBoList = new ArrayList<>();
71-
dataSourceListBoList.add(createDataSourceListBo(1, 30, 40, 3));
72-
dataSourceListBoList.add(createDataSourceListBo(2, 25, 40, 3));
73-
dataSourceListBoList.add(createDataSourceListBo(3, 10, 40, 3));
71+
List<DataSourceListBo> dataSourceListBoList = List.of(
72+
createDataSourceListBo(1, 30, 40, 3),
73+
createDataSourceListBo(2, 25, 40, 3),
74+
createDataSourceListBo(3, 10, 40, 3)
75+
);
7476

7577
when(mockDataSourceDao.getAgentStatList(AGENT_ID, range)).thenReturn(dataSourceListBoList);
7678
}
@@ -88,7 +90,7 @@ public void checkTest1() {
8890
Assertions.assertTrue(StringUtils.hasLength(emailMessage));
8991

9092
List<String> smsMessage = checker.getSmsMessage();
91-
Assertions.assertEquals(2, smsMessage.size());
93+
assertThat(smsMessage).hasSize(2);
9294
}
9395

9496
@Test

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DeadlockCheckerTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.Collections;
3636
import java.util.List;
3737

38+
import static org.assertj.core.api.Assertions.assertThat;
3839
import static org.mockito.Mockito.when;
3940

4041
/**
@@ -80,7 +81,7 @@ public void checkTest1() {
8081
Assertions.assertTrue(StringUtils.hasLength(emailMessage));
8182

8283
List<String> smsMessage = checker.getSmsMessage();
83-
Assertions.assertEquals(1, smsMessage.size());
84+
assertThat(smsMessage).hasSize(1);
8485
}
8586

8687
@Test
@@ -98,10 +99,10 @@ public void checkTest2() {
9899
Assertions.assertFalse(checker.isDetected());
99100

100101
String emailMessage = checker.getEmailMessage();
101-
Assertions.assertTrue(StringUtils.isEmpty(emailMessage));
102+
assertThat(emailMessage).isNullOrEmpty();
102103

103104
List<String> smsMessage = checker.getSmsMessage();
104-
Assertions.assertTrue(smsMessage.isEmpty());
105+
assertThat(smsMessage).isEmpty();
105106
}
106107

107108
private AgentEventBo createAgentEvent(String agentId, long eventTimestamp, AgentEventType agentEventType) {

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/FileDescriptorCheckerTest.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.navercorp.pinpoint.web.alarm.vo.Rule;
2121
import org.junit.jupiter.api.Test;
2222

23-
import java.util.HashMap;
2423
import java.util.Map;
2524

2625
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -38,9 +37,11 @@ public void checkTest() {
3837
Rule rule = new Rule();
3938
rule.setThreshold(10);
4039
FileDescriptorDataCollector fileDescriptorDataCollector = mock(FileDescriptorDataCollector.class);
41-
Map<String, Long> result = new HashMap<>();
42-
result.put("testAgent1", 10L);
43-
result.put("testAgent2", 0L);
40+
41+
Map<String, Long> result = Map.ofEntries(
42+
Map.entry("testAgent1", 10L),
43+
Map.entry("testAgent2", 0L));
44+
4445
when(fileDescriptorDataCollector.getFileDescriptorCount()).thenReturn(result);
4546
FileDescriptorChecker fileDescriptorChecker = new FileDescriptorChecker(fileDescriptorDataCollector, rule);
4647
fileDescriptorChecker.check();
@@ -52,9 +53,11 @@ public void check2Test() {
5253
Rule rule = new Rule();
5354
rule.setThreshold(20);
5455
FileDescriptorDataCollector fileDescriptorDataCollector = mock(FileDescriptorDataCollector.class);
55-
Map<String, Long> result = new HashMap<>();
56-
result.put("testAgent1", 10L);
57-
result.put("testAgent2", 0L);
56+
57+
Map<String, Long> result = Map.ofEntries(
58+
Map.entry("testAgent1", 10L),
59+
Map.entry("testAgent2", 0L));
60+
5861
when(fileDescriptorDataCollector.getFileDescriptorCount()).thenReturn(result);
5962
FileDescriptorChecker fileDescriptorChecker = new FileDescriptorChecker(fileDescriptorDataCollector, rule);
6063
fileDescriptorChecker.check();

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SystemCpuUsageRateCheckerTest.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.navercorp.pinpoint.web.alarm.vo.Rule;
2121
import org.junit.jupiter.api.Test;
2222

23-
import java.util.HashMap;
2423
import java.util.Map;
2524

2625
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -39,9 +38,11 @@ public void checkTest() {
3938
Rule rule = new Rule();
4039
rule.setThreshold(10);
4140
AgentStatDataCollector agentStatDataCollector = mock(AgentStatDataCollector.class);
42-
Map<String, Long> result = new HashMap<>();
43-
result.put("testAgent1", 30L);
44-
result.put("testAgent2", 50L);
41+
42+
Map<String, Long> result = Map.ofEntries(
43+
Map.entry("testAgent1", 30L),
44+
Map.entry("testAgent2", 50L));
45+
4546
when(agentStatDataCollector.getSystemCpuUsageRate()).thenReturn(result);
4647
SystemCpuUsageRateChecker systemCpuUsageRateChecker = new SystemCpuUsageRateChecker(agentStatDataCollector, rule);
4748
systemCpuUsageRateChecker.check();
@@ -53,9 +54,11 @@ public void check2Test() {
5354
Rule rule = new Rule();
5455
rule.setThreshold(70);
5556
AgentStatDataCollector agentStatDataCollector = mock(AgentStatDataCollector.class);
56-
Map<String, Long> result = new HashMap<>();
57-
result.put("testAgent1", 30L);
58-
result.put("testAgent2", 50L);
57+
58+
Map<String, Long> result = Map.ofEntries(
59+
Map.entry("testAgent1", 30L),
60+
Map.entry("testAgent2", 50L));
61+
5962
when(agentStatDataCollector.getSystemCpuUsageRate()).thenReturn(result);
6063
SystemCpuUsageRateChecker systemCpuUsageRateChecker = new SystemCpuUsageRateChecker(agentStatDataCollector, rule);
6164
systemCpuUsageRateChecker.check();

‎batch/src/test/java/com/navercorp/pinpoint/batch/alarm/collector/FileDescriptorDataCollectorTest.java

+17-16
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
import com.navercorp.pinpoint.common.server.util.time.Range;
2222
import com.navercorp.pinpoint.web.alarm.DataCollectorCategory;
2323
import com.navercorp.pinpoint.web.dao.stat.AgentStatDao;
24+
import org.assertj.core.api.Assertions;
2425
import org.junit.jupiter.api.Test;
2526

26-
import java.util.ArrayList;
2727
import java.util.List;
2828
import java.util.Map;
2929

30-
import static org.junit.jupiter.api.Assertions.assertEquals;
3130
import static org.mockito.Mockito.mock;
3231
import static org.mockito.Mockito.when;
3332

@@ -41,36 +40,37 @@ public void collect() {
4140
String agentId1 = "testAgent1";
4241
String agentId2 = "testAgent2";
4342

44-
List<String> agentList = new ArrayList<>();
45-
agentList.add(agentId1);
46-
agentList.add(agentId2);
43+
List<String> agentList = List.of(agentId1, agentId2);
4744

4845
AgentStatDao<FileDescriptorBo> fileDescriptorDao = (AgentStatDao<FileDescriptorBo>) mock(AgentStatDao.class);
4946
long timeStamp = 1558936971494L;
5047
Range range = Range.newUncheckedRange(timeStamp - DataCollectorFactory.SLOT_INTERVAL_FIVE_MIN, timeStamp);
5148

52-
List<FileDescriptorBo> fileDescriptorBoList1 = new ArrayList<>();
5349
FileDescriptorBo fileDescriptorBo1_1 = new FileDescriptorBo();
5450
fileDescriptorBo1_1.setOpenFileDescriptorCount(200);
5551
FileDescriptorBo fileDescriptorBo1_2 = new FileDescriptorBo();
5652
fileDescriptorBo1_2.setOpenFileDescriptorCount(300);
5753
FileDescriptorBo fileDescriptorBo1_3 = new FileDescriptorBo();
5854
fileDescriptorBo1_3.setOpenFileDescriptorCount(400);
59-
fileDescriptorBoList1.add(fileDescriptorBo1_1);
60-
fileDescriptorBoList1.add(fileDescriptorBo1_2);
61-
fileDescriptorBoList1.add(fileDescriptorBo1_3);
55+
56+
List<FileDescriptorBo> fileDescriptorBoList1 = List.of(
57+
fileDescriptorBo1_1,
58+
fileDescriptorBo1_2,
59+
fileDescriptorBo1_3
60+
);
6261
when(fileDescriptorDao.getAgentStatList(agentId1, range)).thenReturn(fileDescriptorBoList1);
6362

64-
List<FileDescriptorBo> fileDescriptorBoList2 = new ArrayList<>();
6563
FileDescriptorBo fileDescriptorBo2_1 = new FileDescriptorBo();
6664
fileDescriptorBo2_1.setOpenFileDescriptorCount(250);
6765
FileDescriptorBo fileDescriptorBo2_2 = new FileDescriptorBo();
6866
fileDescriptorBo2_2.setOpenFileDescriptorCount(350);
6967
FileDescriptorBo fileDescriptorBo2_3 = new FileDescriptorBo();
7068
fileDescriptorBo2_3.setOpenFileDescriptorCount(450);
71-
fileDescriptorBoList2.add(fileDescriptorBo2_1);
72-
fileDescriptorBoList2.add(fileDescriptorBo2_2);
73-
fileDescriptorBoList2.add(fileDescriptorBo2_3);
69+
List<FileDescriptorBo> fileDescriptorBoList2 = List.of(
70+
fileDescriptorBo2_1,
71+
fileDescriptorBo2_2,
72+
fileDescriptorBo2_3
73+
);
7474
when(fileDescriptorDao.getAgentStatList(agentId2, range)).thenReturn(fileDescriptorBoList2);
7575

7676
FileDescriptorDataCollector fileDescriptorDataCollector = new FileDescriptorDataCollector(
@@ -83,8 +83,9 @@ public void collect() {
8383

8484
fileDescriptorDataCollector.collect();
8585
Map<String, Long> fileDescriptorCount = fileDescriptorDataCollector.getFileDescriptorCount();
86-
assertEquals(fileDescriptorCount.size(), 2);
87-
assertEquals(fileDescriptorCount.get(agentId1), Long.valueOf(300L));
88-
assertEquals(fileDescriptorCount.get(agentId2), Long.valueOf(350L));
86+
Assertions.assertThat(fileDescriptorCount)
87+
.hasSize(2)
88+
.containsEntry(agentId1, 300L)
89+
.containsEntry(agentId2, 350L);
8990
}
9091
}

‎batch/src/test/java/com/navercorp/pinpoint/batch/job/AgentCountPartitionerTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
package com.navercorp.pinpoint.batch.job;
1818

19+
import org.assertj.core.api.Assertions;
1920
import org.junit.jupiter.api.Test;
2021
import org.springframework.batch.item.ExecutionContext;
2122

2223
import java.util.Map;
2324
import java.util.Optional;
2425

25-
import static org.junit.jupiter.api.Assertions.assertEquals;
26-
2726
/**
2827
* @author minwoo.jung
2928
*/
@@ -33,7 +32,7 @@ public class AgentCountPartitionerTest {
3332
public void partition() throws Exception {
3433
AgentCountPartitioner partitioner = new AgentCountPartitioner(Optional.empty());
3534
Map<String, ExecutionContext> partition = partitioner.partition(0);
36-
assertEquals(1, partition.size());
35+
Assertions.assertThat(partition).hasSize(1);
3736
}
3837

3938
}

‎bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/BootLoaderTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import java.util.Enumeration;
2929
import java.util.List;
3030

31+
import static org.assertj.core.api.Assertions.assertThat;
32+
3133
/**
3234
* @author Woonduk Kang(emeroad)
3335
*/
@@ -60,8 +62,7 @@ public void testFindResources() throws IOException {
6062

6163
Enumeration<URL> bootstrapResources = bootLoader.findResources(stringResource);
6264
List<URL> list = Collections.list(bootstrapResources);
63-
Assertions.assertEquals(1, list.size());
64-
logger.debug("list:{}", list);
65+
assertThat(list).hasSize(1);
6566
}
6667

6768
@Test

0 commit comments

Comments
 (0)