From 5941ac02b1803908c242c3badf283e6bef71cdf9 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Thu, 13 Sep 2012 10:06:39 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20=EC=9D=B8=ED=84=B0=EC=85=89=ED=84=B0=EC=9D=98=20=EC=9E=91?= =?UTF-8?q?=EB=AA=85=EA=B7=9C=EC=B9=99=EC=9D=84=20class=EB=AA=85+=ED=96=89?= =?UTF-8?q?=EC=9C=84=20=EB=A1=9C=20=ED=86=B5=EC=9D=BC=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@655 84d0f5b1-2673-498c-a247-62c4ff18d310 --- ...ptor.java => ConnectionCloseInterceptor.java} | 4 ++-- ...tor.java => ConnectionCreateInterceptor.java} | 4 ++-- ...a => PreparedStatementCreateInterceptor.java} | 4 ++-- ...ptor.java => StatementCreateInterceptor.java} | 4 ++-- ...ava => StatementExecuteQueryInterceptor.java} | 8 ++++---- .../db/mysql/MySQLConnectionImplModifier.java | 16 ++++++++-------- .../db/mysql/MySQLStatementModifier.java | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) rename src/main/java/com/profiler/modifier/db/interceptor/{CloseConnectionInterceptor.java => ConnectionCloseInterceptor.java} (85%) rename src/main/java/com/profiler/modifier/db/interceptor/{CreateConnectionInterceptor.java => ConnectionCreateInterceptor.java} (86%) rename src/main/java/com/profiler/modifier/db/interceptor/{CreatePreparedStatementInterceptor.java => PreparedStatementCreateInterceptor.java} (86%) rename src/main/java/com/profiler/modifier/db/interceptor/{CreateStatementInterceptor.java => StatementCreateInterceptor.java} (88%) rename src/main/java/com/profiler/modifier/db/interceptor/{ExecuteQueryMethodInterceptor.java => StatementExecuteQueryInterceptor.java} (88%) diff --git a/src/main/java/com/profiler/modifier/db/interceptor/CloseConnectionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCloseInterceptor.java similarity index 85% rename from src/main/java/com/profiler/modifier/db/interceptor/CloseConnectionInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/ConnectionCloseInterceptor.java index 3df732e05..3da3edcf5 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/CloseConnectionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCloseInterceptor.java @@ -9,9 +9,9 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; -public class CloseConnectionInterceptor implements StaticBeforeInterceptor { +public class ConnectionCloseInterceptor implements StaticBeforeInterceptor { - private final Logger logger = Logger.getLogger(CloseConnectionInterceptor.class.getName()); + private final Logger logger = Logger.getLogger(ConnectionCloseInterceptor.class.getName()); private final MetaObject setUrl = new MetaObject("__setUrl", String.class); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/CreateConnectionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java similarity index 86% rename from src/main/java/com/profiler/modifier/db/interceptor/CreateConnectionInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java index b4b3253eb..122b7e361 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/CreateConnectionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java @@ -10,9 +10,9 @@ import com.profiler.util.InterceptorUtils; import com.profiler.util.MetaObject; import com.profiler.util.StringUtils; -public class CreateConnectionInterceptor implements StaticAfterInterceptor { +public class ConnectionCreateInterceptor implements StaticAfterInterceptor { - private final Logger logger = Logger.getLogger(CreateConnectionInterceptor.class.getName()); + private final Logger logger = Logger.getLogger(ConnectionCreateInterceptor.class.getName()); private final MetaObject setUrl = new MetaObject("__setUrl", String.class); @Override public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result) { diff --git a/src/main/java/com/profiler/modifier/db/interceptor/CreatePreparedStatementInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java similarity index 86% rename from src/main/java/com/profiler/modifier/db/interceptor/CreatePreparedStatementInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java index dfba82835..7a02ae84e 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/CreatePreparedStatementInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; -public class CreatePreparedStatementInterceptor implements StaticAfterInterceptor { - private final Logger logger = Logger.getLogger(CreatePreparedStatementInterceptor.class.getName()); +public class PreparedStatementCreateInterceptor implements StaticAfterInterceptor { + private final Logger logger = Logger.getLogger(PreparedStatementCreateInterceptor.class.getName()); // connection 용. private final MetaObject getUrl = new MetaObject("__getUrl"); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/CreateStatementInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/StatementCreateInterceptor.java similarity index 88% rename from src/main/java/com/profiler/modifier/db/interceptor/CreateStatementInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/StatementCreateInterceptor.java index 715f59af8..9e9059e49 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/CreateStatementInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementCreateInterceptor.java @@ -11,9 +11,9 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; -public class CreateStatementInterceptor implements StaticAfterInterceptor { +public class StatementCreateInterceptor implements StaticAfterInterceptor { - private final Logger logger = Logger.getLogger(CreateStatementInterceptor.class.getName()); + private final Logger logger = Logger.getLogger(StatementCreateInterceptor.class.getName()); // connection 용. private final MetaObject getUrl = new MetaObject("__getUrl", String.class); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/ExecuteQueryMethodInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java similarity index 88% rename from src/main/java/com/profiler/modifier/db/interceptor/ExecuteQueryMethodInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java index 6b8c6513c..759babba2 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/ExecuteQueryMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java @@ -17,9 +17,9 @@ import java.util.logging.Logger; * @author netspider * */ -public class ExecuteQueryMethodInterceptor implements StaticAroundInterceptor { +public class StatementExecuteQueryInterceptor implements StaticAroundInterceptor { - private final Logger logger = Logger.getLogger(ExecuteQueryMethodInterceptor.class.getName()); + private final Logger logger = Logger.getLogger(StatementExecuteQueryInterceptor.class.getName()); private final MetaObject getUrl = new MetaObject("", "__getUrl"); @@ -48,7 +48,7 @@ public class ExecuteQueryMethodInterceptor implements StaticAroundInterceptor { Trace.record(Annotation.ClientSend); - StopWatch.start("ExecuteQueryMethodInterceptor"); + StopWatch.start("StatementExecuteQueryInterceptor"); } catch (Exception e) { if (logger.isLoggable(Level.WARNING)) { logger.log(Level.WARNING, e.getMessage(), e); @@ -71,7 +71,7 @@ public class ExecuteQueryMethodInterceptor implements StaticAroundInterceptor { Trace.traceBlockBegin(); Trace.recordAttibute("Success", InterceptorUtils.isSuccess(result)); - Trace.record(Annotation.ClientRecv, StopWatch.stopAndGetElapsed("ExecuteQueryMethodInterceptor")); + Trace.record(Annotation.ClientRecv, StopWatch.stopAndGetElapsed("StatementExecuteQueryInterceptor")); Trace.traceBlockEnd(); } } diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java index e4119efda..ba25ee419 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java @@ -36,26 +36,26 @@ public class MySQLConnectionImplModifier extends AbstractModifier { mysqlConnection.addTraceVariable("__url", "__setUrl", "__getUrl", "java.lang.String"); // 해당 Interceptor를 공통클래스 만들경우 system에 로드해야 된다. -// Interceptor createConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CreateConnectionInterceptor"); - Interceptor createConnection = new CreateConnectionInterceptor(); +// Interceptor createConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.ConnectionCreateInterceptor"); + Interceptor createConnection = new ConnectionCreateInterceptor(); String[] params = new String[] { "java.lang.String", "int", "java.util.Properties", "java.lang.String", "java.lang.String" }; mysqlConnection.addInterceptor("getInstance", params, createConnection); -// Interceptor closeConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CloseConnectionInterceptor"); - Interceptor closeConnection = new CloseConnectionInterceptor(); +// Interceptor closeConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.ConnectionCloseInterceptor"); + Interceptor closeConnection = new ConnectionCloseInterceptor(); mysqlConnection.addInterceptor("close", null, closeConnection); -// Interceptor createStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CreateStatementInterceptor"); - Interceptor createStatement = new CreateStatementInterceptor(); +// Interceptor createStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.StatementCreateInterceptor"); + Interceptor createStatement = new StatementCreateInterceptor(); mysqlConnection.addInterceptor("createStatement", null, createStatement); -// Interceptor preparedStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CreatePreparedStatementInterceptor"); - Interceptor preparedStatement = new CreatePreparedStatementInterceptor(); +// Interceptor preparedStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.PreparedStatementCreateInterceptor"); + Interceptor preparedStatement = new PreparedStatementCreateInterceptor(); mysqlConnection.addInterceptor("prepareStatement", new String[]{"java.lang.String"}, preparedStatement); diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java index 34e8eea8c..c376774ce 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java @@ -6,7 +6,7 @@ import java.util.logging.Logger; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.InstrumentException; -import com.profiler.modifier.db.interceptor.ExecuteQueryMethodInterceptor; +import com.profiler.modifier.db.interceptor.StatementExecuteQueryInterceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; @@ -33,8 +33,8 @@ public class MySQLStatementModifier extends AbstractModifier { try { InstrumentClass statementClass = byteCodeInstrumentor.getClass(javassistClassName); -// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.ExecuteQueryMethodInterceptor"); - Interceptor interceptor = new ExecuteQueryMethodInterceptor(); +// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.StatementExecuteQueryInterceptor"); + Interceptor interceptor = new StatementExecuteQueryInterceptor(); statementClass.addInterceptor("executeQuery", new String[]{"java.lang.String"}, interceptor);