From 04041ebd7ea9c318befd7c161e7a2c34b3363633 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Sun, 4 Jun 2017 17:52:31 +0800
Subject: [PATCH] =?UTF-8?q?Remove=20the=20=E2=80=9Cget=E2=80=9D=20method?=
 =?UTF-8?q?=20of=20String/Boolean/Integer=20Tags.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skywalking/apm/trace/tag/AbstractTag.java   |  2 --
 .../skywalking/apm/trace/tag/BooleanTag.java    | 17 ++---------------
 .../org/skywalking/apm/trace/tag/IntTag.java    | 17 -----------------
 .../org/skywalking/apm/trace/tag/StringTag.java |  5 -----
 .../mock/trace/tag/BooleanTagGetter.java        |  7 ++++++-
 .../sniffer/mock/trace/tag/IntTagGetter.java    |  7 ++++++-
 6 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/AbstractTag.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/AbstractTag.java
index 1ded62e982..cc37ea86be 100644
--- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/AbstractTag.java
+++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/AbstractTag.java
@@ -30,6 +30,4 @@ public abstract class AbstractTag<T> {
     public String key() {
         return this.key;
     }
-
-    public abstract T get(Span span);
 }
diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/BooleanTag.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/BooleanTag.java
index a08d50e573..0b9e091d7a 100644
--- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/BooleanTag.java
+++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/BooleanTag.java
@@ -21,20 +21,7 @@ public class BooleanTag extends AbstractTag<Boolean> {
         span.setTag(key, tagValue);
     }
 
-    /**
-     * Get a tag value, type of {@link Boolean}. After akka-message/serialize, all tags values are type of {@link
-     * String}, convert to {@link Boolean}, if necessary.
-     *
-     * @param span
-     * @return tag value
-     */
-    @Override
-    public Boolean get(Span span) {
-        Boolean tagValue = span.getBoolTag(super.key);
-        if (tagValue == null) {
-            return defaultValue;
-        } else {
-            return tagValue;
-        }
+    public boolean defaultValue() {
+        return this.defaultValue;
     }
 }
diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/IntTag.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/IntTag.java
index e02e7e5804..7261cc3501 100644
--- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/IntTag.java
+++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/IntTag.java
@@ -16,21 +16,4 @@ public class IntTag extends AbstractTag<Integer> {
     public void set(Span span, Integer tagValue) {
         span.setTag(super.key, tagValue);
     }
-
-    /**
-     * Get a tag value, type of {@link Integer}. After akka-message/serialize, all tags values are type of {@link
-     * String}, convert to {@link Integer}, if necessary.
-     *
-     * @param span
-     * @return tag value
-     */
-    @Override
-    public Integer get(Span span) {
-        Integer tagValue = span.getIntTag(super.key);
-        if (tagValue == null) {
-            return null;
-        } else {
-            return tagValue;
-        }
-    }
 }
diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/StringTag.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/StringTag.java
index 1fa32f7ce6..1ce53d5dd9 100644
--- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/StringTag.java
+++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/tag/StringTag.java
@@ -17,9 +17,4 @@ public class StringTag extends AbstractTag<String> {
     public void set(Span span, String tagValue) {
         span.setTag(key, tagValue);
     }
-
-    @Override
-    public String get(Span span) {
-        return span.getStrTag(super.key);
-    }
 }
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/BooleanTagGetter.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/BooleanTagGetter.java
index 391c715944..7e2f89f15c 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/BooleanTagGetter.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/BooleanTagGetter.java
@@ -10,6 +10,11 @@ import org.skywalking.apm.trace.tag.BooleanTag;
  */
 public class BooleanTagGetter {
     public static Boolean get(Span span, BooleanTag tag) {
-        return span.getBoolTag(tag.key());
+        Boolean tagValue = span.getBoolTag(tag.key());
+        if (tagValue == null) {
+            return tag.defaultValue();
+        } else {
+            return tagValue;
+        }
     }
 }
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/IntTagGetter.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/IntTagGetter.java
index 43d0b1c19e..04e5bb5f0b 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/IntTagGetter.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/tag/IntTagGetter.java
@@ -10,6 +10,11 @@ import org.skywalking.apm.trace.tag.IntTag;
  */
 public class IntTagGetter {
     public static Integer get(Span span, IntTag tag) {
-        return span.getIntTag(tag.key());
+        Integer tagValue = span.getIntTag(tag.key());
+        if (tagValue == null) {
+            return null;
+        } else {
+            return tagValue;
+        }
     }
 }
-- 
GitLab