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

Jump to bottom

Add getEventSubscribers method to get the EventSubscriber instance to pass to the removeEventSubscriber method. #326

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Add getEventSubscribers method to get the EventSubscriber instance to pass to the removeEventSubscriber method. #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 0 deletions src/main/java/jp/co/future/uroborosql/event/EventListenerHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ public void initialize() {
// do nothing
}

/**
* EventListenerHolderに追加されたEventSubscriberのリストを取得する.
*
* @return EventSubscriberリスト
*/
public List<EventSubscriber> getEventSubscribers() {
return List.copyOf(this.eventSubscribers);
}

/**
* EventSubscriberを追加し、EventSubscriberによるイベント登録を行う.
* @param eventSubscriber EventSubscriber
Expand Down
54 changes: 24 additions & 30 deletions src/test/java/jp/co/future/uroborosql/event/TransactionEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class TransactionEventTest extends AbstractDbTest {
@Test
void testValidateEventObjRequired() {
cleanInsert(Paths.get("src/test/resources/data/setup", "testExecuteQuery.ltsv"));
var es = new EventSubscriber() {
config.getEventListenerHolder().addEventSubscriber(new EventSubscriber() {

@Override
public void initialize() {
Expand Down Expand Up @@ -64,20 +64,19 @@ void afterRollback(final AfterRollbackEvent event) {
assertThat(event.getTransactionContext(), not(nullValue()));
assertThat(event.getConnection(), not(nullValue()));
}
};

config.getEventListenerHolder().addEventSubscriber(es);
});

agent.required(() -> agent.query(Product.class)
.collect());

config.getEventListenerHolder().removeEventSubscriber(es);
config.getEventListenerHolder().getEventSubscribers().stream()
.forEach(es -> config.getEventListenerHolder().removeEventSubscriber(es));
}

@Test
void testValidateEventObjCommit() {
cleanInsert(Paths.get("src/test/resources/data/setup", "testExecuteQuery.ltsv"));
var es = new EventSubscriber() {
config.getEventListenerHolder().addEventSubscriber(new EventSubscriber() {

@Override
public void initialize() {
Expand All @@ -94,19 +93,18 @@ void afterCommit(final AfterCommitEvent event) {
assertThat(event.getTransactionContext(), not(nullValue()));
assertThat(event.getConnection(), not(nullValue()));
}
};

config.getEventListenerHolder().addEventSubscriber(es);
});

agent.commit();

config.getEventListenerHolder().removeEventSubscriber(es);
config.getEventListenerHolder().getEventSubscribers().stream()
.forEach(es -> config.getEventListenerHolder().removeEventSubscriber(es));
}

@Test
void testValidateEventObjRollback() {
cleanInsert(Paths.get("src/test/resources/data/setup", "testExecuteQuery.ltsv"));
var es = new EventSubscriber() {
config.getEventListenerHolder().addEventSubscriber(new EventSubscriber() {

@Override
public void initialize() {
Expand All @@ -123,19 +121,18 @@ void afterRollback(final AfterRollbackEvent event) {
assertThat(event.getTransactionContext(), not(nullValue()));
assertThat(event.getConnection(), not(nullValue()));
}
};

config.getEventListenerHolder().addEventSubscriber(es);
});

agent.rollback();

config.getEventListenerHolder().removeEventSubscriber(es);
config.getEventListenerHolder().getEventSubscribers().stream()
.forEach(es -> config.getEventListenerHolder().removeEventSubscriber(es));
}

@Test
void testValidateEventObjRollbackOnly() {
cleanInsert(Paths.get("src/test/resources/data/setup", "testExecuteQuery.ltsv"));
var es = new EventSubscriber() {
config.getEventListenerHolder().addEventSubscriber(new EventSubscriber() {

@Override
public void initialize() {
Expand All @@ -152,9 +149,7 @@ void afterRollback(final AfterRollbackEvent event) {
assertThat(event.getTransactionContext(), not(nullValue()));
assertThat(event.getConnection(), not(nullValue()));
}
};

config.getEventListenerHolder().addEventSubscriber(es);
});

try (var newAgent = config.agent()) {
newAgent.required(() -> {
Expand All @@ -164,13 +159,14 @@ void afterRollback(final AfterRollbackEvent event) {
});
}

config.getEventListenerHolder().removeEventSubscriber(es);
config.getEventListenerHolder().getEventSubscribers().stream()
.forEach(es -> config.getEventListenerHolder().removeEventSubscriber(es));
}

@Test
void testValidateEventObjResultNull() {
cleanInsert(Paths.get("src/test/resources/data/setup", "testExecuteQuery.ltsv"));
var es = new EventSubscriber() {
config.getEventListenerHolder().addEventSubscriber(new EventSubscriber() {

@Override
public void initialize() {
Expand All @@ -183,22 +179,21 @@ void beforeEndTransaction(final BeforeEndTransactionEvent event) {
assertThat(event.getTransactionLevel(), is(1));
assertThat(event.getResult(), is(nullValue()));
}
};

config.getEventListenerHolder().addEventSubscriber(es);
});

agent.required(() -> {
agent.query(Product.class)
.collect();
});

config.getEventListenerHolder().removeEventSubscriber(es);
config.getEventListenerHolder().getEventSubscribers().stream()
.forEach(es -> config.getEventListenerHolder().removeEventSubscriber(es));
}

@Test
void testValidateEventObjRequiresNew() {
cleanInsert(Paths.get("src/test/resources/data/setup", "testExecuteQuery.ltsv"));
var es = new EventSubscriber() {
config.getEventListenerHolder().addEventSubscriber(new EventSubscriber() {

@Override
public void initialize() {
Expand All @@ -211,14 +206,13 @@ void beforeEndTransaction(final BeforeEndTransactionEvent event) {
assertThat(event.getTransactionLevel(), is(1));
assertThat(event.getResult(), instanceOf(List.class));
}
};

config.getEventListenerHolder().addEventSubscriber(es);
});

agent.requiresNew(() -> agent.query(Product.class)
.collect());

config.getEventListenerHolder().removeEventSubscriber(es);
config.getEventListenerHolder().getEventSubscribers().stream()
.forEach(es -> config.getEventListenerHolder().removeEventSubscriber(es));
}

}
Loading