diff --git a/org.eclipse.kura.dnomaid.clientMqttPaho/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202111181658.jar b/org.eclipse.kura.dnomaid.clientMqttPaho/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202201231816.jar similarity index 92% rename from org.eclipse.kura.dnomaid.clientMqttPaho/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202111181658.jar rename to org.eclipse.kura.dnomaid.clientMqttPaho/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202201231816.jar index ffd75af..24cbde6 100644 Binary files a/org.eclipse.kura.dnomaid.clientMqttPaho/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202111181658.jar and b/org.eclipse.kura.dnomaid.clientMqttPaho/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202201231816.jar differ diff --git a/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dp b/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dp index 90f8780..e1abdc7 100644 Binary files a/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dp and b/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dp differ diff --git a/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dpp b/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dpp index 254a3e4..b1b1108 100644 --- a/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dpp +++ b/org.eclipse.kura.dnomaid.clientMqttPaho/resources/dp/clientMqttPahoDnomaid.dpp @@ -1,15 +1,15 @@ #Deployment Plugin Project File -#Thu Nov 18 16:59:06 CET 2021 +#Sun Jan 23 18:16:55 CET 2022 build.ant.name=<.>/resources/dp/clientMqttPahoDnomaid_build.xml build.dp.file=<.>/resources/dp/clientMqttPahoDnomaid.dp build.location= -bundles.0.bundle_path=<.>/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202111181658.jar +bundles.0.bundle_path=<.>/META-INF/exportPlugin/plugins/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202201231816.jar bundles.0.customizer=false bundles.0.headers.count=0 bundles.0.missing=false -bundles.0.name=bundles/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202111181658.jar +bundles.0.name=bundles/org.eclipse.kura.dnomaid.clientMqttPaho_1.0.0.202201231816.jar bundles.0.symbolic_name=org.eclipse.kura.dnomaid.clientMqttPaho;singleton\:\=true -bundles.0.version=1.0.0.202111181658 +bundles.0.version=1.0.0.202201231816 bundles.count=1 certificates.count=0 general.signbundles=false diff --git a/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/ClientMqttService.java b/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/ClientMqttService.java index 2284185..cb82a05 100644 --- a/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/ClientMqttService.java +++ b/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/ClientMqttService.java @@ -91,14 +91,17 @@ public void run() { mqtt.subscribe(); LAST_SUBSCRIBE = ConnectionConstants.getInst().getSubscribeTopic(); } - String publishTopic = ConnectionConstants.getInst().getPublishTopic(); - String publishMessage = ConnectionConstants.getInst().getPublishMessage(); - mqtt.publish(publishTopic, publishMessage); - S_LOGGER.info("#Publish topic: "+publishTopic+" #Publish message: "+publishMessage); - if (Status.getInst().isNewMessageReceived(LAST_MESSAGE_RECEIVED)) { - LAST_MESSAGE_RECEIVED = Status.getInst().getLastMessageReceived(); - S_LOGGER.info("#Last message received: "+LAST_MESSAGE_RECEIVED); + if(Status.getInst().isConnected()) { + String publishTopic = ConnectionConstants.getInst().getPublishTopic(); + String publishMessage = ConnectionConstants.getInst().getPublishMessage(); + mqtt.publish(publishTopic, publishMessage); + S_LOGGER.info("#Publish topic: {} #Publish message: {}",publishTopic,publishMessage); + if (Status.getInst().isNewMessageReceived(LAST_MESSAGE_RECEIVED)) { + LAST_MESSAGE_RECEIVED = Status.getInst().getLastMessageReceived(); + S_LOGGER.info("#Last message received: {}",LAST_MESSAGE_RECEIVED); + } } + if(!Status.getInst().noError())S_LOGGER.error("##Error connetion!!"); }else { if(Status.getInst().isConnected()) { mqtt.disconnection(); diff --git a/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/client/Connection.java b/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/client/Connection.java index 4f7c7bb..2274e01 100644 --- a/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/client/Connection.java +++ b/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/client/Connection.java @@ -65,7 +65,7 @@ public MqttConnectOptions createConnectionOptions() { publishTopic = ConnectionConstants.getInst().getPublishTopic(); publishQos = ConnectionConstants.getInst().getPublishQos(); retained = ConnectionConstants.getInst().isRetained(); - conOpt = ConnectionConstants.getInst().getConOpt(); + conOpt = ConnectionConstants.getInst().updateConOpt(); // last will message if ((!messageLWT.equals(Status.EMPTY)) || (!publishTopic.equals(Status.EMPTY))) { conOpt.setWill(publishTopic, messageLWT.getBytes(), publishQos, retained); diff --git a/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/global/ConnectionConstants.java b/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/global/ConnectionConstants.java index 7237552..682b2a2 100644 --- a/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/global/ConnectionConstants.java +++ b/org.eclipse.kura.dnomaid.clientMqttPaho/src/org/eclipse/kura/dnomaid/clientMqttPaho/mqtt/global/ConnectionConstants.java @@ -91,15 +91,20 @@ public static synchronized ConnectionConstants getInst() { public void setPublishMessage(String publishTopic) {this.PublishMessage = publishTopic;} public MqttConnectOptions getConOpt() {return conOpt;} + + public MqttConnectOptions updateConOpt(){ + conOpt.setCleanSession(CleanSession); + conOpt.setConnectionTimeout(TimeOut); + conOpt.setKeepAliveInterval(KeepAlive); + conOpt.setUserName(Username); + conOpt.setPassword(Password.toCharArray()); + return conOpt; + } //Methods private void InitConOpt(){ conOpt = new MqttConnectOptions(); - conOpt.setCleanSession(CleanSession); - conOpt.setConnectionTimeout(TimeOut); - conOpt.setKeepAliveInterval(KeepAlive); - conOpt.setUserName(Username); - conOpt.setPassword(Password.toCharArray()); + updateConOpt(); } private void InitDefault(){ Uri = URI;