tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

subscribtion -> subscription typo fix.

pull/841/head
Igor Kulikov 8 years ago
parent
17adf8bd8b
commit
309598c2ac
5 changed files with 47 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java
  2. 8
      netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClient.java
  3. 58
      netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java
  4. 4
      netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttPendingSubscription.java
  5. 4
      netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttPendingUnsubscription.java

20
netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java
View File

@ -158,15 +158,15 @@ final class MqttChannelHandler extends SimpleChannelInboundHandler<MqttMessage>
} }
private void handleSubAck(MqttSubAckMessage message) { private void handleSubAck(MqttSubAckMessage message) {
MqttPendingSubscribtion pendingSubscription = this.client.getPendingSubscriptions().remove(message.variableHeader().messageId()); MqttPendingSubscription pendingSubscription = this.client.getPendingSubscriptions().remove(message.variableHeader().messageId());
if (pendingSubscription == null) { if (pendingSubscription == null) {
return; return;
} }
pendingSubscription.onSubackReceived(); pendingSubscription.onSubackReceived();
for (MqttPendingSubscribtion.MqttPendingHandler handler : pendingSubscription.getHandlers()) { for (MqttPendingSubscription.MqttPendingHandler handler : pendingSubscription.getHandlers()) {
MqttSubscription subscribtion = new MqttSubscription(pendingSubscription.getTopic(), handler.getHandler(), handler.isOnce()); MqttSubscription subscription = new MqttSubscription(pendingSubscription.getTopic(), handler.getHandler(), handler.isOnce());
this.client.getSubscriptions().put(pendingSubscription.getTopic(), subscribtion); this.client.getSubscriptions().put(pendingSubscription.getTopic(), subscription);
this.client.getHandlerToSubscribtion().put(handler.getHandler(), subscribtion); this.client.getHandlerToSubscribtion().put(handler.getHandler(), subscription);
} }
this.client.getPendingSubscribeTopics().remove(pendingSubscription.getTopic()); this.client.getPendingSubscribeTopics().remove(pendingSubscription.getTopic());
@ -210,13 +210,13 @@ final class MqttChannelHandler extends SimpleChannelInboundHandler<MqttMessage>
} }
private void handleUnsuback(MqttUnsubAckMessage message) { private void handleUnsuback(MqttUnsubAckMessage message) {
MqttPendingUnsubscribtion unsubscribtion = this.client.getPendingServerUnsubscribes().get(message.variableHeader().messageId()); MqttPendingUnsubscription unsubscription = this.client.getPendingServerUnsubscribes().get(message.variableHeader().messageId());
if (unsubscribtion == null) { if (unsubscription == null) {
return; return;
} }
unsubscribtion.onUnsubackReceived(); unsubscription.onUnsubackReceived();
this.client.getServerSubscriptions().remove(unsubscribtion.getTopic()); this.client.getServerSubscriptions().remove(unsubscription.getTopic());
unsubscribtion.getFuture().setSuccess(null); unsubscription.getFuture().setSuccess(null);
this.client.getPendingServerUnsubscribes().remove(message.variableHeader().messageId()); this.client.getPendingServerUnsubscribes().remove(message.variableHeader().messageId());
} }

8
netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClient.java
View File

@ -92,7 +92,7 @@ public interface MqttClient {
/** /**
* Subscribe on the given topic. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler * Subscribe on the given topic. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler
* This subscribtion is only once. If the MqttClient has received 1 message, the subscribtion will be removed * This subscription is only once. If the MqttClient has received 1 message, the subscription will be removed
* *
* @param topic The topic filter to subscribe to * @param topic The topic filter to subscribe to
* @param handler The handler to invoke when we receive a message * @param handler The handler to invoke when we receive a message
@ -102,7 +102,7 @@ public interface MqttClient {
/** /**
* Subscribe on the given topic, with the given qos. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler * Subscribe on the given topic, with the given qos. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler
* This subscribtion is only once. If the MqttClient has received 1 message, the subscribtion will be removed * This subscription is only once. If the MqttClient has received 1 message, the subscription will be removed
* *
* @param topic The topic filter to subscribe to * @param topic The topic filter to subscribe to
* @param handler The handler to invoke when we receive a message * @param handler The handler to invoke when we receive a message
@ -112,7 +112,7 @@ public interface MqttClient {
Future<Void> once(String topic, MqttHandler handler, MqttQoS qos); Future<Void> once(String topic, MqttHandler handler, MqttQoS qos);
/** /**
* Remove the subscribtion for the given topic and handler * Remove the subscription for the given topic and handler
* If you want to unsubscribe from all handlers known for this topic, use {@link #off(String)} * If you want to unsubscribe from all handlers known for this topic, use {@link #off(String)}
* *
* @param topic The topic to unsubscribe for * @param topic The topic to unsubscribe for
@ -122,7 +122,7 @@ public interface MqttClient {
Future<Void> off(String topic, MqttHandler handler); Future<Void> off(String topic, MqttHandler handler);
/** /**
* Remove all subscribtions for the given topic. * Remove all subscriptions for the given topic.
* If you want to specify which handler to unsubscribe, use {@link #off(String, MqttHandler)} * If you want to specify which handler to unsubscribe, use {@link #off(String, MqttHandler)}
* *
* @param topic The topic to unsubscribe for * @param topic The topic to unsubscribe for

58
netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java
View File

@ -41,11 +41,11 @@ import java.util.concurrent.atomic.AtomicInteger;
final class MqttClientImpl implements MqttClient { final class MqttClientImpl implements MqttClient {
private final Set<String> serverSubscriptions = new HashSet<>(); private final Set<String> serverSubscriptions = new HashSet<>();
private final IntObjectHashMap<MqttPendingUnsubscribtion> pendingServerUnsubscribes = new IntObjectHashMap<>(); private final IntObjectHashMap<MqttPendingUnsubscription> pendingServerUnsubscribes = new IntObjectHashMap<>();
private final IntObjectHashMap<MqttIncomingQos2Publish> qos2PendingIncomingPublishes = new IntObjectHashMap<>(); private final IntObjectHashMap<MqttIncomingQos2Publish> qos2PendingIncomingPublishes = new IntObjectHashMap<>();
private final IntObjectHashMap<MqttPendingPublish> pendingPublishes = new IntObjectHashMap<>(); private final IntObjectHashMap<MqttPendingPublish> pendingPublishes = new IntObjectHashMap<>();
private final HashMultimap<String, MqttSubscription> subscriptions = HashMultimap.create(); private final HashMultimap<String, MqttSubscription> subscriptions = HashMultimap.create();
private final IntObjectHashMap<MqttPendingSubscribtion> pendingSubscriptions = new IntObjectHashMap<>(); private final IntObjectHashMap<MqttPendingSubscription> pendingSubscriptions = new IntObjectHashMap<>();
private final Set<String> pendingSubscribeTopics = new HashSet<>(); private final Set<String> pendingSubscribeTopics = new HashSet<>();
private final HashMultimap<MqttHandler, MqttSubscription> handlerToSubscribtion = HashMultimap.create(); private final HashMultimap<MqttHandler, MqttSubscription> handlerToSubscribtion = HashMultimap.create();
private final AtomicInteger nextMessageId = new AtomicInteger(1); private final AtomicInteger nextMessageId = new AtomicInteger(1);
@ -221,7 +221,7 @@ final class MqttClientImpl implements MqttClient {
/** /**
* Subscribe on the given topic. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler * Subscribe on the given topic. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler
* This subscribtion is only once. If the MqttClient has received 1 message, the subscribtion will be removed * This subscription is only once. If the MqttClient has received 1 message, the subscription will be removed
* *
* @param topic The topic filter to subscribe to * @param topic The topic filter to subscribe to
* @param handler The handler to invoke when we receive a message * @param handler The handler to invoke when we receive a message
@ -234,7 +234,7 @@ final class MqttClientImpl implements MqttClient {
/** /**
* Subscribe on the given topic, with the given qos. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler * Subscribe on the given topic, with the given qos. When a message is received, MqttClient will invoke the {@link MqttHandler#onMessage(String, ByteBuf)} function of the given handler
* This subscribtion is only once. If the MqttClient has received 1 message, the subscribtion will be removed * This subscription is only once. If the MqttClient has received 1 message, the subscription will be removed
* *
* @param topic The topic filter to subscribe to * @param topic The topic filter to subscribe to
* @param handler The handler to invoke when we receive a message * @param handler The handler to invoke when we receive a message
@ -247,7 +247,7 @@ final class MqttClientImpl implements MqttClient {
} }
/** /**
* Remove the subscribtion for the given topic and handler * Remove the subscription for the given topic and handler
* If you want to unsubscribe from all handlers known for this topic, use {@link #off(String)} * If you want to unsubscribe from all handlers known for this topic, use {@link #off(String)}
* *
* @param topic The topic to unsubscribe for * @param topic The topic to unsubscribe for
@ -257,8 +257,8 @@ final class MqttClientImpl implements MqttClient {
@Override @Override
public Future<Void> off(String topic, MqttHandler handler) { public Future<Void> off(String topic, MqttHandler handler) {
Promise<Void> future = new DefaultPromise<>(this.eventLoop.next()); Promise<Void> future = new DefaultPromise<>(this.eventLoop.next());
for (MqttSubscription subscribtion : this.handlerToSubscribtion.get(handler)) { for (MqttSubscription subscription : this.handlerToSubscribtion.get(handler)) {
this.subscriptions.remove(topic, subscribtion); this.subscriptions.remove(topic, subscription);
} }
this.handlerToSubscribtion.removeAll(handler); this.handlerToSubscribtion.removeAll(handler);
this.checkSubscribtions(topic, future); this.checkSubscribtions(topic, future);
@ -266,7 +266,7 @@ final class MqttClientImpl implements MqttClient {
} }
/** /**
* Remove all subscribtions for the given topic. * Remove all subscriptions for the given topic.
* If you want to specify which handler to unsubscribe, use {@link #off(String, MqttHandler)} * If you want to specify which handler to unsubscribe, use {@link #off(String, MqttHandler)}
* *
* @param topic The topic to unsubscribe for * @param topic The topic to unsubscribe for
@ -275,12 +275,12 @@ final class MqttClientImpl implements MqttClient {
@Override @Override
public Future<Void> off(String topic) { public Future<Void> off(String topic) {
Promise<Void> future = new DefaultPromise<>(this.eventLoop.next()); Promise<Void> future = new DefaultPromise<>(this.eventLoop.next());
ImmutableSet<MqttSubscription> subscribtions = ImmutableSet.copyOf(this.subscriptions.get(topic)); ImmutableSet<MqttSubscription> subscriptions = ImmutableSet.copyOf(this.subscriptions.get(topic));
for (MqttSubscription subscribtion : subscribtions) { for (MqttSubscription subscription : subscriptions) {
for (MqttSubscription handSub : this.handlerToSubscribtion.get(subscribtion.getHandler())) { for (MqttSubscription handSub : this.handlerToSubscribtion.get(subscription.getHandler())) {
this.subscriptions.remove(topic, handSub); this.subscriptions.remove(topic, handSub);
} }
this.handlerToSubscribtion.remove(subscribtion.getHandler(), subscribtion); this.handlerToSubscribtion.remove(subscription.getHandler(), subscription);
} }
this.checkSubscribtions(topic, future); this.checkSubscribtions(topic, future);
return future; return future;
@ -411,16 +411,16 @@ final class MqttClientImpl implements MqttClient {
private Future<Void> createSubscription(String topic, MqttHandler handler, boolean once, MqttQoS qos) { private Future<Void> createSubscription(String topic, MqttHandler handler, boolean once, MqttQoS qos) {
if (this.pendingSubscribeTopics.contains(topic)) { if (this.pendingSubscribeTopics.contains(topic)) {
Optional<Map.Entry<Integer, MqttPendingSubscribtion>> subscribtionEntry = this.pendingSubscriptions.entrySet().stream().filter((e) -> e.getValue().getTopic().equals(topic)).findAny(); Optional<Map.Entry<Integer, MqttPendingSubscription>> subscriptionEntry = this.pendingSubscriptions.entrySet().stream().filter((e) -> e.getValue().getTopic().equals(topic)).findAny();
if (subscribtionEntry.isPresent()) { if (subscriptionEntry.isPresent()) {
subscribtionEntry.get().getValue().addHandler(handler, once); subscriptionEntry.get().getValue().addHandler(handler, once);
return subscribtionEntry.get().getValue().getFuture(); return subscriptionEntry.get().getValue().getFuture();
} }
} }
if (this.serverSubscriptions.contains(topic)) { if (this.serverSubscriptions.contains(topic)) {
MqttSubscription subscribtion = new MqttSubscription(topic, handler, once); MqttSubscription subscription = new MqttSubscription(topic, handler, once);
this.subscriptions.put(topic, subscribtion); this.subscriptions.put(topic, subscription);
this.handlerToSubscribtion.put(handler, subscribtion); this.handlerToSubscribtion.put(handler, subscription);
return this.channel.newSucceededFuture(); return this.channel.newSucceededFuture();
} }
@ -431,13 +431,13 @@ final class MqttClientImpl implements MqttClient {
MqttSubscribePayload payload = new MqttSubscribePayload(Collections.singletonList(subscription)); MqttSubscribePayload payload = new MqttSubscribePayload(Collections.singletonList(subscription));
MqttSubscribeMessage message = new MqttSubscribeMessage(fixedHeader, variableHeader, payload); MqttSubscribeMessage message = new MqttSubscribeMessage(fixedHeader, variableHeader, payload);
final MqttPendingSubscribtion pendingSubscribtion = new MqttPendingSubscribtion(future, topic, message); final MqttPendingSubscription pendingSubscription = new MqttPendingSubscription(future, topic, message);
pendingSubscribtion.addHandler(handler, once); pendingSubscription.addHandler(handler, once);
this.pendingSubscriptions.put(variableHeader.messageId(), pendingSubscribtion); this.pendingSubscriptions.put(variableHeader.messageId(), pendingSubscription);
this.pendingSubscribeTopics.add(topic); this.pendingSubscribeTopics.add(topic);
pendingSubscribtion.setSent(this.sendAndFlushPacket(message) != null); //If not sent, we will send it when the connection is opened pendingSubscription.setSent(this.sendAndFlushPacket(message) != null); //If not sent, we will send it when the connection is opened
pendingSubscribtion.startRetransmitTimer(this.eventLoop.next(), this::sendAndFlushPacket); pendingSubscription.startRetransmitTimer(this.eventLoop.next(), this::sendAndFlushPacket);
return future; return future;
} }
@ -449,9 +449,9 @@ final class MqttClientImpl implements MqttClient {
MqttUnsubscribePayload payload = new MqttUnsubscribePayload(Collections.singletonList(topic)); MqttUnsubscribePayload payload = new MqttUnsubscribePayload(Collections.singletonList(topic));
MqttUnsubscribeMessage message = new MqttUnsubscribeMessage(fixedHeader, variableHeader, payload); MqttUnsubscribeMessage message = new MqttUnsubscribeMessage(fixedHeader, variableHeader, payload);
MqttPendingUnsubscribtion pendingUnsubscribtion = new MqttPendingUnsubscribtion(promise, topic, message); MqttPendingUnsubscription pendingUnsubscription = new MqttPendingUnsubscription(promise, topic, message);
this.pendingServerUnsubscribes.put(variableHeader.messageId(), pendingUnsubscribtion); this.pendingServerUnsubscribes.put(variableHeader.messageId(), pendingUnsubscription);
pendingUnsubscribtion.startRetransmissionTimer(this.eventLoop.next(), this::sendAndFlushPacket); pendingUnsubscription.startRetransmissionTimer(this.eventLoop.next(), this::sendAndFlushPacket);
this.sendAndFlushPacket(message); this.sendAndFlushPacket(message);
} else { } else {
@ -459,7 +459,7 @@ final class MqttClientImpl implements MqttClient {
} }
} }
IntObjectHashMap<MqttPendingSubscribtion> getPendingSubscriptions() { IntObjectHashMap<MqttPendingSubscription> getPendingSubscriptions() {
return pendingSubscriptions; return pendingSubscriptions;
} }
@ -479,7 +479,7 @@ final class MqttClientImpl implements MqttClient {
return serverSubscriptions; return serverSubscriptions;
} }
IntObjectHashMap<MqttPendingUnsubscribtion> getPendingServerUnsubscribes() { IntObjectHashMap<MqttPendingUnsubscription> getPendingServerUnsubscribes() {
return pendingServerUnsubscribes; return pendingServerUnsubscribes;
} }

4
netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttPendingSubscribtion.java → netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttPendingSubscription.java
View File

@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
final class MqttPendingSubscribtion { final class MqttPendingSubscription {
private final Promise<Void> future; private final Promise<Void> future;
private final String topic; private final String topic;
@ -34,7 +34,7 @@ final class MqttPendingSubscribtion {
private boolean sent = false; private boolean sent = false;
MqttPendingSubscribtion(Promise<Void> future, String topic, MqttSubscribeMessage message) { MqttPendingSubscription(Promise<Void> future, String topic, MqttSubscribeMessage message) {
this.future = future; this.future = future;
this.topic = topic; this.topic = topic;
this.subscribeMessage = message; this.subscribeMessage = message;

4
netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttPendingUnsubscribtion.java → netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttPendingUnsubscription.java
View File

@ -21,14 +21,14 @@ import io.netty.util.concurrent.Promise;
import java.util.function.Consumer; import java.util.function.Consumer;
final class MqttPendingUnsubscribtion { final class MqttPendingUnsubscription {
private final Promise<Void> future; private final Promise<Void> future;
private final String topic; private final String topic;
private final RetransmissionHandler<MqttUnsubscribeMessage> retransmissionHandler = new RetransmissionHandler<>(); private final RetransmissionHandler<MqttUnsubscribeMessage> retransmissionHandler = new RetransmissionHandler<>();
MqttPendingUnsubscribtion(Promise<Void> future, String topic, MqttUnsubscribeMessage unsubscribeMessage) { MqttPendingUnsubscription(Promise<Void> future, String topic, MqttUnsubscribeMessage unsubscribeMessage) {
this.future = future; this.future = future;
this.topic = topic; this.topic = topic;
Write Preview
Loading…
Cancel
Save