Skip to content

Commit 4d8e497

Browse files
crazyrokrcrazyrokr
committed
[broker-30] Revert unnecessary changes
1 parent 8a23e97 commit 4d8e497

File tree

7 files changed

+62
-63
lines changed

7 files changed

+62
-63
lines changed

‎core-service/src/test/groovy/javasabr/mqtt/service/IntegrationServiceSpecification.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ abstract class IntegrationServiceSpecification extends Specification {
6262
def defaultRetainMessageService = new DefaultRetainMessageService(defaultPublishDeliveringService)
6363

6464
@Shared
65-
def defaultSubscriptionService = new InMemorySubscriptionService(defaultRetainMessageService)
65+
def subscriptionService = new InMemorySubscriptionService(defaultRetainMessageService)
6666

6767
@Shared
6868
def qos0MqttPublishInMessageHandler = new Qos0MqttPublishInMessageHandler(
69-
defaultSubscriptionService,
69+
subscriptionService,
7070
defaultPublishDeliveringService,
7171
defaultMessageOutFactoryService,
7272
defaultRetainMessageService)
@@ -75,12 +75,12 @@ abstract class IntegrationServiceSpecification extends Specification {
7575
def publishReceivingService = new DefaultPublishReceivingService([
7676
qos0MqttPublishInMessageHandler,
7777
new Qos1MqttPublishInMessageHandler(
78-
defaultSubscriptionService,
78+
subscriptionService,
7979
defaultPublishDeliveringService,
8080
defaultMessageOutFactoryService,
8181
defaultRetainMessageService),
8282
new Qos2MqttPublishInMessageHandler(
83-
defaultSubscriptionService,
83+
subscriptionService,
8484
defaultPublishDeliveringService,
8585
defaultMessageOutFactoryService,
8686
defaultRetainMessageService)

‎core-service/src/test/groovy/javasabr/mqtt/service/impl/InMemorySubscriptionServiceTest.groovy‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
5454
true,
5555
true))
5656
when:
57-
def result = defaultSubscriptionService
57+
def result = subscriptionService
5858
.subscribe(mqttUser, mqttUser.session(), subscriptions)
5959
then:
6060
result.size() == 4
@@ -109,7 +109,7 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
109109
true,
110110
true))
111111
when:
112-
def result = defaultSubscriptionService
112+
def result = subscriptionService
113113
.subscribe(mqttUser, mqttUser.session(), subscriptions)
114114
then:
115115
result.size() == 5
@@ -157,7 +157,7 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
157157
true)
158158
def subscriptions = Array.of(sub1, sub2, sub3, sub4)
159159
when:
160-
def result = defaultSubscriptionService
160+
def result = subscriptionService
161161
.subscribe(mqttUser, mqttUser.session(), subscriptions)
162162
then:
163163
result.size() == 4
@@ -205,14 +205,14 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
205205
SubscribeRetainHandling.SEND,
206206
true,
207207
true))
208-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
208+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
209209
def topicsToUnsubscribe = Array.of(
210210
defaultTopicService.createTopicFilter(mqttUser, "topic/filter/1"),
211211
defaultTopicService.createTopicFilter(mqttUser, "topic/filter/3"),
212212
defaultTopicService.createTopicFilter(mqttUser, "topic/filter/notexist"),
213213
defaultTopicService.createTopicFilter(mqttUser, "topic/filter/invalid##"))
214214
when:
215-
def result = defaultSubscriptionService
215+
def result = subscriptionService
216216
.unsubscribe(mqttUser, mqttUser.session(), topicsToUnsubscribe)
217217
then:
218218
result.size() == 4
@@ -256,13 +256,13 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
256256
defaultTopicService.createTopicFilter(mqttUser, "topic/filter/1"),
257257
defaultTopicService.createTopicFilter(mqttUser, "topic/filter/3"))
258258
when:
259-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
259+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
260260
def storedSubscriptions = activeSubscriptions.subscriptions()
261261
then:
262262
storedSubscriptions.size() == 3
263263
storedSubscriptions == subscriptions
264264
when:
265-
defaultSubscriptionService.unsubscribe(mqttUser, mqttUser.session(), topicsToUnsubscribe)
265+
subscriptionService.unsubscribe(mqttUser, mqttUser.session(), topicsToUnsubscribe)
266266
storedSubscriptions = activeSubscriptions.subscriptions()
267267
then:
268268
storedSubscriptions.size() == 1
@@ -318,13 +318,13 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
318318
subscriptions.get(1),
319319
subscriptions2.get(1))
320320
when:
321-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
321+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
322322
def storedSubscriptions = activeSubscriptions.subscriptions()
323323
then:
324324
storedSubscriptions.size() == 3
325325
storedSubscriptions == subscriptions
326326
when:
327-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions2)
327+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions2)
328328
storedSubscriptions = activeSubscriptions.subscriptions()
329329
then:
330330
storedSubscriptions.size() == 3
@@ -366,8 +366,8 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
366366
def publishWithoutRetain = TestPublishFactory.makePublishWithoutRetain("topic/filter/1", "payload2")
367367
defaultRetainMessageService.retainMessage(publishWithoutRetain)
368368
when:
369-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
370-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
369+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
370+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
371371
then:
372372
def thirdPublishMessage = mqttUser.nextSentMessage(PublishMqtt5OutMessage)
373373
thirdPublishMessage.payload() == publishWithRetain.payload()
@@ -392,8 +392,8 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
392392
def publishWithRetain = TestPublishFactory.makePublishWithRetain("topic/filter/1", "payload1")
393393
defaultPublishDeliveringService.startDelivering(publishWithRetain, new SingleSubscriber(mqttUser, subscription))
394394
when:
395-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
396-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
395+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
396+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
397397
then:
398398
def firstSentMessage = mqttUser.nextSentMessage(PublishMqtt5OutMessage)
399399
firstSentMessage.payload() == publishWithRetain.payload()
@@ -442,8 +442,8 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
442442
def publishWithoutRetain = TestPublishFactory.makePublishWithoutRetain("topic/filter/1", "payload2")
443443
defaultPublishDeliveringService.startDelivering(publishWithoutRetain, new SingleSubscriber(mqttUser, subscription))
444444
when:
445-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
446-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
445+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
446+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
447447
then:
448448
def firstPublishMessage = mqttUser.nextSentMessage(PublishMqtt5OutMessage)
449449
firstPublishMessage.payload() == publishWithRetain.payload()
@@ -471,7 +471,7 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
471471
def publishWithRetain = TestPublishFactory.makePublishWithRetain("topic/filter/1", "payload1")
472472
defaultRetainMessageService.retainMessage(publishWithRetain)
473473
when:
474-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
474+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
475475
then:
476476
def sentMessage = mqttUser.nextSentMessage(PublishMqtt5OutMessage)
477477
sentMessage.payload() == publishWithRetain.payload()
@@ -493,11 +493,10 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
493493
true,
494494
true)
495495
def subscriptions = Array.of(subscription)
496-
497496
when:
498497
def publishWithRetain = TestPublishFactory.makePublishWithRetain("topic/filter/1", "payload1")
499498
defaultRetainMessageService.retainMessage(publishWithRetain)
500-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
499+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
501500
then:
502501
def secondSentMessage = mqttUser.nextSentMessage(PublishMqtt5OutMessage)
503502
secondSentMessage.payload() == publishWithRetain.payload()
@@ -523,7 +522,7 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
523522
def publishWithRetain = TestPublishFactory.makePublishWithRetain("topic/filter/1", "payload1")
524523
defaultPublishDeliveringService.startDelivering(publishWithRetain, new SingleSubscriber(mqttUser, subscription))
525524
when:
526-
defaultSubscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
525+
subscriptionService.subscribe(mqttUser, mqttUser.session(), subscriptions)
527526
then:
528527
mqttUser.isEmpty()
529528
}
@@ -541,23 +540,23 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
541540
true,
542541
true)
543542
when:
544-
defaultSubscriptionService.subscribe(expectedUser, expectedUser.session(), Array.of(expectedSubscription))
545-
def subscribers = defaultSubscriptionService.findSubscribers(TopicName.valueOf("topic"))
543+
subscriptionService.subscribe(expectedUser, expectedUser.session(), Array.of(expectedSubscription))
544+
def subscribers = subscriptionService.findSubscribers(TopicName.valueOf("topic"))
546545
then:
547546
!subscribers.isEmpty()
548547
with(subscribers[0]) {
549548
user() == expectedUser
550549
subscription() == expectedSubscription
551550
}
552551
when:
553-
defaultSubscriptionService.cleanSubscriptions(expectedUser, expectedUser.session())
554-
subscribers = defaultSubscriptionService.findSubscribers(TopicName.valueOf("topic"))
552+
subscriptionService.cleanSubscriptions(expectedUser, expectedUser.session())
553+
subscribers = subscriptionService.findSubscribers(TopicName.valueOf("topic"))
555554
then:
556555
subscribers.isEmpty()
557556

558557
when:
559-
defaultSubscriptionService.restoreSubscriptions(expectedUser, expectedUser.session())
560-
subscribers = defaultSubscriptionService.findSubscribers(TopicName.valueOf("topic"))
558+
subscriptionService.restoreSubscriptions(expectedUser, expectedUser.session())
559+
subscribers = subscriptionService.findSubscribers(TopicName.valueOf("topic"))
561560
then:
562561
!subscribers.isEmpty()
563562
with(subscribers[0]) {
@@ -583,7 +582,7 @@ class InMemorySubscriptionServiceTest extends IntegrationServiceSpecification {
583582
def publishWithRetain = TestPublishFactory.makePublishWithRetain("topic/filter/1", "payload1")
584583
defaultPublishDeliveringService.startDelivering(publishWithRetain, new SingleSubscriber(mqttUser, subscription))
585584
when:
586-
defaultSubscriptionService.subscribe(anotherUser, mqttUser.session(), subscriptions)
585+
subscriptionService.subscribe(anotherUser, mqttUser.session(), subscriptions)
587586
then:
588587
def firstSentMessage = mqttUser.nextSentMessage(PublishMqtt5OutMessage)
589588
firstSentMessage.payload() == publishWithRetain.payload()

‎core-service/src/test/groovy/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandlerTest.groovy‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
2929
given:
3030
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
3131
def messageHandler = new SubscribeMqttInMessageHandler(
32-
defaultSubscriptionService,
32+
subscriptionService,
3333
defaultMessageOutFactoryService,
3434
defaultTopicService)
3535
def mqttUser = mqttConnection.user() as TestExternalNetworkMqttUser
@@ -48,7 +48,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
4848
given:
4949
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
5050
def messageHandler = new SubscribeMqttInMessageHandler(
51-
defaultSubscriptionService,
51+
subscriptionService,
5252
defaultMessageOutFactoryService,
5353
defaultTopicService)
5454
def expectedMessageId = 15
@@ -80,7 +80,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
8080
.withSubscriptionIdAvailable(false)
8181
def mqttConnection = mockedExternalConnection(serverConfig, MqttVersion.MQTT_5)
8282
def messageHandler = new SubscribeMqttInMessageHandler(
83-
defaultSubscriptionService,
83+
subscriptionService,
8484
defaultMessageOutFactoryService,
8585
defaultTopicService)
8686
def expectedMessageId = 15
@@ -110,7 +110,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
110110
.withMaxQos(QoS.AT_MOST_ONCE)
111111
def mqttConnection = mockedExternalConnection(serverConfig, MqttVersion.MQTT_5)
112112
def messageHandler = new SubscribeMqttInMessageHandler(
113-
defaultSubscriptionService,
113+
subscriptionService,
114114
defaultMessageOutFactoryService,
115115
defaultTopicService)
116116
def expectedMessageId = 15
@@ -140,7 +140,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
140140
.withWildcardSubscriptionAvailable(false)
141141
def mqttConnection = mockedExternalConnection(serverConfig, MqttVersion.MQTT_5)
142142
def messageHandler = new SubscribeMqttInMessageHandler(
143-
defaultSubscriptionService,
143+
subscriptionService,
144144
defaultMessageOutFactoryService,
145145
defaultTopicService)
146146
def expectedMessageId = 15
@@ -173,7 +173,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
173173
.withSharedSubscriptionAvailable(false)
174174
def mqttConnection = mockedExternalConnection(serverConfig, MqttVersion.MQTT_5)
175175
def messageHandler = new SubscribeMqttInMessageHandler(
176-
defaultSubscriptionService,
176+
subscriptionService,
177177
defaultMessageOutFactoryService,
178178
defaultTopicService)
179179
def expectedMessageId = 15
@@ -204,7 +204,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
204204
given:
205205
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
206206
def messageHandler = new SubscribeMqttInMessageHandler(
207-
defaultSubscriptionService,
207+
subscriptionService,
208208
defaultMessageOutFactoryService,
209209
defaultTopicService)
210210
def mqttUser = mqttConnection.user() as TestExternalNetworkMqttUser
@@ -222,7 +222,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
222222
given:
223223
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
224224
def messageHandler = new SubscribeMqttInMessageHandler(
225-
defaultSubscriptionService,
225+
subscriptionService,
226226
defaultMessageOutFactoryService,
227227
defaultTopicService)
228228
def expectedMessageId = 15
@@ -260,7 +260,7 @@ class SubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecification
260260
given:
261261
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
262262
def messageHandler = new SubscribeMqttInMessageHandler(
263-
defaultSubscriptionService,
263+
subscriptionService,
264264
defaultMessageOutFactoryService,
265265
defaultTopicService)
266266
def expectedMessageId = 15

‎core-service/src/test/groovy/javasabr/mqtt/service/message/handler/impl/UnsubscribeMqttInMessageHandlerTest.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class UnsubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecificatio
2323
given:
2424
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
2525
def messageHandler = new UnsubscribeMqttInMessageHandler(
26-
defaultSubscriptionService,
26+
subscriptionService,
2727
defaultMessageOutFactoryService,
2828
defaultTopicService)
2929
def mqttUser = mqttConnection.user() as TestExternalNetworkMqttUser
@@ -42,7 +42,7 @@ class UnsubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecificatio
4242
given:
4343
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
4444
def messageHandler = new UnsubscribeMqttInMessageHandler(
45-
defaultSubscriptionService,
45+
subscriptionService,
4646
defaultMessageOutFactoryService,
4747
defaultTopicService)
4848
def expectedMessageId = 15
@@ -120,7 +120,7 @@ class UnsubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecificatio
120120
given:
121121
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
122122
def messageHandler = new UnsubscribeMqttInMessageHandler(
123-
defaultSubscriptionService,
123+
subscriptionService,
124124
defaultMessageOutFactoryService,
125125
defaultTopicService)
126126
def mqttUser = mqttConnection.user() as TestExternalNetworkMqttUser
@@ -138,7 +138,7 @@ class UnsubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecificatio
138138
given:
139139
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
140140
def messageHandler = new UnsubscribeMqttInMessageHandler(
141-
defaultSubscriptionService,
141+
subscriptionService,
142142
defaultMessageOutFactoryService,
143143
defaultTopicService)
144144
def expectedMessageId = 15
@@ -176,7 +176,7 @@ class UnsubscribeMqttInMessageHandlerTest extends IntegrationServiceSpecificatio
176176
given:
177177
def mqttConnection = mockedExternalConnection(MqttVersion.MQTT_5)
178178
def messageHandler = new UnsubscribeMqttInMessageHandler(
179-
defaultSubscriptionService,
179+
subscriptionService,
180180
defaultMessageOutFactoryService,
181181
defaultTopicService)
182182
def expectedMessageId = 15

‎core-service/src/test/groovy/javasabr/mqtt/service/publish/handler/impl/Qos0MqttPublishInMessageHandlerTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Qos0MqttPublishInMessageHandlerTest extends QosMqttPublishInMessageHandler
1313
def "should not provide any feedback for accepted publish with subscribers"() {
1414
given:
1515
def publishInHandler = new Qos0MqttPublishInMessageHandler(
16-
defaultSubscriptionService,
16+
subscriptionService,
1717
defaultPublishDeliveringService,
1818
defaultMessageOutFactoryService,
1919
defaultRetainMessageService)
@@ -25,11 +25,11 @@ class Qos0MqttPublishInMessageHandlerTest extends QosMqttPublishInMessageHandler
2525
def user3 = publisher.user() as TestExternalNetworkMqttUser
2626
def topicFilter = defaultTopicService.createTopicFilter(user1, "Qos0MqttPublishInMessageHandlerTest/1")
2727
def expectedTopicName = defaultTopicService.createTopicName(user1, "Qos0MqttPublishInMessageHandlerTest/1")
28-
defaultSubscriptionService.subscribe(
28+
subscriptionService.subscribe(
2929
user1,
3030
user1.session(),
3131
Array.of(Subscription.minimal(topicFilter, QoS.AT_MOST_ONCE)))
32-
defaultSubscriptionService.subscribe(
32+
subscriptionService.subscribe(
3333
user2,
3434
user2.session(),
3535
Array.of(Subscription.minimal(topicFilter, QoS.AT_MOST_ONCE)))
@@ -49,7 +49,7 @@ class Qos0MqttPublishInMessageHandlerTest extends QosMqttPublishInMessageHandler
4949
def "should not provide any feedback for accepted publish without any subscriber"() {
5050
given:
5151
def publishInHandler = new Qos0MqttPublishInMessageHandler(
52-
defaultSubscriptionService,
52+
subscriptionService,
5353
defaultPublishDeliveringService,
5454
defaultMessageOutFactoryService,
5555
defaultRetainMessageService)

0 commit comments

Comments
 (0)