From 1b1e80b75ab4e33150663286a1212a29a92158d9 Mon Sep 17 00:00:00 2001
From: echooymxq <echooy.mxq@gmail.com>
Date: Fri, 11 Oct 2019 19:17:03 +0800
Subject: [PATCH] Optimize code (#3600)

---
 .../skywalking/apm/agent/core/remote/AgentIDDecorator.java    | 2 +-
 .../spring/patch/GetPropertyDescriptorsInterceptor.java       | 2 +-
 .../org/apache/skywalking/oap/server/core/RunningMode.java    | 4 ++--
 .../server/core/analysis/data/LimitedSizeDataCollection.java  | 2 +-
 .../oap/server/core/analysis/data/MergeDataCollection.java    | 2 +-
 .../oap/server/core/analysis/data/NonMergeDataCollection.java | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java
index a0ccf842be..58d6b9c268 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java
@@ -57,7 +57,7 @@ public class AgentIDDecorator implements ChannelDecorator {
                     Attributes mainAttribs = manifest.getMainAttributes();
                     String projectName = mainAttribs.getValue("Implementation-Vendor-Id");
                     if (projectName != null) {
-                        if (projectName.equals("org.apache.skywalking")) {
+                        if ("org.apache.skywalking".equals(projectName)) {
                             version = mainAttribs.getValue("Implementation-Version");
                         }
                     }
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java
index f70367f6ef..d25ca0496a 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java
@@ -44,7 +44,7 @@ public class GetPropertyDescriptorsInterceptor implements InstanceMethodsAroundI
         if (EnhancedInstance.class.isAssignableFrom(((BeanWrapperImpl)objInst).getRootClass())) {
             List<PropertyDescriptor> newPropertyDescriptors = new ArrayList<PropertyDescriptor>();
             for (PropertyDescriptor descriptor : propertyDescriptors) {
-                if (!descriptor.getName().equals("skyWalkingDynamicField")) {
+                if (!"skyWalkingDynamicField".equals(descriptor.getName())) {
                     newPropertyDescriptors.add(descriptor);
                 }
             }
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java
index 5c5274527d..8a282dce28 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java
@@ -43,7 +43,7 @@ public class RunningMode {
      * @return true if in this status
      */
     public static boolean isInitMode() {
-        return MODE.equals("init");
+        return "init".equals(MODE);
     }
 
     /**
@@ -51,6 +51,6 @@ public class RunningMode {
      * @return true if in this status.
      */
     public static boolean isNoInitMode() {
-        return MODE.equals("no-init");
+        return "no-init".equals(MODE);
     }
 }
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
index 12cd96c7f5..69d9e8eb27 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java
@@ -35,7 +35,7 @@ public class LimitedSizeDataCollection<STORAGE_DATA extends ComparableStorageDat
         this.limitedSize = limitedSize;
     }
 
-    public void finishWriting() {
+    @Override public void finishWriting() {
         writing = false;
     }
 
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java
index 5a703e5ad4..3f44678327 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java
@@ -36,7 +36,7 @@ public class MergeDataCollection<STREAM_DATA extends StreamData> implements SWCo
         this.reading = false;
     }
 
-    public void finishWriting() {
+    @Override public void finishWriting() {
         writing = false;
     }
 
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java
index bba2fc05c3..b8f2f5acf0 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java
@@ -36,7 +36,7 @@ public class NonMergeDataCollection<STORAGE_DATA extends StorageData> implements
         this.reading = false;
     }
 
-    public void finishWriting() {
+    @Override public void finishWriting() {
         writing = false;
     }
 
-- 
GitLab