Skip to content

Address issues in InMemorySubscriber #141

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

Merged
stevenhartley merged 5 commits into from
Jul 10, 2024
Merged

Address issues in InMemorySubscriber #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14475e8
Address issues in InMemorySubscriber
Jul 8, 2024
c1fbd87
Fix unsubscribe sequence per reviewers feedback
Jul 9, 2024
23cb9c8
Fixed the identified issues from reviewers and 2 other minor bugs
Jul 9, 2024
825ef9a
Other fixes
Jul 10, 2024
e75c9fe
Only remove the handler if unsubscribe is successful
Jul 10, 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
24 changes: 11 additions & 13 deletions src/main/java/org/eclipse/uprotocol/communication/InMemorySubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,7 @@ public CompletionStage<SubscriptionResponse> subscribe(UUri topic, UListener lis
// Then Add the handler (if present) to the hashMap
.thenApply(response -> {
if (handler != null) {
mHandlers.compute(topic, (key, currentHandler) -> {
if (currentHandler != null) {
throw new UStatusException(UCode.ALREADY_EXISTS, "Handler already registered");
}
return handler;
});
mHandlers.computeIfAbsent(topic, k -> handler);
}
return response;
});
Expand All @@ -160,17 +155,20 @@ public CompletionStage<UStatus> unsubscribe(UUri topic, UListener listener, Call

final UnsubscribeRequest unsubscribeRequest = UnsubscribeRequest.newBuilder().setTopic(topic).build();

return RpcMapper.mapResponseToResult(
CompletionStage<RpcResult<UnsubscribeResponse>> result = RpcMapper.mapResponseToResult(
// Send the unsubscribe request
rpcClient.invokeMethod(UNSUBSCRIBE_METHOD, UPayload.pack(unsubscribeRequest), options),
UnsubscribeResponse.class)

rpcClient.invokeMethod(UNSUBSCRIBE_METHOD, UPayload.pack(unsubscribeRequest), options),
UnsubscribeResponse.class)
// Then unregister the listener
.thenCompose(response -> {
.whenComplete((response, ex) -> mHandlers.remove(topic));

// Create a CompletionStage that will handle the response from the unsubscribe request
return transport.unregisterListener(topic, listener)
.thenCombine(result, (status, response) -> {
if (response.isSuccess()) {
return transport.unregisterListener(topic, listener);
return UStatus.newBuilder().setCode(UCode.OK).build();
}
return CompletableFuture.completedFuture(response.failureValue());
return response.failureValue();
});
}

Expand Down
18 changes: 7 additions & 11 deletions src/test/java/org/eclipse/uprotocol/communication/InMemorySubscriberTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,17 +295,9 @@ public void handleSubscriptionChange(UUri topic, SubscriptionStatus status) {
.toCompletableFuture().get().getStatus().getState(), SubscriptionStatus.State.SUBSCRIBED);
});

assertThrows(CompletionException.class, () -> {
CompletionStage<SubscriptionResponse> response = subscriber.subscribe(
topic, listener, CallOptions.DEFAULT, handler);
assertTrue(response.toCompletableFuture().isCompletedExceptionally());
response.handle((r, e) -> {
e = e.getCause();
assertTrue(e instanceof UStatusException);
assertEquals(((UStatusException) e).getCode(), UCode.ALREADY_EXISTS);
return null;
});
response.toCompletableFuture().join();
assertDoesNotThrow(() -> {
assertEquals(subscriber.subscribe(topic, listener, CallOptions.DEFAULT, handler)
.toCompletableFuture().get().getStatus().getState(), SubscriptionStatus.State.SUBSCRIBED);
});

verify(rpcClient, times(2)).invokeMethod(any(), any(), any());
Expand Down Expand Up @@ -358,12 +350,16 @@ void test_unsubscribe_using_mock_RpcClient_and_SimplerNotifier_when_invokemethod

when(notifier.unregisterNotificationListener(any(UUri.class), any(UListener.class)))
.thenReturn(CompletableFuture.completedFuture(UStatus.newBuilder().setCode(UCode.OK).build()));

when(transport.unregisterListener(any(UUri.class), any(UListener.class)))
.thenReturn(CompletableFuture.completedFuture(UStatus.newBuilder().setCode(UCode.OK).build()));

InMemorySubscriber subscriber = new InMemorySubscriber(transport, rpcClient, notifier);
assertNotNull(subscriber);

assertDoesNotThrow(() -> {
CompletionStage<UStatus> response = subscriber.unsubscribe(topic, listener);
assertNotNull(response);
assertFalse(response.toCompletableFuture().isCompletedExceptionally());
assertEquals(response.toCompletableFuture().get().getCode(), UCode.PERMISSION_DENIED);
});
Expand Down