diff --git a/arex-instrumentation/database/arex-database-common/src/main/java/io/arex/inst/database/common/DatabaseExtractor.java b/arex-instrumentation/database/arex-database-common/src/main/java/io/arex/inst/database/common/DatabaseExtractor.java index 3ef780743..9aa70f81e 100644 --- a/arex-instrumentation/database/arex-database-common/src/main/java/io/arex/inst/database/common/DatabaseExtractor.java +++ b/arex-instrumentation/database/arex-database-common/src/main/java/io/arex/inst/database/common/DatabaseExtractor.java @@ -56,10 +56,10 @@ public DatabaseExtractor(String dbName, String sql, String parameters, String me this.methodName = methodName; } - public void record(Object response) { - record(response, null); + public void recordDb(Object response) { + recordDb(response, null); } - public void record(Object response, String serializer) { + public void recordDb(Object response, String serializer) { MockUtils.recordMocker(makeMocker(response, serializer)); } @@ -68,7 +68,7 @@ public MockResult replay() { } public MockResult replay(String serializer) { - // TODO: update after all dal components have obtained the real dbName + // update after all dal components have obtained the real dbName(temporary solution) boolean ignoreMockResult = IgnoreUtils.ignoreMockResult("database", methodName); Mocker replayMocker = MockUtils.replayMocker(makeMocker(null, serializer)); Object replayResult = null; diff --git a/arex-instrumentation/database/arex-database-common/src/test/java/io/arex/inst/database/common/DatabaseExtractorTest.java b/arex-instrumentation/database/arex-database-common/src/test/java/io/arex/inst/database/common/DatabaseExtractorTest.java index 800ae61f9..418921c54 100644 --- a/arex-instrumentation/database/arex-database-common/src/test/java/io/arex/inst/database/common/DatabaseExtractorTest.java +++ b/arex-instrumentation/database/arex-database-common/src/test/java/io/arex/inst/database/common/DatabaseExtractorTest.java @@ -37,7 +37,7 @@ void record() { return null; }); - target.record(new Object()); + target.recordDb(new Object()); } } diff --git a/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentation.java b/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentation.java index 3380d6080..57fe7cd13 100644 --- a/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentation.java +++ b/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentation.java @@ -105,9 +105,9 @@ public static void onExit( if (ContextManager.needRecord()) { if (throwable != null) { - extractor.record(throwable); + extractor.recordDb(throwable); } else { - extractor.record(serializable); + extractor.recordDb(serializable); } } } @@ -151,9 +151,9 @@ public static void onExit( if (ContextManager.needRecord()) { DatabaseExtractor extractor = new DatabaseExtractor(sql, object, METHOD_NAME_UPDATE); if (throwable != null) { - extractor.record(throwable); + extractor.recordDb(throwable); } else { - extractor.record(0); + extractor.recordDb(0); } } } @@ -196,9 +196,9 @@ public static void onExit( if (ContextManager.needRecord()) { DatabaseExtractor extractor = new DatabaseExtractor(sql, object, METHOD_NAME_DELETE); if (throwable != null) { - extractor.record(throwable); + extractor.recordDb(throwable); } else { - extractor.record(0); + extractor.recordDb(0); } } } diff --git a/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/LoaderInstrumentation.java b/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/LoaderInstrumentation.java index 45a8418ba..7018ffa51 100644 --- a/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/LoaderInstrumentation.java +++ b/arex-instrumentation/database/arex-database-hibernate/src/main/java/io/arex/inst/database/hibernate/LoaderInstrumentation.java @@ -78,9 +78,9 @@ public static void onExit(@Advice.This Loader loader, } if (ContextManager.needRecord()) { if (throwable != null) { - extractor.record(throwable); + extractor.recordDb(throwable); } else { - extractor.record(list); + extractor.recordDb(list); } } } diff --git a/arex-instrumentation/database/arex-database-hibernate/src/test/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentationTest.java b/arex-instrumentation/database/arex-database-hibernate/src/test/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentationTest.java index 832364845..6b1fa6eb2 100644 --- a/arex-instrumentation/database/arex-database-hibernate/src/test/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentationTest.java +++ b/arex-instrumentation/database/arex-database-hibernate/src/test/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentationTest.java @@ -132,7 +132,7 @@ void onUpdateOrInsertExit(Runnable recordType, Object mockResult) { mo.set(mock); })){ recordType.run(); - Mockito.verify(mo.get(), Mockito.times(1)).record(isA(mockResult.getClass())); + Mockito.verify(mo.get(), Mockito.times(1)).recordDb(isA(mockResult.getClass())); } } @@ -190,7 +190,7 @@ void onDeleteExit(Runnable recordType, Object mockResult) { mo.set(mock); })){ recordType.run(); - Mockito.verify(mo.get(), Mockito.times(1)).record(isA(mockResult.getClass())); + Mockito.verify(mo.get(), Mockito.times(1)).recordDb(isA(mockResult.getClass())); } } diff --git a/arex-instrumentation/database/arex-database-mongo/src/main/java/io/arex/inst/database/mongo/MongoHelper.java b/arex-instrumentation/database/arex-database-mongo/src/main/java/io/arex/inst/database/mongo/MongoHelper.java index 410c88f83..372c614d2 100644 --- a/arex-instrumentation/database/arex-database-mongo/src/main/java/io/arex/inst/database/mongo/MongoHelper.java +++ b/arex-instrumentation/database/arex-database-mongo/src/main/java/io/arex/inst/database/mongo/MongoHelper.java @@ -37,10 +37,10 @@ public static void record(String methodName, MongoNamespace namespace, Object fi String parameter = Serializer.serialize(filter, GSON_SERIALIZER); final DatabaseExtractor extractor = new DatabaseExtractor(dbName, methodName, parameter, methodName); if (throwable != null) { - extractor.record(throwable, GSON_SERIALIZER); + extractor.recordDb(throwable, GSON_SERIALIZER); return; } Object actualResult = ResultWrapper.wrap(result); - extractor.record(actualResult, GSON_SERIALIZER); + extractor.recordDb(actualResult, GSON_SERIALIZER); } } diff --git a/arex-instrumentation/database/arex-database-mongo/src/test/java/io/arex/inst/database/mongo/MongoHelperTest.java b/arex-instrumentation/database/arex-database-mongo/src/test/java/io/arex/inst/database/mongo/MongoHelperTest.java index 443574d61..0ec74d3fb 100644 --- a/arex-instrumentation/database/arex-database-mongo/src/test/java/io/arex/inst/database/mongo/MongoHelperTest.java +++ b/arex-instrumentation/database/arex-database-mongo/src/test/java/io/arex/inst/database/mongo/MongoHelperTest.java @@ -65,10 +65,10 @@ void replay() { void record() { try(final MockedConstruction construction = Mockito.mockConstruction(DatabaseExtractor.class)) { MongoHelper.record("test", Mockito.mock(MongoNamespace.class), null, "test", null); - Mockito.verify(construction.constructed().get(0), Mockito.times(1)).record("test", "gson"); + Mockito.verify(construction.constructed().get(0), Mockito.times(1)).recordDb("test", "gson"); final RuntimeException runtimeException = new RuntimeException(); MongoHelper.record("test", Mockito.mock(MongoNamespace.class), null, "test", runtimeException); - Mockito.verify(construction.constructed().get(1), Mockito.times(1)).record(runtimeException, "gson"); + Mockito.verify(construction.constructed().get(1), Mockito.times(1)).recordDb(runtimeException, "gson"); } } diff --git a/arex-instrumentation/database/arex-database-mybatis3/src/main/java/io/arex/inst/database/mybatis3/InternalExecutor.java b/arex-instrumentation/database/arex-database-mybatis3/src/main/java/io/arex/inst/database/mybatis3/InternalExecutor.java index 828e27d60..0f5f5e7c8 100644 --- a/arex-instrumentation/database/arex-database-mybatis3/src/main/java/io/arex/inst/database/mybatis3/InternalExecutor.java +++ b/arex-instrumentation/database/arex-database-mybatis3/src/main/java/io/arex/inst/database/mybatis3/InternalExecutor.java @@ -30,9 +30,9 @@ public static MockResult replay(DatabaseExtractor extractor, MappedStatement ms, public static void record(MappedStatement ms, Object o, String originalSql, U result, Throwable throwable, String methodName) { DatabaseExtractor extractor = createExtractor(ms, originalSql, o, methodName); if (throwable != null) { - extractor.record(throwable); + extractor.recordDb(throwable); } else { - extractor.record(result); + extractor.recordDb(result); } } @@ -43,9 +43,9 @@ public static void record(DatabaseExtractor extractor, } if (throwable != null) { - extractor.record(throwable); + extractor.recordDb(throwable); } else { - extractor.record(result); + extractor.recordDb(result); } } diff --git a/arex-instrumentation/database/arex-database-mybatis3/src/test/java/io/arex/inst/database/mybatis3/InternalExecutorTest.java b/arex-instrumentation/database/arex-database-mybatis3/src/test/java/io/arex/inst/database/mybatis3/InternalExecutorTest.java index 088e6c0c1..0d35a95b5 100644 --- a/arex-instrumentation/database/arex-database-mybatis3/src/test/java/io/arex/inst/database/mybatis3/InternalExecutorTest.java +++ b/arex-instrumentation/database/arex-database-mybatis3/src/test/java/io/arex/inst/database/mybatis3/InternalExecutorTest.java @@ -98,9 +98,9 @@ void record(Throwable throwable, Object result) { Mockito.when(mappedStatement.getBoundSql(any())).thenReturn(boundSql); target.record(mappedStatement, new Object(), null, result, throwable, "insert"); if (throwable != null) { - Mockito.verify(atomicReference.get(), Mockito.times(1)).record(throwable); + Mockito.verify(atomicReference.get(), Mockito.times(1)).recordDb(throwable); } else { - Mockito.verify(atomicReference.get(), Mockito.times(1)).record(result); + Mockito.verify(atomicReference.get(), Mockito.times(1)).recordDb(result); } } }