From 6e0be8e6414b489aa4c86a71cd0b271ce4e23f96 Mon Sep 17 00:00:00 2001 From: himanshu Date: Tue, 6 Mar 2018 19:08:50 +0530 Subject: [PATCH] NIFI-4938 Upgraded org.eclipse.paho.client.mqttv3 dependency version to 1.2.0 Signed-off-by: Pierre Villard This closes #2514. --- nifi-assembly/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi-mqtt-processors/pom.xml | 2 +- .../mqtt/common/MqttTestClient.java | 71 +++++++++++++++++++ 4 files changed, 74 insertions(+), 3 deletions(-) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 85e3326783..e27e23467f 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -1803,7 +1803,7 @@ The following binary components are provided under the Eclipse Public License 1. (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.2.3 - http://logback.qos.ch/) (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.2.3 - http://logback.qos.ch/) (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.1.9.0 - http://jruby.org). - (EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2 - https://github.com/eclipse/paho.mqtt.java) + (EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0 - https://github.com/eclipse/paho.mqtt.java) (EPL 1.0) Eclipse Link (org.eclipse.persistence:eclipselink:2.5.2 - http://www.eclipse.org/eclipselink/) (EPL 1.0) Common Service Data Objects (org.eclipse.persistence:commonj.sdo:2.1.1 - http://www.eclipse.org/eclipselink/) (EPL 1.0) Java Persistence API (org.eclipse.persistence:javax.persistence:2.1.0 - http://www.eclipse.org/eclipselink/) diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/src/main/resources/META-INF/NOTICE index f7f930b08b..eeb9d158db 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/src/main/resources/META-INF/NOTICE @@ -47,4 +47,4 @@ Eclipse Public License 1.0 The following binary components are provided under the Eclipse Public License 1.0. See project link for details. - (EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2 - https://github.com/eclipse/paho.mqtt.java) + (EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0 - https://github.com/eclipse/paho.mqtt.java) diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml index bd8d66066f..64b406edd9 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml +++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml @@ -50,7 +50,7 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 - 1.0.2 + 1.2.0 diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java index 81e2b18aa1..02689d736e 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java +++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java @@ -19,6 +19,7 @@ package org.apache.nifi.processors.mqtt.common; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; +import org.eclipse.paho.client.mqttv3.IMqttMessageListener; import org.eclipse.paho.client.mqttv3.IMqttToken; import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; @@ -115,6 +116,66 @@ public class MqttTestClient implements IMqttClient { throw new UnsupportedOperationException("Multiple topic filters is not supported"); } + @Override + public void subscribe(String s, IMqttMessageListener iMqttMessageListener) throws MqttException, MqttSecurityException { + + } + + @Override + public void subscribe(String[] strings, IMqttMessageListener[] iMqttMessageListeners) throws MqttException { + + } + + @Override + public void subscribe(String s, int i, IMqttMessageListener iMqttMessageListener) throws MqttException { + + } + + @Override + public void subscribe(String[] strings, int[] ints, IMqttMessageListener[] iMqttMessageListeners) throws MqttException { + + } + + @Override + public IMqttToken subscribeWithResponse(String s) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String s, IMqttMessageListener iMqttMessageListener) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String s, int i) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String s, int i, IMqttMessageListener iMqttMessageListener) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String[] strings) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String[] strings, IMqttMessageListener[] iMqttMessageListeners) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String[] strings, int[] ints) throws MqttException { + return null; + } + + @Override + public IMqttToken subscribeWithResponse(String[] strings, int[] ints, IMqttMessageListener[] iMqttMessageListeners) throws MqttException { + return null; + } + @Override public void unsubscribe(String topicFilter) throws MqttException { subscribedTopic = ""; @@ -191,6 +252,16 @@ public class MqttTestClient implements IMqttClient { return new IMqttDeliveryToken[0]; } + @Override + public void setManualAcks(boolean b) { + + } + + @Override + public void messageArrivedComplete(int i, int i1) throws MqttException { + + } + @Override public void close() throws MqttException {