Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion mqtt-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
<groupId>io.streamnative.pulsar.handlers</groupId>
<version>4.0.14.1</version>
<version>4.0.14.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-protocol-handler-mqtt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mqtt-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
<groupId>io.streamnative.pulsar.handlers</groupId>
<version>4.0.14.1</version>
<version>4.0.14.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mqtt-proxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
<groupId>io.streamnative.pulsar.handlers</groupId>
<version>4.0.14.1</version>
<version>4.0.14.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-protocol-handler-mqtt-proxy</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>io.streamnative.pulsar.handlers</groupId>
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
<version>4.0.14.1</version>
<version>4.0.14.4</version>
<name>StreamNative :: Pulsar Protocol Handler :: MoP Parent</name>
<description>Parent for MQTT on Pulsar implemented using Pulsar Protocol Handler.</description>

Expand Down Expand Up @@ -51,8 +51,8 @@
<mockito.version>2.22.0</mockito.version>
<testng.version>6.14.3</testng.version>
<awaitility.version>4.0.2</awaitility.version>
<pulsar.version>4.0.14.1</pulsar.version>
<sn.bom.version>4.0.14.1</sn.bom.version>
<pulsar.version>4.0.14.4</pulsar.version>
<sn.bom.version>4.0.14.4</sn.bom.version>
<log4j2.version>2.18.0</log4j2.version>
<fusesource.client.version>1.16</fusesource.client.version>
<hivemq.mqtt.client.version>1.2.2</hivemq.mqtt.client.version>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
<groupId>io.streamnative.pulsar.handlers</groupId>
<version>4.0.14.1</version>
<version>4.0.14.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-protocol-handler-mqtt-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import static org.mockito.Mockito.verify;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.JsonObject;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.EventLoopGroup;
Expand Down Expand Up @@ -587,11 +587,11 @@ public void testConnectionWithSameClientId() throws Exception {
buffer.append(str);
}
String result = buffer.toString();
LinkedTreeMap treeMap = new Gson().fromJson(result, LinkedTreeMap.class);
LinkedTreeMap clients = (LinkedTreeMap) treeMap.get("clients");
JsonObject stats = new Gson().fromJson(result, JsonObject.class);
JsonObject clients = stats.getAsJsonObject("clients");
Awaitility.await().untilAsserted(() -> {
Assert.assertEquals(clients.get("active"), 1.0);
Assert.assertEquals(clients.get("total"), 2.0);
Assert.assertEquals(clients.get("active").getAsInt(), 1);
Assert.assertEquals(clients.get("total").getAsInt(), 2);
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import static org.mockito.Mockito.verify;
import com.google.common.util.concurrent.AtomicDouble;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.JsonObject;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
Expand Down Expand Up @@ -312,9 +312,9 @@ public void testProxyProcessPingReq() {
buffer.append(str);
}
String ret = buffer.toString();
LinkedTreeMap treeMap = new Gson().fromJson(ret, LinkedTreeMap.class);
LinkedTreeMap clients = (LinkedTreeMap) treeMap.get("clients");
active.set((Double) clients.get("active"));
JsonObject stats = new Gson().fromJson(ret, JsonObject.class);
JsonObject clients = stats.getAsJsonObject("clients");
active.set(clients.get("active").getAsDouble());
result.complete(null);
} catch (Throwable ex) {
result.completeExceptionally(ex);
Expand Down
Loading