Simplyfied creation of HazelcastMsg from InterceptPublishMessage

broker/src/main/java/io/moquette/interception/HazelcastInterceptHandler.java

@@ -23,8 +23,7 @@ public class HazelcastInterceptHandler extends AbstractInterceptHandler {
     public void onPublish(InterceptPublishMessage msg) {
         LOG.info("{} publish on {} message: {}", msg.getClientID(), msg.getTopicName(), new String(msg.getPayload().array()));
         ITopic<HazelcastMsg> topic = hz.getTopic("moquette");
-        HazelcastMsg hazelcastMsg = new HazelcastMsg(msg.getClientID(), msg.getTopicName(), msg.getQos().byteValue(),
-                msg.getPayload().array(), msg.getUsername());
+        HazelcastMsg hazelcastMsg = new HazelcastMsg(msg);
         topic.publish(hazelcastMsg);
     }
 

broker/src/main/java/io/moquette/interception/HazelcastMsg.java

@@ -1,5 +1,7 @@
 package io.moquette.interception;
 
+import io.moquette.interception.messages.InterceptPublishMessage;
+
 import java.io.Serializable;
 
 /**
@@ -8,17 +10,15 @@ import java.io.Serializable;
 public class HazelcastMsg implements Serializable {
 
     private final String clientId;
-    private final String userName;
     private final byte qos;
     private final byte[] payload;
     private final String topic;
 
-    public HazelcastMsg(String clientId, String topic, byte qos, byte[] payload, String userName) {
-        this.clientId = clientId;
-        this.qos = qos;
-        this.payload = payload;
-        this.userName = userName;
-        this.topic = topic;
+    public HazelcastMsg(InterceptPublishMessage msg) {
+        this.clientId = msg.getClientID();
+        this.topic = msg.getTopicName();
+        this.qos = msg.getQos().byteValue();
+        this.payload = msg.getPayload().array();
     }
 
     public String getClientId() {
@@ -33,10 +33,6 @@ public class HazelcastMsg implements Serializable {
         return payload;
     }
 
-    public String getUserName() {
-        return userName;
-    }
-
     public String getTopic() {
         return topic;
     }