[#noissue] Cleanup

pinpoint-apm · Feb 8, 2023 · cc892aa · cc892aa
1 parent fba19ef
commit cc892aa
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 27 deletions.
diff --git a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/BootLogger.java b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/BootLogger.java
@@ -30,7 +30,7 @@
 public final class BootLogger {
 
     private static final String FORMAT = "%tm-%<td %<tT.%<tL %-5s %-35.35s : %s";
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    private static final String LINE_SEPARATOR = System.lineSeparator();
 
     private static final BootLogLevel LOG_LEVEL = getLogLevel();
     private final String loggerName;

diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/ServerBootLogger.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/ServerBootLogger.java
@@ -14,7 +14,7 @@ public final class ServerBootLogger {
     private final PrintStream err = System.err;
 
     private static final String LOGGER_FORMAT = "%-35.35s";
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    private static final String LINE_SEPARATOR = System.lineSeparator();
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("MM-dd HH:mm:ss.SSS");
 
     private ServerBootLogger(String loggerName) {

diff --git a/...l-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/interfaces/MethodInterfaceTest.java b/...l-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/interfaces/MethodInterfaceTest.java
@@ -185,7 +185,7 @@ public void isInterceptable() throws Exception {
         ClassNode classNode = TestClassLoader.get("com.navercorp.test.pinpoint.jdk8.interfaces.MethodInterface");
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         EngineComponent engineComponent = mock(EngineComponent.class);
-        ASMClass clazz = new ASMClass(engineComponent, pluginContext, classLoader, null, classNode);
+        ASMClass clazz = ASMClass.load(engineComponent, pluginContext, classLoader, null, classNode);
         assertTrue(clazz.isInterceptable());
     }
 

diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/MockApplicationContextFactory.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/MockApplicationContextFactory.java
@@ -53,8 +53,7 @@ private ProfilerConfig loadProfilerConfig(String configPath) {
     }
 
     public DefaultApplicationContext build(ProfilerConfig config) {
-        DefaultApplicationContext context = build(config, newModuleFactory());
-        return context;
+        return build(config, newModuleFactory());
     }
 
     public DefaultApplicationContext build(ProfilerConfig config, ModuleFactory moduleFactory) {

diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/MockApplicationContextModule.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/MockApplicationContextModule.java
@@ -64,8 +64,7 @@ protected void configure() {
 
     private ServerMetaDataRegistryService newServerMetaDataRegistryService() {
         List<String> vmArgs = RuntimeMXBeanUtils.getVmArgs();
-        ServerMetaDataRegistryService serverMetaDataRegistryService = new DefaultServerMetaDataRegistryService(vmArgs);
-        return serverMetaDataRegistryService;
+        return new DefaultServerMetaDataRegistryService(vmArgs);
     }
 
 }
diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/OrderedSpanRecorder.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/OrderedSpanRecorder.java
@@ -32,11 +32,8 @@
  * @author Jongho Moon
  */
 public class OrderedSpanRecorder implements ListenableDataSender.Listener<SpanType>, Iterable<SpanType> {
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    private static final String LINE_SEPARATOR = System.lineSeparator();
     public static final int ROOT_SEQUENCE = -1;
-    public static final int ASYNC_ID_NOT_SET = -1;
-    public static final int ASYNC_SEQUENCE_NOT_SET = -1;
-
     private final List<Item<SpanType>> list = new ArrayList<>();
 
     public OrderedSpanRecorder() {
@@ -63,7 +60,7 @@ private void insertSpan(Span span) {
         long startTime = span.getStartTime();
         TraceRoot traceRoot = span.getTraceRoot();
 
-        Item<SpanType> item = new Item<SpanType>(span, startTime, traceRoot, ROOT_SEQUENCE);
+        Item<SpanType> item = new Item<>(span, startTime, traceRoot, ROOT_SEQUENCE);
         insertItem(item);
     }
 
@@ -87,7 +84,7 @@ private void handleSpanEvent(SpanChunk spanChunk) {
 
         final SpanEvent event = spanEventList.get(0);
         long startTime = event.getStartTime();
-        Item<SpanType> item = new Item<SpanType>(spanChunk, startTime, spanChunk.getTraceRoot(), event.getSequence());
+        Item<SpanType> item = new Item<>(spanChunk, startTime, spanChunk.getTraceRoot(), event.getSequence());
         insertItem(item);
     }
 

diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/PluginApplicationContextModule.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/PluginApplicationContextModule.java
@@ -67,7 +67,7 @@ protected void configure() {
 
         bind(StorageFactory.class).to(TestSpanStorageFactory.class);
 
-        bind(PinpointClientFactory.class).toProvider(Providers.of((PinpointClientFactory)null));
+        bind(PinpointClientFactory.class).toProvider(Providers.of(null));
 
         EnhancedDataSender<MetaDataType> enhancedDataSender = newTcpDataSender();
         logger.debug("enhancedDataSender:{}", enhancedDataSender);

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClass.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClass.java
@@ -69,8 +69,9 @@ public class ASMClass implements InstrumentClass {
     private boolean modified = false;
     private String name;
 
-    public ASMClass(EngineComponent engineComponent, final InstrumentContext pluginContext, final ClassLoader classLoader, ProtectionDomain protectionDomain, final ClassNode classNode) {
-        this(engineComponent, pluginContext, new ASMClassNodeAdapter(pluginContext, classLoader, protectionDomain, classNode));
+    public static ASMClass load(EngineComponent engineComponent, final InstrumentContext pluginContext, final ClassLoader classLoader, ProtectionDomain protectionDomain, final ClassNode classNode) {
+        ASMClassNodeAdapter classNodeAdapter = new ASMClassNodeAdapter(pluginContext, classLoader, protectionDomain, classNode);
+        return new ASMClass(engineComponent, pluginContext, classNodeAdapter);
     }
 
     public ASMClass(EngineComponent engineComponent, final InstrumentContext pluginContext, final ASMClassNodeAdapter classNode) {

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMEngine.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMEngine.java
@@ -63,8 +63,7 @@ public InstrumentClass getClass(InstrumentContext instrumentContext, ClassLoader
             final ClassNode classNode = new ClassNode();
             classReader.accept(classNode, 0);
 
-
-            return new ASMClass(engineComponent, instrumentContext, classLoader, protectionDomain, classNode);
+            return ASMClass.load(engineComponent, instrumentContext, classLoader, protectionDomain, classNode);
         } catch (Exception e) {
             throw new NotFoundInstrumentException(e);
         }

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/DeadlockMonitorTask.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/DeadlockMonitorTask.java
@@ -31,7 +31,7 @@
  */
 public class DeadlockMonitorTask implements Runnable {
 
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    private static final String LINE_SEPARATOR = System.lineSeparator();
 
     private final Logger logger = LogManager.getLogger(this.getClass());
 

diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java
@@ -650,6 +650,6 @@ public void isInterceptorable() throws Exception {
     private ASMClass getClass(final String targetClassName) throws Exception {
         ClassNode classNode = loader.get(targetClassName);
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        return new ASMClass(engineComponent, pluginContext, classLoader, getClass().getProtectionDomain(), classNode);
+        return ASMClass.load(engineComponent, pluginContext, classLoader, getClass().getProtectionDomain(), classNode);
     }
 }
diff --git a/...rc/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterTestMain.java b/...rc/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterTestMain.java
@@ -99,7 +99,8 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
                     try {
                         ClassNode classNode = loader.get(JavaAssistUtils.javaNameToJvmName(name));
                         EngineComponent engineComponent = mock(DefaultEngineComponent.class);
-                        ASMClass asmClass = new ASMClass(engineComponent, null, null, null, classNode);
+
+                        ASMClass asmClass = ASMClass.load(engineComponent, null, null, null, classNode);
                         if (asmClass.isInterceptable()) {
                             for (InstrumentMethod method : asmClass.getDeclaredMethods()) {
                                 try {

diff --git a/tools/src/main/java/com/navercorp/pinpoint/tools/network/AbstractNetworkChecker.java b/tools/src/main/java/com/navercorp/pinpoint/tools/network/AbstractNetworkChecker.java
@@ -14,7 +14,7 @@
 public abstract class AbstractNetworkChecker implements NetworkChecker {
 
     private static final String WHITE_SPACE = "    "; // 4space
-    private static final String LINE_SEPARATOR = "\r\n";
+    private static final String LINE_SEPARATOR = System.lineSeparator();
 
     private final String testName;
 
@@ -43,7 +43,7 @@ public void check() throws IOException {
             report.append(createReport(ipAddress, check));
         }
 
-        System.out.println(report.toString());
+        System.out.println(report);
 
     }
 
@@ -59,12 +59,11 @@ public void check(byte[] requestData, byte[] expectedResponseData) throws IOExce
             report.append(createReport(ipAddress, check));
         }
 
-        System.out.println(report.toString());
+        System.out.println(report);
     }
 
     private String getHostName(InetSocketAddress hostAddress) {
-        String hostName = hostAddress.getHostName();
-        return hostName;
+        return hostAddress.getHostName();
     }
 
     private String createReport(InetSocketAddress socketAddress, boolean check) {

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/ThreadDumpUtils.java b/web/src/main/java/com/navercorp/pinpoint/web/util/ThreadDumpUtils.java
@@ -33,7 +33,7 @@
  */
 public final class ThreadDumpUtils {
 
-    public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    public static final String LINE_SEPARATOR = System.lineSeparator();
     public static final String TAB_SEPARATOR = "    "; // tab to 4 spaces
 
     public static String createDumpMessage(TThreadDump threadDump) {