You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2019/10/11 11:17:08 UTC
[skywalking] branch master updated: Optimize code (#3600)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 1b1e80b Optimize code (#3600)
1b1e80b is described below
commit 1b1e80b75ab4e33150663286a1212a29a92158d9
Author: echooymxq <ec...@gmail.com>
AuthorDate: Fri Oct 11 19:17:03 2019 +0800
Optimize code (#3600)
---
.../org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java | 2 +-
.../apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java | 2 +-
.../main/java/org/apache/skywalking/oap/server/core/RunningMode.java | 4 ++--
.../oap/server/core/analysis/data/LimitedSizeDataCollection.java | 2 +-
.../skywalking/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 a0ccf84..58d6b9c 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 f70367f..d25ca04 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 5c52745..8a282dc 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 12cd96c..69d9e8e 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 5a703e5..3f44678 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 bba2fc0..b8f2f5a 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;
}