From 99226aadbd3dc409da443f2354b9c3d8b1f5fcf4 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Wed, 27 Jun 2018 22:14:54 +0200
Subject: [PATCH] Added dependency to Paho 1.2.0

---
 broker/build.gradle                           |  4 +-
 perf/build.gradle                             |  2 +-
 .../issue410UnsubscribeAckFormat.groovy       | 73 ++-----------------
 3 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/broker/build.gradle b/broker/build.gradle
index 47e4fe21..439ef515 100644
--- a/broker/build.gradle
+++ b/broker/build.gradle
@@ -30,9 +30,9 @@ dependencies {
     testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version:'1.7.5'
 
     testCompile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version:'1.12'
-    testCompile group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version:'1.0.2'
+    testCompile group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version:'1.2.0'
     testCompile group: 'org.eclipse.jetty.websocket', name: 'websocket-client', version:'9.2.0.M1'
 
     testCompile group: 'com.h2database', name: 'h2', version:'1.4.191'
-	testRuntime group: 'io.netty', name: 'netty-tcnative', version: '2.0.10.Final', classifier: 'linux-x86_64'
+    testRuntime group: 'io.netty', name: 'netty-tcnative', version: '2.0.10.Final', classifier: 'linux-x86_64'
 }
diff --git a/perf/build.gradle b/perf/build.gradle
index b57208c9..f71caeae 100644
--- a/perf/build.gradle
+++ b/perf/build.gradle
@@ -4,6 +4,6 @@ dependencies {
   compile project(':moquette-broker')
   compile group: 'io.netty', name: 'netty-codec-mqtt', version:"${nettyVersion}"
   compile group: 'org.hdrhistogram', name: 'HdrHistogram', version:'2.1.2'
-  compile group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version:'1.1.0'
+  compile group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version:'1.2.0'
   compile group: 'org.eclipse.jetty.toolchain', name: 'jetty-perf-helper', version:'1.0.5'
 }
diff --git a/tools_scripts/integration/issue410UnsubscribeAckFormat.groovy b/tools_scripts/integration/issue410UnsubscribeAckFormat.groovy
index b728a9be..634e3ede 100644
--- a/tools_scripts/integration/issue410UnsubscribeAckFormat.groovy
+++ b/tools_scripts/integration/issue410UnsubscribeAckFormat.groovy
@@ -1,55 +1,8 @@
 @GrabResolver(name='Paho', root='https://repo.eclipse.org/content/repositories/paho-releases/')
-@Grab(group='org.eclipse.paho', module='mqtt-client', version='0.4.0')
+@Grab(group='org.eclipse.paho', module='org.eclipse.paho.client.mqttv3', version='1.2.0')
 
 import org.eclipse.paho.client.mqttv3.MqttClient
-import org.eclipse.paho.client.mqttv3.MqttMessage
-import org.eclipse.paho.client.mqttv3.MqttException
-import org.eclipse.paho.client.mqttv3.MqttCallback
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken
-import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-
-class SubscriberCallback implements MqttCallback {
-
-    int m_numReceived = 0
-    long m_startTime
-    boolean firstMessageReceived = false
-
-    private CountDownLatch m_latch = new CountDownLatch(1)
-
-    void waitFinish() {
-        m_latch.await()
-    }
-
-    public void connectionLost(Throwable cause) {
-        m_latch.countDown()
-    }
-
-    public void messageArrived(String topic, MqttMessage message) throws Exception {
-        //println "Received message ${new String(message.payload)} on topic [${topic}]"
-        if (!firstMessageReceived) {
-            m_startTime = System.currentTimeMillis()
-            firstMessageReceived = true
-        }
-        if (topic == "/exit") {
-            long stopTime = System.currentTimeMillis()
-            long spentTime = stopTime - m_startTime
-            println "/exit received"
-            println "subscriber disconnected, received ${m_numReceived} messages in ${spentTime} ms"
-            m_latch.countDown()
-        } else {
-            //println "-received ${message} on ${topic} with QoS ${message.qos}"
-            m_numReceived++
-        }
-    }
-
-    public void deliveryComplete(IMqttDeliveryToken token) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence
 
 if (args.size() < 2) {
     println "Usage subscriber <host> <QoS>"
@@ -58,24 +11,14 @@ if (args.size() < 2) {
 
 String host = args[0]
 int qos = args[1] as int
-String tmpDir = System.getProperty("java.io.tmpdir")
-MqttDefaultFilePersistence dataStore = new MqttDefaultFilePersistence(tmpDir)
+MemoryPersistence persistence = new MemoryPersistence()
 
-int rnd = (Math.random() * 100) as int
-MqttClient client = new MqttClient("tcp://${host}:1883", "SubscriberClient${rnd}", dataStore)
-def callback = new SubscriberCallback()
-client.callback = callback
-//Only for Apollo ---
-//MqttConnectOptions connOptions = new MqttConnectOptions()
-//connOptions.userName ='admin'
-//connOptions.password = 'password' as char[]
-//client.connect(connOptions)
-//Only for Apollo ---
+MqttClient client = new MqttClient("tcp://${host}:1883", "SubscriberClient", persistence)
 client.connect()
 client.subscribe("topic", 0)
 println "subscribed to topic"
-client.subscribe("/exit", 0)
-println "subscribed to /exit"
+client.unsubscribe("topic")
+println "unsubscribed from topic"
 
-callback.waitFinish()
-client.diconnect()
+client.disconnect()
+client.close()