Skip to content

Adds checker helper methods #2

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

Draft
andsel wants to merge 1 commit into
base: subscription_rework
Choose a base branch
from
Draft

Adds checker helper methods #2

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
28 changes: 16 additions & 12 deletions broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,27 @@ private static List<Subscription> selectSubscriptionsWithHigherQoSForEachSession

@Override
public boolean add(Subscription sub) {
if (sub.hasShareName()) {
throw new IllegalArgumentException("Adding a shared subscription using the non-shared method.");
}
checkIsShared(sub, "Adding a shared subscription using the non-shared method.");
boolean notExistingSubscription = ctrie.addToTree(sub);
subscriptionsRepository.addNewSubscription(sub);
return notExistingSubscription;
}

@Override
public void addShared(Subscription sub) {
private static void checkIsShared(Subscription sub, String errorMessage) {
if (sub.hasShareName()) {
throw new IllegalArgumentException(errorMessage);
}
}

private static void checkIsNotShared(Subscription sub, String errorMessage) {
if (!sub.hasShareName()) {
throw new IllegalArgumentException("Adding a non-shared subscription using the shared method.");
throw new IllegalArgumentException(errorMessage);
}
}

@Override
public void addShared(Subscription sub) {
checkIsNotShared(sub, "Adding a non-shared subscription using the shared method.");
ctrie.addToTree(sub);
subscriptionsRepository.addNewSharedSubscription(sub);
List<Subscription> sharedSubscriptions = clientSharedSubscriptions.computeIfAbsent(sub.getClientId(), unused -> new ArrayList<>());
Expand All @@ -129,18 +137,14 @@ public void addShared(Subscription sub) {
*/
@Override
public void removeSubscription(Subscription sub) {
if (sub.hasShareName()) {
throw new IllegalArgumentException("Removing a shared subscription using the non-shared method.");
}
checkIsShared(sub, "Removing a shared subscription using the non-shared method.");
ctrie.removeFromTree(sub);
subscriptionsRepository.removeSubscription(sub);
}

@Override
public void removeSharedSubscription(Subscription subscription) {
if (!subscription.hasShareName()) {
throw new IllegalArgumentException("Removing a non-shared subscription using the shared method.");
}
checkIsNotShared(subscription, "Removing a non-shared subscription using the shared method.");
ctrie.removeFromTree(subscription);

subscriptionsRepository.removeSharedSubscription(subscription);
Expand Down