Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#noissue] Cleanup #9818

Merged
merged 1 commit into from
Apr 3, 2023
Merged

[#noissue] Cleanup #9818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion collector/src/main/java/com/navercorp/pinpoint/collector/config/CollectorConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void setAgentEventWorkerQueueSize(int agentEventWorkerQueueSize) {
}

public List<String> getL4IpList() {
return Arrays.asList(l4IpList);
return List.of(l4IpList);
}

public void setL4IpList(List<String> l4IpList) {
Expand Down
4 changes: 2 additions & 2 deletions ...tor/src/test/java/com/navercorp/pinpoint/collector/config/CollectorConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/**
* @author emeroad
*/
@TestPropertySource(locations = "classpath:test-pinpoint-collector.properties")
@ContextConfiguration(classes = CollectorConfiguration.class)
@TestPropertySource(properties = "collector.l4.ip=127.0.0.1, 123.123.123.123")
@ExtendWith(SpringExtension.class)
public class CollectorConfigurationTest {

Expand All @@ -39,7 +39,7 @@ public class CollectorConfigurationTest {
@Test
public void l4IpTest() {
assertThat(collectorConfiguration.getL4IpList())
.contains("127.0.0.1", "192.168.0.1", "255.255.255.255");
.contains("127.0.0.1", "123.123.123.123");
}

}
5 changes: 2 additions & 3 deletions flink/src/main/java/com/navercorp/pinpoint/flink/config/FlinkConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
import com.navercorp.pinpoint.common.server.cluster.zookeeper.ZookeeperClusterConfiguration;
import com.navercorp.pinpoint.common.server.config.AnnotationVisitor;
import com.navercorp.pinpoint.common.server.config.LoggingEvent;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -85,7 +84,7 @@ public boolean isLocalforFlinkStreamExecutionEnvironment() {
}

public List<String> getL4IpList() {
return Arrays.asList(l4IpList);
return List.of(l4IpList);
}

@PostConstruct
Expand Down