[broker-7] work according code review

Author: crazyrokr

src/main/java/com/ss/mqtt/broker/config/MqttBrokerConfig.java

@@ -30,7 +30,6 @@
 
 @Log4j2
 @Configuration
-@PropertySource("broker.properties")
 @RequiredArgsConstructor
 public class MqttBrokerConfig {
 

src/main/resources/broker.properties src/main/resources/application.propertiessrc/main/resources/broker.properties renamed to src/main/resources/application.properties

@@ -11,19 +11,20 @@ class ConnectSubscribePublishTest extends MqttBrokerTest {
     def "publisher should publish message to broker"() {
         given:
             Mqtt5Publish receivedMessage = null
+            def subscriber = buildClient()
+            def publisher = buildClient()
         when:
-           
-            mqttSubscriber.connect().join()
-            mqttPublisher.connect().join()
+            subscriber.connect().join()
+            publisher.connect().join()
 
-            def subscribeResult = mqttSubscriber.subscribeWith()
+            def subscribeResult = subscriber.subscribeWith()
                 .topicFilter(topicFilter)
                 .qos(MqttQos.AT_MOST_ONCE)
                 .callback({ publish -> receivedMessage = publish })
                 .send()
                 .join()
 
-            def publishResult = mqttPublisher.publishWith()
+            def publishResult = publisher.publishWith()
                 .topic(topicFilter)
                 .qos(MqttQos.AT_MOST_ONCE)
                 .payload(publishPayload)

src/test/groovy/com/ss/mqtt/broker/test/integration/ConnectSubscribePublishTest.groovy

@@ -9,7 +9,7 @@ class ConnectionTest extends MqttBrokerTest {
 
     def "subscriber should not connect to broker with wrong pass"() {
         when:
-            connectWith(mqttSubscriber, 'user', 'wrongPassword')
+            connectWith(buildClient(), 'user', 'wrongPassword')
         then:
             def ex = thrown CompletionException
             def cause = ex.cause as Mqtt5ConnAckException
@@ -18,7 +18,7 @@ class ConnectionTest extends MqttBrokerTest {
 
     def "subscriber should connect to broker without user and pass"() {
         when:
-            def result = mqttSubscriber.connect().join()
+            def result = buildClient().connect().join()
         then:
             result.reasonCode == Mqtt5ConnAckReasonCode.SUCCESS
             !result.serverReference.present

src/test/groovy/com/ss/mqtt/broker/test/integration/ConnectionTest.groovy

@@ -11,21 +11,19 @@ import java.nio.charset.StandardCharsets
 
 @ContextConfiguration(classes = MqttBrokerTestConfig)
 class MqttBrokerTest extends Specification {
-    
+
     @Autowired
     InetSocketAddress deviceNetworkAddress
-    
-    public static final ENCODING = StandardCharsets.UTF_8
+
+    public static final encoding = StandardCharsets.UTF_8
     public static final topicFilter = "topic/Filter"
-    public static final publishPayload = "publishPayload".getBytes(ENCODING)
-    
-    @Autowired
-    Mqtt5AsyncClient mqttSubscriber
-    
-    @Autowired
-    Mqtt5AsyncClient mqttPublisher
-    
-    protected buildClient(String clientId) {
+    public static final publishPayload = "publishPayload".getBytes(encoding)
+
+    def buildClient() {
+        return buildClient(UUID.randomUUID().toString())
+    }
+
+    def buildClient(String clientId) {
         return MqttClient.builder()
             .identifier(clientId)
             .serverHost(deviceNetworkAddress.getHostName())
@@ -34,12 +32,12 @@ class MqttBrokerTest extends Specification {
             .build()
             .toAsync()
     }
-    
-    protected static connectWith(Mqtt5AsyncClient client, String user, String pass){
+
+    def static connectWith(Mqtt5AsyncClient client, String user, String pass) {
         return client.connectWith()
             .simpleAuth()
             .username(user)
-            .password(pass.getBytes(ENCODING))
+            .password(pass.getBytes(encoding))
             .applySimpleAuth()
             .send()
             .join()

src/test/groovy/com/ss/mqtt/broker/test/integration/MqttBrokerTest.groovy

@@ -1,46 +1,22 @@
 package com.ss.mqtt.broker.test.integration.config
 
-import com.hivemq.client.mqtt.MqttClient
-import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient
 import com.ss.mqtt.broker.config.MqttBrokerConfig
 import com.ss.mqtt.broker.network.MqttConnection
 import com.ss.rlib.network.server.ServerNetwork
-import org.springframework.context.annotation.*
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
+import org.springframework.context.annotation.PropertySource
 
 import java.util.function.Consumer
 
 @Configuration
 @Import(MqttBrokerConfig)
-@PropertySources([
-    @PropertySource("broker.properties"),
-    @PropertySource("broker-test.properties")
-])
+@PropertySource("application-test.properties")
 class MqttBrokerTestConfig {
-    
-    @Bean
-    static Mqtt5AsyncClient mqttSubscriber(InetSocketAddress deviceNetworkAddress) {
-        return MqttClient.builder()
-            .identifier(UUID.randomUUID().toString())
-            .serverHost(deviceNetworkAddress.getHostName())
-            .serverPort(deviceNetworkAddress.getPort())
-            .useMqttVersion5()
-            .build()
-            .toAsync()
-    }
-    
-    @Bean
-    static Mqtt5AsyncClient mqttPublisher(InetSocketAddress deviceNetworkAddress) {
-        return MqttClient.builder()
-            .identifier(UUID.randomUUID().toString())
-            .serverHost(deviceNetworkAddress.getHostName())
-            .serverPort(deviceNetworkAddress.getPort())
-            .useMqttVersion5()
-            .build()
-            .toAsync()
-    }
-    
+
     @Bean
-    static InetSocketAddress deviceNetworkAddress(
+    InetSocketAddress deviceNetworkAddress(
         ServerNetwork<MqttConnection> deviceNetwork,
         Consumer<MqttConnection> mqttConnectionConsumer
     ) {