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

update ConnectionEventListener #19

Merged
merged 2 commits into from
Nov 5, 2024
Merged

update ConnectionEventListener #19

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
9f99d14
update ConnectionEventListener
JoeCqupt Nov 4, 2024
d696eee
update ut
JoeCqupt Nov 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
4 changes: 1 addition & 3 deletions src/main/java/io/github/xinfra/lab/remoting/connection/ConnectionEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

public interface ConnectionEventListener {

ConnectionEvent interest();

void onEvent(Connection connection);
void onEvent(ConnectionEvent connectionEvent, Connection connection);

}
27 changes: 9 additions & 18 deletions src/main/java/io/github/xinfra/lab/remoting/connection/DefaultConnectionEventProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class DefaultConnectionEventProcessor extends AbstractLifeCycle implement

protected LinkedBlockingQueue<Event> eventQueue = new LinkedBlockingQueue<>();

private Map<ConnectionEvent, List<ConnectionEventListener>> listeners = new ConcurrentHashMap<>();
private CopyOnWriteArrayList<ConnectionEventListener> listeners = new CopyOnWriteArrayList<>();

@Override
public void startup() {
Expand All @@ -48,14 +48,7 @@ public void handleEvent(ConnectionEvent event, Connection connection) {
public void addConnectionEventListener(ConnectionEventListener listener) {
ensureStarted();
Validate.notNull(listener, "listener must not be null");
Validate.notNull(listener.interest(), "listener interest event must not be null");
ConnectionEvent event = listener.interest();
List<ConnectionEventListener> connectionEventListeners = listeners.get(event);
if (connectionEventListeners == null) {
listeners.computeIfAbsent(event, e -> new CopyOnWriteArrayList<>());
connectionEventListeners = listeners.get(event);
}
connectionEventListeners.add(listener);
listeners.addIfAbsent(listener);
}

@AllArgsConstructor
Expand All @@ -81,17 +74,15 @@ public void run() {
continue;
}

List<ConnectionEventListener> connectionEventListeners = listeners.get(event.connectionEvent);
if (connectionEventListeners != null) {
for (ConnectionEventListener listener : connectionEventListeners) {
try {
listener.onEvent(event.connection);
}
catch (Throwable t) {
log.warn("{} onEvent execute fail", listener, t);
}
for (ConnectionEventListener listener : listeners) {
try {
listener.onEvent(event.connectionEvent, event.connection);
}
catch (Throwable t) {
log.warn("{} onEvent execute fail", listener, t);
}
}

}
}

Expand Down
33 changes: 18 additions & 15 deletions src/test/java/io/github/xinfra/lab/remoting/connection/ClientConnectionManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,33 +281,36 @@ void testDisableReconnect() throws InterruptedException, TimeoutException {

@Test
void testConnectionEventListener() throws RemotingException, InterruptedException, TimeoutException {
AtomicBoolean connectFlag = new AtomicBoolean(false);
AtomicReference<Connection> connectionRef1 = new AtomicReference<>();

connectionManager.connectionEventProcessor().addConnectionEventListener(new ConnectionEventListener() {
@Override
public ConnectionEvent interest() {
return ConnectionEvent.CONNECT;
public void onEvent(ConnectionEvent connectionEvent, Connection connection) {
// threw exception will not affect others listener
throw new RuntimeException("test throw exception");
}
});

AtomicBoolean connectFlag = new AtomicBoolean(false);
AtomicReference<Connection> connectionRef1 = new AtomicReference<>();
connectionManager.connectionEventProcessor().addConnectionEventListener(new ConnectionEventListener() {
@Override
public void onEvent(Connection connection) {
connectionRef1.set(connection);
connectFlag.set(true);
public void onEvent(ConnectionEvent connectionEvent, Connection connection) {
if (ConnectionEvent.CONNECT == connectionEvent) {
connectionRef1.set(connection);
connectFlag.set(true);
}
}
});

AtomicBoolean closeFlag = new AtomicBoolean(false);
AtomicReference<Connection> connectionRef2 = new AtomicReference<>();
connectionManager.connectionEventProcessor().addConnectionEventListener(new ConnectionEventListener() {
@Override
public ConnectionEvent interest() {
return ConnectionEvent.CLOSE;
}

@Override
public void onEvent(Connection connection) {
connectionRef2.set(connection);
closeFlag.set(true);
public void onEvent(ConnectionEvent connectionEvent, Connection connection) {
if (ConnectionEvent.CLOSE == connectionEvent) {
connectionRef2.set(connection);
closeFlag.set(true);
}
}
});

Expand Down