Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support database ignore replay #369

Merged
merged 2 commits into from
Jan 5, 2024
Merged

feat: support database ignore replay #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1344e44
feat: set dbName
lucas-myx Jan 4, 2024
c638bc9
fix: sonar
lucas-myx Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...se/arex-database-common/src/main/java/io/arex/inst/database/common/DatabaseExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand All @@ -68,7 +68,8 @@ public MockResult replay() {
}

public MockResult replay(String serializer) {
boolean ignoreMockResult = IgnoreUtils.ignoreMockResult(this.dbName, methodName);
// 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;
if (MockUtils.checkResponseMocker(replayMocker)) {
Expand Down
2 changes: 1 addition & 1 deletion ...rex-database-common/src/test/java/io/arex/inst/database/common/DatabaseExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void record() {
return null;
});

target.record(new Object());
target.recordDb(new Object());
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...src/main/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...tabase-hibernate/src/main/java/io/arex/inst/database/hibernate/LoaderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...test/java/io/arex/inst/database/hibernate/AbstractEntityPersisterInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}

Expand Down Expand Up @@ -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()));
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...n/database/arex-database-mongo/src/main/java/io/arex/inst/database/mongo/MongoHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions ...tabase/arex-database-mongo/src/test/java/io/arex/inst/database/mongo/MongoHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ void replay() {
void record() {
try(final MockedConstruction<DatabaseExtractor> 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");
}

}
Expand Down
8 changes: 4 additions & 4 deletions ...arex-database-mybatis3/src/main/java/io/arex/inst/database/mybatis3/InternalExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public static MockResult replay(DatabaseExtractor extractor, MappedStatement ms,
public static <U> 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);
}
}

Expand All @@ -43,9 +43,9 @@ public static <U> void record(DatabaseExtractor extractor,
}

if (throwable != null) {
extractor.record(throwable);
extractor.recordDb(throwable);
} else {
extractor.record(result);
extractor.recordDb(result);
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...-database-mybatis3/src/test/java/io/arex/inst/database/mybatis3/InternalExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
Loading