fix log encode issue and check style failured

ascrutae · ascrutae · commit d68fa5f6e09f · 2017-09-27T17:16:41.000+08:00
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
@@ -1,15 +1,13 @@
 package org.skywalking.apm.agent.core.logging;
 
-import org.skywalking.apm.agent.core.conf.Config;
-import org.skywalking.apm.agent.core.conf.Constants;
-import org.skywalking.apm.util.StringUtil;
-import org.skywalking.apm.logging.ILog;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import org.skywalking.apm.agent.core.conf.Config;
+import org.skywalking.apm.agent.core.conf.Constants;
+import org.skywalking.apm.logging.ILog;
+import org.skywalking.apm.util.StringUtil;
 
 /**
  * The <code>EasyLogger</code> is a simple implementation of {@link ILog}.
@@ -38,7 +36,7 @@ private String replaceParam(String message, Object... parameters) {
                 break;
             }
 
-            tmpMessage = tmpMessage.replaceFirst("\\{\\}", URLEncoder.encode(String.valueOf(parameters[parametersIndex++])));
+            tmpMessage = tmpMessage.replaceFirst("\\{\\}", String.valueOf(parameters[parametersIndex++]));
             startSize = index + 2;
         }
         return tmpMessage;
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptor.java
@@ -2,9 +2,6 @@
 
 import java.lang.reflect.Method;
 import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.http.HttpFields;
-import org.skywalking.apm.agent.core.context.CarrierItem;
-import org.skywalking.apm.agent.core.context.ContextCarrier;
 import org.skywalking.apm.agent.core.context.ContextManager;
 import org.skywalking.apm.agent.core.context.ContextSnapshot;
 import org.skywalking.apm.agent.core.context.tag.Tags;
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptorTest.java
@@ -13,13 +13,10 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
 import org.skywalking.apm.agent.core.context.ContextSnapshot;
-import org.skywalking.apm.agent.core.context.SW3CarrierItem;
 import org.skywalking.apm.agent.core.context.ids.DistributedTraceId;
 import org.skywalking.apm.agent.core.context.ids.ID;
 import org.skywalking.apm.agent.core.context.trace.TraceSegment;
-import org.skywalking.apm.agent.core.context.trace.TraceSegmentRef;
 import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
-import org.skywalking.apm.agent.test.helper.SegmentRefHelper;
 import org.skywalking.apm.agent.test.tools.AgentServiceRule;
 import org.skywalking.apm.agent.test.tools.SegmentStorage;
 import org.skywalking.apm.agent.test.tools.SegmentStoragePoint;
@@ -110,21 +107,4 @@ public void testMethodAroundWithSnapshot() throws Throwable {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         assertThat(traceSegment.getRefs().size(), is(1));
     }
-
-    @Test
-    public void testMethodAroundWithSnapshotAndHeader() throws Throwable {
-        HttpFields fields = new HttpFields();
-        fields.put(SW3CarrierItem.HEADER_NAME, "1.234.111|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*");
-        when(httpResponse.getHeaders()).thenReturn(fields);
-        interceptor.beforeMethod(objectInstanceWithSnapshot, null, allArguments, argumentTypes, null);
-        interceptor.afterMethod(objectInstanceWithSnapshot, null, allArguments, argumentTypes, null);
-
-        assertThat(segmentStorage.getTraceSegments().size(), is(1));
-        TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
-        assertThat(traceSegment.getRefs().size(), is(1));
-        TraceSegmentRef ref = traceSegment.getRefs().get(0);
-        assertThat(SegmentRefHelper.getEntryApplicationInstanceId(ref), is(1));
-        assertThat(SegmentRefHelper.getSpanId(ref), is(3));
-        assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.234.111"));
-    }
 }
