From cf7580e4e9098cd4f59c8a882d051f238404dd22 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Thu, 18 Dec 2014 16:43:49 +0900 Subject: [PATCH] #119 code clean-up - findbug, pmd, klocwork normal Priority - fix UnusedModifier --- .../bootstrap/instrument/InstrumentClass.java | 49 +++++------ .../bootstrap/instrument/MethodInfo.java | 10 +-- .../pinpoint/bootstrap/logging/PLogger.java | 48 +++++------ .../bootstrap/plugin/ClassEditor.java | 2 +- .../bootstrap/plugin/ClassEditorFactory.java | 2 +- .../pinpoint/bootstrap/plugin/Condition.java | 2 +- .../plugin/DedicatedClassEditor.java | 2 +- .../bootstrap/plugin/InterceptorFactory.java | 2 +- .../bootstrap/plugin/InterceptorInjector.java | 2 +- .../MetadataInitializationStrategy.java | 4 +- .../bootstrap/plugin/MetadataInjector.java | 2 +- .../bootstrap/plugin/ProfilerPlugin.java | 2 +- .../collector/dao/ApplicationIndexDao.java | 2 +- .../mapper/thrift/ThriftBoMapper.java | 2 +- .../pinpoint/common/util/TimeSlot.java | 2 +- .../profiler/modifier/ModifierProvider.java | 2 +- .../monitor/metric/AcceptHistogram.java | 2 +- .../pinpoint/web/dao/AlarmResourceDao.java | 18 ++-- .../pinpoint/web/service/CommonService.java | 2 +- .../web/service/FilteredMapService.java | 16 ++-- .../pinpoint/web/service/MapService.java | 18 ++-- .../web/service/ScatterChartService.java | 84 +++++++++---------- 22 files changed, 137 insertions(+), 138 deletions(-) diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClass.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClass.java index ebcab672a..334db38ae 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClass.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClass.java @@ -1,10 +1,10 @@ package com.navercorp.pinpoint.bootstrap.instrument; -import java.util.List; - import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; import com.navercorp.pinpoint.bootstrap.interceptor.tracevalue.TraceValue; +import java.util.List; + /** * @author emeroad * @author netspider @@ -40,16 +40,17 @@ public interface InstrumentClass { int reuseInterceptor(String methodName, String[] args, int interceptorId, Type type) throws InstrumentException, NotFoundInstrumentException; - int addInterceptor(String methodName, String[] args, Interceptor interceptor) throws InstrumentException, NotFoundInstrumentException; + int addInterceptor(String methodName, String[] args, Interceptor interceptor) throws InstrumentException, NotFoundInstrumentException; int addScopeInterceptor(String methodName, String[] args, Interceptor interceptor, String scopeName) throws InstrumentException, NotFoundInstrumentException; int addScopeInterceptor(String methodName, String[] args, Interceptor interceptor, Scope scope) throws InstrumentException, NotFoundInstrumentException; int addScopeInterceptorIfDeclared(String methodName, String[] args, Interceptor interceptor, String scopeName) throws InstrumentException; + /** * methodName, args가 일치하는 메소드가 클래스에 구현되어있는 경우에만 scope interceptor를 적용합니다. - * + * * @param methodName * @param args * @param interceptor @@ -63,17 +64,17 @@ public interface InstrumentClass { int addInterceptorCallByContextClassLoader(String methodName, String[] args, Interceptor interceptor) throws InstrumentException, NotFoundInstrumentException; - int addInterceptorCallByContextClassLoader(String methodName, String[] args, Interceptor interceptor, Type type) throws InstrumentException, NotFoundInstrumentException; + int addInterceptorCallByContextClassLoader(String methodName, String[] args, Interceptor interceptor, Type type) throws InstrumentException, NotFoundInstrumentException; - void weaving(String adviceClassName) throws InstrumentException; + void weaving(String adviceClassName) throws InstrumentException; - boolean addDebugLogBeforeAfterMethod(); + boolean addDebugLogBeforeAfterMethod(); - boolean addDebugLogBeforeAfterConstructor(); + boolean addDebugLogBeforeAfterConstructor(); - byte[] toBytecode() throws InstrumentException ; + byte[] toBytecode() throws InstrumentException; - Class toClass() throws InstrumentException; + Class toClass() throws InstrumentException; /** * 대신 addTraceValue 를 사용하라. @@ -85,27 +86,27 @@ public interface InstrumentClass { * 대신 addTraceValue 를 사용하라. */ @Deprecated - void addTraceVariable(String variableName, String setterName, String getterName, String variableType) throws InstrumentException; + void addTraceVariable(String variableName, String setterName, String getterName, String variableType) throws InstrumentException; void addTraceValue(Class traceValue, String initValue) throws InstrumentException; void addTraceValue(Class traceValue) throws InstrumentException; - - boolean insertCodeAfterConstructor(String[] args, String code); - boolean insertCodeBeforeConstructor(String[] args, String code); + boolean insertCodeAfterConstructor(String[] args, String code); + + boolean insertCodeBeforeConstructor(String[] args, String code); List getDeclaredMethods(); - - List getDeclaredMethods(MethodFilter methodFilter); - - MethodInfo getDeclaredMethod(String name, String[] parameterTypes); - - MethodInfo getConstructor(String[] parameterTypes); - - public boolean isInterceptable(); - - boolean hasDeclaredMethod(String methodName, String[] args); + + List getDeclaredMethods(MethodFilter methodFilter); + + MethodInfo getDeclaredMethod(String name, String[] parameterTypes); + + MethodInfo getConstructor(String[] parameterTypes); + + boolean isInterceptable(); + + boolean hasDeclaredMethod(String methodName, String[] args); boolean hasMethod(String methodName, String[] parameterTypeArray, String returnType); diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/MethodInfo.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/MethodInfo.java index 87d6e3b14..2c9e3169a 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/MethodInfo.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/MethodInfo.java @@ -6,13 +6,13 @@ import com.navercorp.pinpoint.bootstrap.interceptor.MethodDescriptor; * @author emeroad */ public interface MethodInfo { - public String getName(); + String getName(); - public String[] getParameterTypes(); + String[] getParameterTypes(); - public int getModifiers(); + int getModifiers(); - public boolean isConstructor(); + boolean isConstructor(); - public MethodDescriptor getDescriptor(); + MethodDescriptor getDescriptor(); } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/logging/PLogger.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/logging/PLogger.java index 7f696c350..799712ce4 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/logging/PLogger.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/logging/PLogger.java @@ -36,87 +36,87 @@ public interface PLogger { - public boolean isDebugEnabled(); + boolean isDebugEnabled(); - public void debug(String msg); + void debug(String msg); - public void debug(String format, Object arg); + void debug(String format, Object arg); - public void debug(String format, Object arg1, Object arg2); + void debug(String format, Object arg1, Object arg2); - public void debug(String format, Object[] argArray); + void debug(String format, Object[] argArray); - public void debug(String msg, Throwable t); + void debug(String msg, Throwable t); - public boolean isInfoEnabled(); + boolean isInfoEnabled(); - public void info(String msg); + void info(String msg); - public void info(String format, Object arg); + void info(String format, Object arg); - public void info(String format, Object arg1, Object arg2); + void info(String format, Object arg1, Object arg2); - public void info(String format, Object[] argArray); + void info(String format, Object[] argArray); - public void info(String msg, Throwable t); + void info(String msg, Throwable t); - public boolean isWarnEnabled(); + boolean isWarnEnabled(); - public void warn(String msg); + void warn(String msg); - public void warn(String format, Object arg); + void warn(String format, Object arg); - public void warn(String format, Object[] argArray); + void warn(String format, Object[] argArray); - public void warn(String format, Object arg1, Object arg2); + void warn(String format, Object arg1, Object arg2); - public void warn(String msg, Throwable t); + void warn(String msg, Throwable t); - public boolean isErrorEnabled(); + boolean isErrorEnabled(); - public void error(String msg); + void error(String msg); - public void error(String format, Object arg); + void error(String format, Object arg); - public void error(String format, Object arg1, Object arg2); + void error(String format, Object arg1, Object arg2); - public void error(String format, Object[] argArray); + void error(String format, Object[] argArray); - public void error(String msg, Throwable t); + void error(String msg, Throwable t); diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditor.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditor.java index f0a5d15c6..6c3751933 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditor.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditor.java @@ -3,5 +3,5 @@ package com.navercorp.pinpoint.bootstrap.plugin; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; public interface ClassEditor { - public byte[] edit(ClassLoader classLoader, InstrumentClass target); + byte[] edit(ClassLoader classLoader, InstrumentClass target); } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditorFactory.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditorFactory.java index a77be7bec..42b6056cd 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditorFactory.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ClassEditorFactory.java @@ -1,5 +1,5 @@ package com.navercorp.pinpoint.bootstrap.plugin; public interface ClassEditorFactory { - public ClassEditor get(ProfilerPluginContext context); + ClassEditor get(ProfilerPluginContext context); } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/Condition.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/Condition.java index eb8849461..b0c684e8e 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/Condition.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/Condition.java @@ -3,5 +3,5 @@ package com.navercorp.pinpoint.bootstrap.plugin; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; public interface Condition { - public boolean check(InstrumentClass target); + boolean check(InstrumentClass target); } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/DedicatedClassEditor.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/DedicatedClassEditor.java index cda3b9c72..01ce492b0 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/DedicatedClassEditor.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/DedicatedClassEditor.java @@ -1,5 +1,5 @@ package com.navercorp.pinpoint.bootstrap.plugin; public interface DedicatedClassEditor extends ClassEditor { - public String getTargetClassName(); + String getTargetClassName(); } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorFactory.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorFactory.java index 1ed3dcb7b..6fe252929 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorFactory.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorFactory.java @@ -5,5 +5,5 @@ import com.navercorp.pinpoint.bootstrap.instrument.MethodInfo; import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; public interface InterceptorFactory { - public Interceptor getInterceptor(ClassLoader classLoader, InstrumentClass target, MethodInfo targetMethod); + Interceptor getInterceptor(ClassLoader classLoader, InstrumentClass target, MethodInfo targetMethod); } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorInjector.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorInjector.java index 5e7907061..c67d28b14 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorInjector.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/InterceptorInjector.java @@ -4,5 +4,5 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; public interface InterceptorInjector { - public void inject(ClassLoader classLoader, InstrumentClass target) throws InstrumentException; + void inject(ClassLoader classLoader, InstrumentClass target) throws InstrumentException; } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInitializationStrategy.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInitializationStrategy.java index 3e6fcef3a..1c9ab8199 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInitializationStrategy.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInitializationStrategy.java @@ -3,11 +3,11 @@ package com.navercorp.pinpoint.bootstrap.plugin; public interface MetadataInitializationStrategy { public static final class ByConstructor implements MetadataInitializationStrategy { private final String className; - + public ByConstructor(String className) { this.className = className; } - + public String getClassName() { return className; } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInjector.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInjector.java index 84aaf4d5b..548acbc90 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInjector.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/MetadataInjector.java @@ -4,5 +4,5 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; public interface MetadataInjector { - public void inject(ClassLoader classLoader, InstrumentClass target) throws InstrumentException; + void inject(ClassLoader classLoader, InstrumentClass target) throws InstrumentException; } diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ProfilerPlugin.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ProfilerPlugin.java index 87b85f52c..601717d5b 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ProfilerPlugin.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ProfilerPlugin.java @@ -3,5 +3,5 @@ package com.navercorp.pinpoint.bootstrap.plugin; import java.util.List; public interface ProfilerPlugin { - public List getClassEditors(ProfilerPluginContext context); + List getClassEditors(ProfilerPluginContext context); } diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationIndexDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationIndexDao.java index 25ea88b1c..101e6e0f3 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationIndexDao.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationIndexDao.java @@ -6,5 +6,5 @@ import com.navercorp.pinpoint.thrift.dto.TAgentInfo; * @author emeroad */ public interface ApplicationIndexDao { - public void insert(final TAgentInfo agentInfo); + void insert(final TAgentInfo agentInfo); } diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftBoMapper.java index 743a10674..878c71aa4 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftBoMapper.java @@ -7,5 +7,5 @@ import org.apache.thrift.TBase; */ public interface ThriftBoMapper> { - public T map(F thriftObject); + T map(F thriftObject); } diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/TimeSlot.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/TimeSlot.java index e1c6cae34..f9cfcac4b 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/util/TimeSlot.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/TimeSlot.java @@ -4,5 +4,5 @@ package com.navercorp.pinpoint.common.util; * @author emeroad */ public interface TimeSlot { - public long getTimeSlot(long time); + long getTimeSlot(long time); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java index f487dc77e..12da3caf5 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java @@ -15,5 +15,5 @@ import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; */ @Deprecated public interface ModifierProvider { - public List getModifiers(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent); + List getModifiers(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/AcceptHistogram.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/AcceptHistogram.java index 5a64ef921..eb626d651 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/AcceptHistogram.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/AcceptHistogram.java @@ -4,5 +4,5 @@ package com.navercorp.pinpoint.profiler.monitor.metric; * @author emeroad */ public interface AcceptHistogram { - public boolean addResponseTime(String parentApplicationName, short serviceType, int millis); + boolean addResponseTime(String parentApplicationName, short serviceType, int millis); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/AlarmResourceDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/AlarmResourceDao.java index e7f7a29d6..5483c42ad 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/AlarmResourceDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/AlarmResourceDao.java @@ -8,21 +8,21 @@ import com.navercorp.pinpoint.web.alarm.vo.Rule; public interface AlarmResourceDao { - public List selectAppRule(String applicationName); + List selectAppRule(String applicationName); - public void insertAppRule(List rules); + void insertAppRule(List rules); - public void deleteAppRule(String applicationName); + void deleteAppRule(String applicationName); - public List selectEmpGroupPhoneNumber(String empGroup); + List selectEmpGroupPhoneNumber(String empGroup); - public List selectEmpGroupEmail(String empGroup); + List selectEmpGroupEmail(String empGroup); - public List selectEmpGroupName(); + List selectEmpGroupName(); - public List selectEmpGroupMember(String alarmGroup); + List selectEmpGroupMember(String alarmGroup); - public void insertEmpGroupMember(List emps); + void insertEmpGroupMember(List emps); - public void deleteEmpGroupMember(String groupName); + void deleteEmpGroupMember(String groupName); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/CommonService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/CommonService.java index 656820bcf..7652e709f 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/CommonService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/CommonService.java @@ -9,6 +9,6 @@ import com.navercorp.pinpoint.web.vo.Application; */ public interface CommonService { - public List selectAllApplicationNames(); + List selectAllApplicationNames(); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/FilteredMapService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/FilteredMapService.java index 2bb149772..42ddd2aea 100755 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/FilteredMapService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/FilteredMapService.java @@ -1,24 +1,24 @@ package com.navercorp.pinpoint.web.service; -import java.util.List; - import com.navercorp.pinpoint.web.applicationmap.ApplicationMap; import com.navercorp.pinpoint.web.filter.Filter; import com.navercorp.pinpoint.web.vo.*; +import java.util.List; + /** * @author netspider * @author emeroad */ public interface FilteredMapService { - public LimitedScanResult> selectTraceIdsFromApplicationTraceIndex(String applicationName, Range range, int limit); - - public LimitedScanResult> selectTraceIdsFromApplicationTraceIndex(String applicationName, SelectedScatterArea area, int limit); + LimitedScanResult> selectTraceIdsFromApplicationTraceIndex(String applicationName, Range range, int limit); - public LoadFactor linkStatistics(Range range, List traceIdSet, Application sourceApplication, Application destinationApplication, Filter filter); + LimitedScanResult> selectTraceIdsFromApplicationTraceIndex(String applicationName, SelectedScatterArea area, int limit); - public ApplicationMap selectApplicationMap(List traceIdList, Range originalRange, Range scanRange, Filter filter); + LoadFactor linkStatistics(Range range, List traceIdSet, Application sourceApplication, Application destinationApplication, Filter filter); - public ApplicationMap selectApplicationMap(TransactionId transactionId); + ApplicationMap selectApplicationMap(List traceIdList, Range originalRange, Range scanRange, Filter filter); + + ApplicationMap selectApplicationMap(TransactionId transactionId); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/MapService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/MapService.java index 82f5a112f..8ed12f78c 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/MapService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/MapService.java @@ -9,15 +9,15 @@ import com.navercorp.pinpoint.web.vo.Range; * @author netspider */ public interface MapService { - /** - * 메인 화면의 서버 맵 조회. - * - * @param sourceApplication - * @param range - * @return - */ - public ApplicationMap selectApplicationMap(Application sourceApplication, Range range); + /** + * 메인 화면의 서버 맵 조회. + * + * @param sourceApplication + * @param range + * @return + */ + ApplicationMap selectApplicationMap(Application sourceApplication, Range range); @Deprecated - public NodeHistogram linkStatistics(Application sourceApplication, Application destinationApplication, Range range); + NodeHistogram linkStatistics(Application sourceApplication, Application destinationApplication, Range range); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/ScatterChartService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/ScatterChartService.java index 2b07adca0..5db90d562 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/ScatterChartService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/ScatterChartService.java @@ -1,8 +1,5 @@ package com.navercorp.pinpoint.web.service; -import java.util.Collection; -import java.util.List; - import com.navercorp.pinpoint.common.bo.SpanBo; import com.navercorp.pinpoint.web.filter.Filter; import com.navercorp.pinpoint.web.vo.Range; @@ -11,49 +8,50 @@ import com.navercorp.pinpoint.web.vo.TransactionId; import com.navercorp.pinpoint.web.vo.TransactionMetadataQuery; import com.navercorp.pinpoint.web.vo.scatter.Dot; +import java.util.Collection; +import java.util.List; + public interface ScatterChartService { - /** - * 필터를 사용한 검색. - * - * @param traceIds - * @param applicationName - * @param filter - * @return - */ - public List selectScatterData(Collection traceIds, String applicationName, Filter filter); + /** + * 필터를 사용한 검색. + * + * @param traceIds + * @param applicationName + * @param filter + * @return + */ + List selectScatterData(Collection traceIds, String applicationName, Filter filter); - /** - * 전체 데이터 검색. - * - * @param applicationName - * @param range - * @param limit - * @return - */ - public List selectScatterData(String applicationName, Range range, int limit); + /** + * 전체 데이터 검색. + * + * @param applicationName + * @param range + * @param limit + * @return + */ + List selectScatterData(String applicationName, Range range, int limit); - /** - * - * @param applicationName - * @param area - * @param offsetTransactionId - * @param offsetTransactionElapsed - * @param limit - * @return - */ - public List selectScatterData(String applicationName, SelectedScatterArea area, TransactionId offsetTransactionId, int offsetTransactionElapsed, int limit); - - /** - * scatter dot을 limit 개수만큼 잘라서 조회하기 위해서 사용된다. - * - * @param applicationName - * @param from - * @param to - * @param limit - * @return - */ -// public List selectScatterTraceIdList(String applicationName, long from, long to, int limit); + /** + * @param applicationName + * @param area + * @param offsetTransactionId + * @param offsetTransactionElapsed + * @param limit + * @return + */ + List selectScatterData(String applicationName, SelectedScatterArea area, TransactionId offsetTransactionId, int offsetTransactionElapsed, int limit); - public List selectTransactionMetadata(TransactionMetadataQuery query); + /** + * scatter dot을 limit 개수만큼 잘라서 조회하기 위해서 사용된다. + * + * @param applicationName + * @param from + * @param to + * @param limit + * @return + */ +// List selectScatterTraceIdList(String applicationName, long from, long to, int limit); + List selectTransactionMetadata(TransactionMetadataQuery query); }