- fix typo

 - remove unused import
 - fix unchecked warning (+1 squashed commits)

agent/src/test/java/com/navercorp/pinpoint/plugin/jdk7/activemq/client/util/ActiveMQClientITHelper.java

@@ -32,20 +32,20 @@ public class ActiveMQClientITHelper {
 
     private ActiveMQClientITHelper() {}
 
-    public static final void startBrokers(List<TestBroker> brokers) throws Exception {
+    public static void startBrokers(List<TestBroker> brokers) throws Exception {
         BROKER_SERVICE = new TestBrokerService(brokers);
         BROKER_SERVICE.start();
     }
 
-    public static final void stopBrokers() throws Exception {
+    public static void stopBrokers() throws Exception {
         BROKER_SERVICE.stop();
     }
 
-    public static final ActiveMQSession createSession(String brokerName, String brokerUrl) throws JMSException {
+    public static ActiveMQSession createSession(String brokerName, String brokerUrl) throws JMSException {
         return createSession(brokerName, brokerUrl, false, Session.AUTO_ACKNOWLEDGE);
     }
 
-    public static final ActiveMQSession createSession(String brokerName, String brokerUrl, boolean transacted, int acknowledgeMode) throws JMSException {
+    public static ActiveMQSession createSession(String brokerName, String brokerUrl, boolean transacted, int acknowledgeMode) throws JMSException {
         ActiveMQConnection connection = BROKER_SERVICE.getConnection(brokerName, brokerUrl);
         return (ActiveMQSession) connection.createSession(transacted, acknowledgeMode);
     }

bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/jdk/ThreadLocalRandomUtils.java

@@ -39,7 +39,7 @@ private ThreadLocalRandomUtils() {
         throw new IllegalAccessError();
     }
 
-    private static final ThreadLocalRandomFactory createThreadLocalRandomFactory() {
+    private static ThreadLocalRandomFactory createThreadLocalRandomFactory() {
         final JvmVersion jvmVersion = JvmUtils.getVersion();
         if (jvmVersion == JvmVersion.JAVA_6) {
             return new PinpointThreadLocalRandomFactory();

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexDao.java

@@ -64,7 +64,7 @@ public void insert(final TSpan span) {
         final byte[] value = buffer.getBuffer();
 
         long acceptedTime = acceptedTimeService.getAcceptedTime();
-        final byte[] distributedKey = crateRowKey(span, acceptedTime);
+        final byte[] distributedKey = createRowKey(span, acceptedTime);
         Put put = new Put(distributedKey);
 
         put.addColumn(APPLICATION_TRACE_INDEX_CF_TRACE, makeQualifier(span) , acceptedTime, value);
@@ -81,7 +81,7 @@ private byte[] makeQualifier(final TSpan span) {
         return qualifier;
     }
 
-    private byte[] crateRowKey(TSpan span, long acceptedTime) {
+    private byte[] createRowKey(TSpan span, long acceptedTime) {
         // distribute key evenly
         byte[] applicationTraceIndexRowKey = SpanUtils.getApplicationTraceIndexRowKey(span.getApplicationName(), acceptedTime);
         return rowKeyDistributor.getDistributedKey(applicationTraceIndexRowKey);

commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v1/TraceRowKeyDecoderV1.java

@@ -3,8 +3,6 @@
 import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyDecoder;
 import com.navercorp.pinpoint.common.util.BytesUtils;
 import com.navercorp.pinpoint.common.util.TransactionId;
-import com.sematext.hbase.wd.AbstractRowKeyDistributor;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 /**

commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v1/TraceRowKeyEncoderV1.java

@@ -1,7 +1,6 @@
 package com.navercorp.pinpoint.common.server.bo.serializer.trace.v1;
 
 import com.navercorp.pinpoint.common.PinpointConstants;
-import com.navercorp.pinpoint.common.server.bo.BasicSpan;
 import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyEncoder;
 import com.navercorp.pinpoint.common.util.BytesUtils;
 import com.navercorp.pinpoint.common.util.TransactionId;

commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v1/TraceRowKeyEncoderV1Test.java

@@ -1,7 +1,5 @@
 package com.navercorp.pinpoint.common.server.bo.serializer.trace.v1;
 
-import com.navercorp.pinpoint.common.server.bo.BasicSpan;
-import com.navercorp.pinpoint.common.server.bo.SpanBo;
 import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyDecoder;
 import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyEncoder;
 import com.navercorp.pinpoint.common.util.TransactionId;
@@ -11,8 +9,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Woonduk Kang(emeroad)
  */

commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/TraceRowKeyEncoderV2Test.java

@@ -1,8 +1,6 @@
 package com.navercorp.pinpoint.common.server.bo.serializer.trace.v2;
 
 import com.navercorp.pinpoint.common.hbase.distributor.RangeOneByteSimpleHash;
-import com.navercorp.pinpoint.common.server.bo.BasicSpan;
-import com.navercorp.pinpoint.common.server.bo.SpanBo;
 import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyDecoder;
 import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyEncoder;
 import com.navercorp.pinpoint.common.util.TransactionId;

plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilter.java

@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.bootstrap.util.PathMatcher;

plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java

@@ -54,7 +54,7 @@ public void before(Object target, Object[] args) {
         Trace trace = traceContext.currentRawTraceObject();
         if (trace == null) {
             if(isDebug) {
-                logger.debug("Not found trace. Crate user include trace.");
+                logger.debug("Not found trace. Create user include trace.");
             }
 
             // create user include trace for standalone entry point.

profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMAspectWeaver.java

@@ -139,7 +139,7 @@ private void copyPointCutMethods(final MethodNodes methodNodes, final ASMClassNo
         }
     }
 
-    private class MethodNodes {
+    private static class MethodNodes {
         public final List<ASMMethodNodeAdapter> pointCuts = new ArrayList<ASMMethodNodeAdapter>();
         public final List<ASMMethodNodeAdapter> jointPoints = new ArrayList<ASMMethodNodeAdapter>();
         public final List<ASMMethodNodeAdapter> utils = new ArrayList<ASMMethodNodeAdapter>();

profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodInsnNodeRemapper.java

@@ -67,10 +67,10 @@ public void mapping(final MethodInsnNode methodInsnNode) {
         }
     }
 
-    private class Filter {
-        private String owner;
-        private String name;
-        private String desc;
+    private static class Filter {
+        private final String owner;
+        private final String name;
+        private final String desc;
 
         public Filter(final String owner, final String name, final String desc) {
             this.owner = owner;

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassNodeAdapterTest.java

@@ -120,7 +120,7 @@ public void handle(ClassNode classNode) {
                 adapter.addGetterMethod(getterMethodName, field);
             }
         });
-        Class clazz = classLoader.loadClass(targetClassName);
+        Class<?> clazz = classLoader.loadClass(targetClassName);
         Method method = clazz.getDeclaredMethod(getterMethodName);
         assertEquals(0, method.invoke(clazz.newInstance()));
     }
@@ -140,7 +140,7 @@ public void handle(ClassNode classNode) {
                 adapter.addSetterMethod(setterMethodName, field);
             }
         });
-        Class clazz = classLoader.loadClass(targetClassName);
+        Class<?> clazz = classLoader.loadClass(targetClassName);
         Method method = clazz.getDeclaredMethod(setterMethodName, int.class);
         method.invoke(clazz.newInstance(), 10);
     }

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddDelegatorTest.java

@@ -36,19 +36,19 @@ public void before() {
 
     @Test
     public void addDelegatorMethod() throws Exception {
-        Class clazz = addDelegatorMethod("com.navercorp.pinpoint.profiler.instrument.mock.ExtendedClass", "com.navercorp.pinpoint.profiler.instrument.mock.BaseClass", "base");
+        Class<?> clazz = addDelegatorMethod("com.navercorp.pinpoint.profiler.instrument.mock.ExtendedClass", "com.navercorp.pinpoint.profiler.instrument.mock.BaseClass", "base");
         Method method = clazz.getDeclaredMethod("base");
         method.invoke(clazz.newInstance());
     }
 
     @Test
     public void addDelegatorStaticMethod() throws Exception {
-        Class clazz = addDelegatorMethod("com.navercorp.pinpoint.profiler.instrument.mock.ExtendedClass", "com.navercorp.pinpoint.profiler.instrument.mock.BaseClass", "getInstance");
+        Class<?> clazz = addDelegatorMethod("com.navercorp.pinpoint.profiler.instrument.mock.ExtendedClass", "com.navercorp.pinpoint.profiler.instrument.mock.BaseClass", "getInstance");
         Method method = clazz.getDeclaredMethod("getInstance");
         method.invoke(clazz.newInstance());
     }
 
-    private Class addDelegatorMethod(final String targetClassName, final String superClassName, final String methodName) throws Exception {
+    private Class<?> addDelegatorMethod(final String targetClassName, final String superClassName, final String methodName) throws Exception {
         final ClassNode superClassNode = ASMClassNodeLoader.get(superClassName);
         List<MethodNode> methodNodes = superClassNode.methods;
         final MethodNode methodNode = findMethodNode(methodName, methodNodes);

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java

@@ -121,7 +121,7 @@ private void addInterceptor(int interceptorId, Class interceptorClass) throws Ex
 
     private void checkMethod(int interceptorId, Class interceptorClass) throws Exception {
         // method
-        Class clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.MethodClass", interceptorClass);
+        Class<?> clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.MethodClass", interceptorClass);
 
         Class[] parameterTypes = new Class[0];
         Object[] args = new Object[0];
@@ -135,7 +135,7 @@ private void checkMethod(int interceptorId, Class interceptorClass) throws Excep
     }
 
     private void checkConstructor(int interceptorId, Class interceptorClass) throws Exception {
-        Class clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ConstructorClass", interceptorClass);
+        Class<?> clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ConstructorClass", interceptorClass);
 
         invokeMethod(clazz, "<init>", interceptorClass, new Class[0], new Object[0], null, false);
         invokeMethod(clazz, "<init>", interceptorClass, new Class[]{byte.class}, new Object[]{Byte.parseByte("0")}, null, false);
@@ -200,7 +200,7 @@ private void checkConstructor(int interceptorId, Class interceptorClass) throws
     }
 
     private void checkArguments(int interceptorId, Class interceptorClass) throws Exception {
-        Class clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ArgsClass", interceptorClass);
+        Class<?> clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ArgsClass", interceptorClass);
 
         invokeMethod(clazz, "arg", interceptorClass, new Class[0], new Object[0], null, false);
         invokeMethod(clazz, "argByteType", interceptorClass, new Class[]{byte.class}, new Object[]{Byte.parseByte("0")}, null, false);
@@ -237,7 +237,7 @@ private void checkArguments(int interceptorId, Class interceptorClass) throws Ex
     }
 
     private void checkReturn(int interceptorId, Class interceptorClass) throws Exception {
-        Class clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ReturnClass", interceptorClass);
+        Class<?> clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ReturnClass", interceptorClass);
 
         invokeMethod(clazz, "voidType", interceptorClass, new Class[0], new Object[0], null, false);
         invokeMethod(clazz, "returnByte", interceptorClass, new Class[0], new Object[0], Byte.parseByte("0"), false);
@@ -255,7 +255,7 @@ private void checkReturn(int interceptorId, Class interceptorClass) throws Excep
     }
 
     private void checkMethodException(int interceptorId, Class interceptorClass) throws Exception {
-        Class clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ExceptionClass", interceptorClass);
+        Class<?> clazz = addInterceptor(interceptorId, "com.navercorp.pinpoint.profiler.instrument.mock.ExceptionClass", interceptorClass);
 
         invokeMethod(clazz, "throwable", interceptorClass, new Class[]{}, new Object[]{}, null, true);
         invokeMethod(clazz, "exception", interceptorClass, new Class[]{}, new Object[]{}, null, true);
@@ -283,14 +283,14 @@ private void checkExtends(int interceptorId, Class interceptorClass) throws Exce
         invokeMethod(clazz, "<init>", interceptorClass, new Class[]{int.class}, new Object[]{1}, null, false);
     }
 
-    private void invokeMethod(final Class clazz, final String methodName, final Class interceptorClass, final Class[] parameterTypes, final Object[] args, final Object returnValue, final boolean throwable) throws Exception {
+    private void invokeMethod(final Class<?> clazz, final String methodName, final Class interceptorClass, final Class[] parameterTypes, final Object[] args, final Object returnValue, final boolean throwable) throws Exception {
         ArgsArrayInterceptor.clear();
         StaticInterceptor.clear();
         ApiIdAwareInterceptor.clear();
         BasicInterceptor.clear();
         ExceptionInterceptor.clear();
 
-        Constructor constructor = null;
+        Constructor<?> constructor = null;
         Method method = null;
         if (methodName.equals("<init>")) {
             constructor = clazz.getConstructor(parameterTypes);

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRemapMethodInsnNodeTest.java

@@ -52,7 +52,7 @@ public void handle(ClassNode classNode) {
                 }
             }
         });
-        Class clazz = classLoader.loadClass(targetClassName);
+        Class<?> clazz = classLoader.loadClass(targetClassName);
         Method method = clazz.getMethod("getHeader", String.class);
         final String result = (String) method.invoke(clazz.newInstance(), "bar");
         System.out.println(result);

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java

@@ -49,7 +49,7 @@ public void handle(ClassNode classNode) {
                 }
             }
         });
-        Class clazz = classLoader.loadClass(targetClassName);
+        Class<?> clazz = classLoader.loadClass(targetClassName);
         Method method = clazz.getDeclaredMethod("sum_rename", int.class);
         method.invoke(clazz.newInstance(), 10);
    }

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java

@@ -112,7 +112,7 @@ public void handle(ClassNode classNode) {
                 }
             }
         });
-        Class clazz = classLoader.loadClass(targetClassName);
+        Class<?> clazz = classLoader.loadClass(targetClassName);
         Method method = clazz.getDeclaredMethod("sum", int.class);
 
         assertEquals(55, method.invoke(clazz.newInstance(), 10));

profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/mock/ExceptionClass.java

@@ -42,7 +42,7 @@ public void io2() throws IOException {
     }
 
     public void condition() {
-        if(true) {
+        if (true) {
             runtime();
         }
     }

thirdparty/google-guava/src/main/java/com/google/common/util/concurrent/WrappingExecutorService.java

@@ -80,7 +80,7 @@ protected Runnable wrapTask(Runnable command) {
    *
    * @throws NullPointerException if any element of {@code tasks} is null
    */
-  private final <T> ImmutableList<Callable<T>> wrapTasks(
+  private <T> ImmutableList<Callable<T>> wrapTasks(
       Collection<? extends Callable<T>> tasks) {
     ImmutableList.Builder<Callable<T>> builder = ImmutableList.builder();
     for (Callable<T> task : tasks) {

web/src/main/java/com/navercorp/pinpoint/web/alarm/checker/TotalCountToCalleeChecker.java

@@ -31,7 +31,7 @@ public TotalCountToCalleeChecker(MapStatisticsCallerDataCollector dataCollector,
 
     @Override
     protected long getDetectedValue() {
-        String calleName = rule.getNotes();
-        return ((MapStatisticsCallerDataCollector)dataCollector).getCount(calleName, DataCategory.TOTAL_COUNT);
+        String calleeName = rule.getNotes();
+        return ((MapStatisticsCallerDataCollector)dataCollector).getCount(calleeName, DataCategory.TOTAL_COUNT);
     }
 }

web/src/main/java/com/navercorp/pinpoint/web/controller/ConfigController.java

@@ -63,7 +63,7 @@ public Map<String, Object> getProperties(@RequestHeader(value=SSO_USER, required
         }
 
         if(!StringUtils.isEmpty(webProperties.getSecurityGuideUrl())) {
-        	result.put("securityGuideUrl", webProperties.getSecurityGuideUrl());
+            result.put("securityGuideUrl", webProperties.getSecurityGuideUrl());
         }
 
         return result;

web/src/main/java/com/navercorp/pinpoint/web/dao/TraceDao.java

@@ -17,7 +17,6 @@
 package com.navercorp.pinpoint.web.dao;
 
 
-import java.util.Collection;
 import java.util.List;
 
 import com.navercorp.pinpoint.common.server.bo.SpanBo;

web/src/main/java/com/navercorp/pinpoint/web/filter/LinkFilter.java

@@ -112,11 +112,11 @@ public LinkFilter(FilterDescriptor filterDescriptor, FilterHint filterHint, Serv
 
         this.rpcHintList = this.filterHint.getRpcHintList(fromApplicationName);
         // TODO fix : fromSpan base rpccall filter
-        this.acceptURLFilter = cratePatternFilter(filterDescriptor);
+        this.acceptURLFilter = createPatternFilter(filterDescriptor);
         logger.info("acceptURLFilter:{}", acceptURLFilter);
     }
 
-    private URLPatternFilter cratePatternFilter(FilterDescriptor filterDescriptor) {
+    private URLPatternFilter createPatternFilter(FilterDescriptor filterDescriptor) {
         if (filterDescriptor.getUrlPattern() == null) {
             return new BypassURLPatternFilter();
         }