diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index abe536bb2..608b8bfc0 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index a0386fa75..56c256c18 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -23,7 +23,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index aaea257ca..a68bbcfd5 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index 1ad5c5be6..4fdd9c5fd 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index 9155cdeff..c1c73ea7d 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index f587abf61..557db828b 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index c10de4869..b65008e30 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java index b11b07cb2..00f0372e0 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java @@ -124,6 +124,15 @@ public class MQTTEventAdapterFactory extends InputEventAdapterFactory { clientId.setHint(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLIENTID_HINT)); propertyList.add(clientId); + // set qos + Property qosProperty = new Property(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS); + qosProperty.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS)); + qosProperty.setRequired(false); + qosProperty.setOptions(new String[]{"0", "1", "2"}); + qosProperty.setDefaultValue("0"); + + propertyList.add(qosProperty); + return propertyList; } diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java index 3d0f2ae8e..dffe9fc36 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java @@ -58,6 +58,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable { private MQTTBrokerConnectionConfiguration mqttBrokerConnectionConfiguration; private String topic; + private int qos; private String topicStructure; private String tenantDomain; private volatile boolean connectionSucceeded = false; @@ -81,6 +82,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable { int keepAlive = mqttBrokerConnectionConfiguration.getKeepAlive(); this.topicStructure = new String(topic); this.topic = PropertyUtils.replacePlaceholders(topic); + this.qos = mqttBrokerConnectionConfiguration.getQos(); this.eventAdapterListener = inputEventAdapterListener; this.tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(); @@ -162,7 +164,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable { return false; } try { - mqttClient.subscribe(topic); + mqttClient.subscribe(topic, qos); log.info("mqtt receiver subscribed to topic: " + topic); } catch (MqttException e) { log.error("Failed to subscribe to topic: " + topic + ", Retrying....."); diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java index 99ccb52d6..6a1ff8db6 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java @@ -32,6 +32,7 @@ public class MQTTBrokerConnectionConfiguration { private String brokerScopes = null; private boolean cleanSession = true; private int keepAlive; + private int qos; private String brokerUrl; private String dcrUrl; private String contentValidatorType; @@ -83,6 +84,14 @@ public class MQTTBrokerConnectionConfiguration { return adapterName; } + public int getQos() { + return qos; + } + + public void setQos(int qos) { + this.qos = qos; + } + public MQTTBrokerConnectionConfiguration(InputEventAdapterConfiguration eventAdapterConfiguration, Map globalProperties) throws InputEventAdapterException { @@ -131,6 +140,15 @@ public class MQTTBrokerConnectionConfiguration { } else { keepAlive = MQTTEventAdapterConstants.ADAPTER_CONF_DEFAULT_KEEP_ALIVE; } + + String qosVal = globalProperties.get(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS); + if (qosVal != null && !qosVal.isEmpty()) { + this.qos = Integer.parseInt(qosVal); + } else { + qosVal = eventAdapterConfiguration.getProperties().get(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS); + this.qos = Integer.parseInt(qosVal); + } + this.contentTransformerType = eventAdapterConfiguration.getProperties() .get(MQTTEventAdapterConstants.ADAPTER_CONF_CONTENT_TRANSFORMER_TYPE); } diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTEventAdapterConstants.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTEventAdapterConstants.java index 22be649be..78553519b 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTEventAdapterConstants.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTEventAdapterConstants.java @@ -47,6 +47,7 @@ public class MQTTEventAdapterConstants { public static final String ADAPTER_CONF_CLEAN_SESSION_HINT = "cleanSession.hint"; public static final String ADAPTER_CONF_KEEP_ALIVE = "keepAlive"; public static final int ADAPTER_CONF_DEFAULT_KEEP_ALIVE = 20000; + public static final String ADAPTER_MESSAGE_QOS = "qos"; public static final int INITIAL_RECONNECTION_DURATION = 4000; public static final int RECONNECTION_PROGRESS_FACTOR = 2; diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/resources/io/entgra/device/mgt/plugins/input/adapter/mqtt/i18n/Resources.properties b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/resources/io/entgra/device/mgt/plugins/input/adapter/mqtt/i18n/Resources.properties index 8624508a0..8ea53dbc3 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/resources/io/entgra/device/mgt/plugins/input/adapter/mqtt/i18n/Resources.properties +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/resources/io/entgra/device/mgt/plugins/input/adapter/mqtt/i18n/Resources.properties @@ -18,6 +18,7 @@ topic=Topic topic.hint=Topic subscribed +qos=Quality of Service clientId=Client Id clientId.hint=client identifier is used by the server to identify a client when it reconnects, It used for durable subscriptions or reliable delivery of messages is required. url=Broker Url (Not required), If it is not provided then it will connect to the default broker. diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index 82e5077d9..40b3a54a7 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index efd46c39f..f8ab2c790 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index c9bfc0a22..c85497bde 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 7e8ac2f85..9ea14f4d8 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java index cb962777a..6cb4bf9fa 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java @@ -92,7 +92,7 @@ public class MQTTEventAdapterFactory extends OutputEventAdapterFactory { qos.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_MESSAGE_QOS)); qos.setRequired(false); qos.setOptions(new String[]{"0", "1", "2"}); - qos.setDefaultValue("2"); + qos.setDefaultValue("0"); // set topic Property topicProperty = new Property(MQTTEventAdapterConstants.ADAPTER_MESSAGE_TOPIC); diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index 7b1630dff..4a80797a7 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index 7d8b305cf..9b9f0d837 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index 909dd2aa8..ba703eb3f 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index f671fc64b..dba1bd58c 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index ced4dd84c..791eea9a5 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 7e806a198..5ffd90851 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index 82d816301..0e6a992a2 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index dd8997780..cb44ede29 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index 47c69651a..2f8fabd7e 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index b124fdd9c..e3d874b54 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index 57c3dcd12..d9776d924 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index d2c84b4a5..dd1855240 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index f24a1e2ea..08ead26cc 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index ccddd6d86..8046c8ee2 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java index e3e61d716..d367433f8 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java @@ -58,8 +58,12 @@ import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotific import io.entgra.device.mgt.core.device.mgt.common.push.notification.NotificationStrategy; import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService; import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceStatus; +import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException; +import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO; import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType; import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceTypeVersion; +import io.entgra.device.mgt.core.device.mgt.core.dto.OperationDTO; +import io.entgra.device.mgt.core.device.mgt.core.dto.OwnerWithDeviceDTO; import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService; import io.entgra.device.mgt.core.device.mgt.core.service.EmailMetaInfo; import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils; @@ -67,6 +71,7 @@ import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils; import org.apache.commons.collections.map.SingletonMap; import java.sql.Timestamp; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -396,6 +401,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv } + @Override + public boolean recordDeviceUpdate(DeviceIdentifier deviceIdentifier) throws DeviceManagementException { + return false; + } + @Override public boolean modifyEnrollment(Device device) throws DeviceManagementException { return TestUtils.getDeviceId().equals(device.getDeviceIdentifier()); @@ -897,4 +907,24 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv public void deleteDeviceDataByTenantDomain(String s) throws DeviceManagementException { throw new UnsupportedOperationException("Not implemented"); } + + @Override + public OwnerWithDeviceDTO getOwnersWithDeviceIds(String s) throws DeviceManagementDAOException { + return null; + } + + @Override + public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int i) throws DeviceManagementDAOException { + return null; + } + + @Override + public List getDevicesByTenantId(int i) throws DeviceManagementDAOException { + return Collections.emptyList(); + } + + @Override + public OperationDTO getOperationDetailsById(int i) throws OperationManagementException { + return null; + } } diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index dc7324233..609ec94c5 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index 0eac699fe..34667733c 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -23,7 +23,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index 97e32584d..972b771c4 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -22,7 +22,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index a8793d450..27102305b 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 03e4b7705..01613e24d 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index 6b4cbfc99..2802ca138 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins analytics-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index 6dfd694f3..4ff7daa5d 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index d6f9974fd..24cfc10d1 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index cbc68ecde..d93e47808 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 1b081c55c..c103f41a0 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index 455eb1c38..ac46038ae 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index 7c762992c..324c0da89 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index 46192dc3e..cc7bc8591 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index 9ed5909e7..811eee6e3 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index 2c1fb9248..85ed7714f 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 149425864..348f4b441 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index 84bbee7e2..cdbb3b59c 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index 954938abf..aeab5afd0 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index a0ac4dd27..922d64d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent pom - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT WSO2 Carbon - Device Management Plugins Parent http://entgra.io WSO2 Carbon - Device Management Plugins Parent @@ -964,11 +964,11 @@ - 5.0.42-SNAPSHOT + 5.1.1-SNAPSHOT [5.0.0, 6.0.0) - 6.0.30-SNAPSHOT + 6.1.1-SNAPSHOT 4.0.0