prepare release

Author: source-c

profiles.clj

@@ -8,9 +8,7 @@
                            [org.slf4j/jul-to-slf4j "1.7.36"]
                            [org.slf4j/jcl-over-slf4j "1.7.36"]
                            [org.slf4j/log4j-over-slf4j "1.7.36"]
-                           [org.clojure/tools.logging "1.2.4"]]
-
-            :plugins       []}
+                           [org.clojure/tools.logging "1.2.4"]]}
 
  :provided {:dependencies      [[org.clojure/clojure "1.11.1"]]
             :source-paths      #{"src-clj"}
@@ -19,6 +17,6 @@
 
             :javac-options     ["-source" "9" "-target" "9" "-g:none"]
 
-            :jar-exclusions    [#"\.java"]}
+            :jar-exclusions    [#"\.java", #"^moquette.conf$"]}
 
  :jar      {:aot :all}}

src-java/com/dkdhub/mqtt_broker/SimpleBroker.java

@@ -10,16 +10,20 @@
 import io.netty.handler.codec.mqtt.MqttMessageBuilders;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
 import io.netty.handler.codec.mqtt.MqttQoS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class SimpleBroker implements IBroker {
     final Server mqttBroker = new Server();
     final IConfig classPathConfig;
 
-    public SimpleBroker() {
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleBroker.class);
+
+    public SimpleBroker(final String configName) {
         IResourceLoader classpathLoader = new ClasspathResourceLoader();
-        classPathConfig = new ResourceLoaderConfig(classpathLoader, "moquette.conf");
+        classPathConfig = new ResourceLoaderConfig(classpathLoader, configName);
     }
 
     @Override
@@ -28,14 +32,14 @@ public void start(InterceptHandler handler) throws IOException {
 
         mqttBroker.startServer(classPathConfig);
         mqttBroker.addInterceptHandler(handler);
-        System.out.println("Broker started");
+        LOG.info("SimpleBroker started. Class Path config = {}.", classPathConfig);
     }
 
     @Override
     public void stop() {
-        System.out.println("Stopping broker");
+        LOG.info("Stopping SimpleBroker");
         mqttBroker.stopServer();
-        System.out.println("Broker stopped");
+        LOG.info("SimpleBroker stopped");
     }
 
     @Override
@@ -47,7 +51,7 @@ public void send(String from, String topic, byte[] data, MqttQoS qos, Boolean re
                 .payload(Unpooled.copiedBuffer(data))
                 .build();
 
-        System.out.println("Sending message " + new String(data) + " from " + from + " to " + topic + " with " + qos + " and " + retained);
+        LOG.debug("Sending message {} from {} to {} with {} and {}", new String(data), from, topic, qos, retained);
 
         mqttBroker.internalPublish(message, from);
     }

test/basic.clj

@@ -1,6 +1,7 @@
 (ns basic
   (:require [clojure.test :refer :all]
-            [clj-mqtt-broker.core :refer :all])
+            [clj-mqtt-broker.core :refer :all]
+            [clojure.tools.logging :as log])
   (:import (io.moquette.interception InterceptHandler)
            (com.dkdhub.mqtt_broker SimpleBroker)
            (java.nio.charset StandardCharsets)
@@ -9,24 +10,26 @@
 (defrecord BasicHandler [id]
   InterceptHandler
   (onPublish [_ msg]
-    (println "got a message")
+    (log/info "got a message")
     (let [payload (-> msg .getPayload (.toString StandardCharsets/UTF_8))]
-      (println "Received on topic: " + (.getTopicName msg) + " content: " + payload)))
+      (log/info "Received on topic: " + (.getTopicName msg) + " content: " + payload)))
   (getID [_] id)
   (getInterceptedMessageTypes [_] InterceptHandler/ALL_MESSAGE_TYPES))
 
+(def config-name "moquette.conf")
+
 (deftest check-constructs
   (testing "Checking basic constructs"
     (is (instance? InterceptHandler (BasicHandler. "1234")))
-    (is (let [srv (SimpleBroker.)]
+    (is (let [srv (SimpleBroker. config-name)]
           (.start srv (BasicHandler. "1234"))
           (.stop srv)
           true))
-    (is (let [srv (Broker. (SimpleBroker.))]
+    (is (let [srv (Broker. (SimpleBroker. config-name))]
           (start srv (BasicHandler. "5678"))
           (stop srv)
           true))
-    (is (with-open [srv (Broker. (SimpleBroker.))]
+    (is (with-open [srv (Broker. (SimpleBroker. config-name))]
           (start srv (BasicHandler. "9012"))
           (Thread/sleep 20000)
           (send srv "FROM" "/TEMPERATURE" "TEST" 0 false)