Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

Commit

Permalink
MqttService: Remove all deprecated methods, rename close to stop and …
Browse files Browse the repository at this point in the history
…more.

* Remove name from MqttBrokerConnection. This is only necessary for the MqttService.
  Consumers of MqttBrokerConnection should not be bothered with that detail.
* Remove textConfigured flag. Again this is not interesting for anything outside MqttService.
* Don't parse configuration parameters ourself, but use a configuration values class instead.
* Adapt to Nullable usage.
* Mqtt: Introduce service factory service MqttBrokerConnectionServiceInstance
* ESH compatible implementation of the service factory pattern including a config description for GUIs
* Add MqttService.setLastWill method. Fixes #5162

Signed-off-by: David Graeff <david.graeff@web.de>
  • Loading branch information
David Gräff committed Mar 29, 2018
1 parent aa0278b commit d4ad8c1
Show file tree
Hide file tree
Showing 23 changed files with 762 additions and 874 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ Import-Package:
org.junit,
org.junit.runner,
org.junit.runners,
org.mockito
org.mockito,
org.mockito.invocation,
org.mockito.stubbing
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<setAttribute key="additional_plugins"/>
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="true"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.smarthome.auth.jaas,org.eclipse.smarthome.automation.api,org.eclipse.smarthome.automation.commands,org.eclipse.smarthome.automation.core,org.eclipse.smarthome.automation.core.test,org.eclipse.smarthome.automation.event.test,org.eclipse.smarthome.automation.integration.test,org.eclipse.smarthome.automation.module.core,org.eclipse.smarthome.automation.module.core.test,org.eclipse.smarthome.automation.module.media,org.eclipse.smarthome.automation.module.script,org.eclipse.smarthome.automation.module.script.defaultscope,org.eclipse.smarthome.automation.module.script.rulesupport,org.eclipse.smarthome.automation.module.script.test,org.eclipse.smarthome.automation.module.timer,org.eclipse.smarthome.automation.module.timer.test,org.eclipse.smarthome.automation.parser.gson,org.eclipse.smarthome.automation.provider.file,org.eclipse.smarthome.automation.providers,org.eclipse.smarthome.automation.rest,org.eclipse.smarthome.automation.sample.extension.java,org.eclipse.smarthome.automation.sample.extension.json,org.eclipse.smarthome.automation.sample.rest.api,org.eclipse.smarthome.binding.astro,org.eclipse.smarthome.binding.astro.test,org.eclipse.smarthome.binding.bluetooth,org.eclipse.smarthome.binding.bluetooth.bluez,org.eclipse.smarthome.binding.bluetooth.blukii,org.eclipse.smarthome.binding.bluetooth.test,org.eclipse.smarthome.binding.digitalstrom,org.eclipse.smarthome.binding.dmx,org.eclipse.smarthome.binding.dmx.test,org.eclipse.smarthome.binding.fsinternetradio,org.eclipse.smarthome.binding.fsinternetradio.test,org.eclipse.smarthome.binding.hue,org.eclipse.smarthome.binding.hue.test,org.eclipse.smarthome.binding.lifx,org.eclipse.smarthome.binding.lirc,org.eclipse.smarthome.binding.mqtt,org.eclipse.smarthome.binding.mqtt.test,org.eclipse.smarthome.binding.ntp,org.eclipse.smarthome.binding.ntp.test,org.eclipse.smarthome.binding.serialbutton,org.eclipse.smarthome.binding.sonos,org.eclipse.smarthome.binding.tradfri,org.eclipse.smarthome.binding.tradfri.test,org.eclipse.smarthome.binding.weatherunderground,org.eclipse.smarthome.binding.wemo,org.eclipse.smarthome.binding.wemo.test,org.eclipse.smarthome.binding.yahooweather,org.eclipse.smarthome.config.discovery,org.eclipse.smarthome.config.discovery.mdns,org.eclipse.smarthome.config.discovery.test,org.eclipse.smarthome.config.discovery.upnp,org.eclipse.smarthome.config.dispatch,org.eclipse.smarthome.config.dispatch.test,org.eclipse.smarthome.config.serial,org.eclipse.smarthome.core.audio,org.eclipse.smarthome.core.audio.test,org.eclipse.smarthome.core.binding.xml,org.eclipse.smarthome.core.binding.xml.test,org.eclipse.smarthome.core.extension.sample,org.eclipse.smarthome.core.id,org.eclipse.smarthome.core.id.test,org.eclipse.smarthome.core.persistence,org.eclipse.smarthome.core.scheduler,org.eclipse.smarthome.core.thing,org.eclipse.smarthome.core.thing.test,org.eclipse.smarthome.core.thing.xml,org.eclipse.smarthome.core.thing.xml.test,org.eclipse.smarthome.core.transform,org.eclipse.smarthome.core.voice,org.eclipse.smarthome.core.voice.test,org.eclipse.smarthome.extensionservice.marketplace,org.eclipse.smarthome.extensionservice.marketplace.automation,org.eclipse.smarthome.extensionservice.marketplace.test,org.eclipse.smarthome.io.console,org.eclipse.smarthome.io.console.eclipse,org.eclipse.smarthome.io.console.rfc147,org.eclipse.smarthome.io.javasound,org.eclipse.smarthome.io.monitor,org.eclipse.smarthome.io.mqttembeddedbroker,org.eclipse.smarthome.io.mqttembeddedbroker.test,org.eclipse.smarthome.io.net,org.eclipse.smarthome.io.net.security,org.eclipse.smarthome.io.net.security.test,org.eclipse.smarthome.io.net.test,org.eclipse.smarthome.io.rest,org.eclipse.smarthome.io.rest.auth,org.eclipse.smarthome.io.rest.auth.basic,org.eclipse.smarthome.io.rest.core,org.eclipse.smarthome.io.rest.core.test,org.eclipse.smarthome.io.rest.log,org.eclipse.smarthome.io.rest.mdns,org.eclipse.smarthome.io.rest.optimize,org.eclipse.smarthome.io.rest.sitemap,org.eclipse.smarthome.io.rest.sitemap.test,org.eclipse.smarthome.io.rest.sse,org.eclipse.smarthome.io.rest.sse.test,org.eclipse.smarthome.io.rest.test,org.eclipse.smarthome.io.rest.voice,org.eclipse.smarthome.io.security.api,org.eclipse.smarthome.io.transport.dbus,org.eclipse.smarthome.io.transport.mdns,org.eclipse.smarthome.io.transport.upnp,org.eclipse.smarthome.io.transport.upnp.test,org.eclipse.smarthome.io.webaudio,org.eclipse.smarthome.magic,org.eclipse.smarthome.magic.test,org.eclipse.smarthome.model.codegen,org.eclipse.smarthome.model.core,org.eclipse.smarthome.model.core.test,org.eclipse.smarthome.model.item,org.eclipse.smarthome.model.item.ide,org.eclipse.smarthome.model.item.runtime,org.eclipse.smarthome.model.item.tests,org.eclipse.smarthome.model.lazygen,org.eclipse.smarthome.model.lsp,org.eclipse.smarthome.model.lsp.test,org.eclipse.smarthome.model.persistence,org.eclipse.smarthome.model.persistence.ide,org.eclipse.smarthome.model.persistence.runtime,org.eclipse.smarthome.model.persistence.tests,org.eclipse.smarthome.model.rule,org.eclipse.smarthome.model.rule.ide,org.eclipse.smarthome.model.rule.runtime,org.eclipse.smarthome.model.rule.tests,org.eclipse.smarthome.model.script,org.eclipse.smarthome.model.script.ide,org.eclipse.smarthome.model.script.runtime,org.eclipse.smarthome.model.script.tests,org.eclipse.smarthome.model.sitemap,org.eclipse.smarthome.model.sitemap.ide,org.eclipse.smarthome.model.sitemap.runtime,org.eclipse.smarthome.model.thing,org.eclipse.smarthome.model.thing.ide,org.eclipse.smarthome.model.thing.runtime,org.eclipse.smarthome.model.thing.tests,org.eclipse.smarthome.storage.json,org.eclipse.smarthome.storage.json.test,org.eclipse.smarthome.storage.mapdb,org.eclipse.smarthome.storage.mapdb.test,org.eclipse.smarthome.transform.exec,org.eclipse.smarthome.transform.javascript,org.eclipse.smarthome.transform.jsonpath,org.eclipse.smarthome.transform.jsonpath.test,org.eclipse.smarthome.transform.map,org.eclipse.smarthome.transform.map.test,org.eclipse.smarthome.transform.regex,org.eclipse.smarthome.transform.regex.test,org.eclipse.smarthome.transform.scale,org.eclipse.smarthome.transform.scale.test,org.eclipse.smarthome.transform.xpath,org.eclipse.smarthome.transform.xpath.test,org.eclipse.smarthome.transform.xslt,org.eclipse.smarthome.transform.xslt.test,org.eclipse.smarthome.ui,org.eclipse.smarthome.ui.basic,org.eclipse.smarthome.ui.classic,org.eclipse.smarthome.ui.icon,org.eclipse.smarthome.ui.icon.test,org.eclipse.smarthome.ui.iconset.classic,org.eclipse.smarthome.ui.paper,org.eclipse.smarthome.ui.test,org.eclipse.smarthome.voice.mactts,org.eclipse.smarthome.voice.mactts.test"/>
<stringAttribute key="featureDefaultLocation" value="workspace"/>
<stringAttribute key="featurePluginResolution" value="workspace"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.smarthome.io.transport.mqtt.test"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.smarthome.io.transport.mqtt.test"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.io.transport.mqtt.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<setAttribute key="selected_features"/>
<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.eclipsesource.jaxrs.jersey-min@default:default,com.google.gson*2.7.0.v20170129-0911@default:default,com.google.guava@default:default,javax.activation@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.measure.unit-api@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.transaction@default:false,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,net.bytebuddy.byte-buddy-agent@default:default,net.bytebuddy.byte-buddy@default:default,org.apache.ant@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.supplement@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jdt.annotation*2.1.100.v20170511-1408@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.paho.client.mqttv3@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit@default:default,org.mockito.mockito-core@default:default,org.objenesis@default:default,org.slf4j.api@default:default,org.slf4j.log4j@default:default,tec.uom.lib.uom-lib-common@default:default,tec.uom.se@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.smarthome.config.core.test@default:false,org.eclipse.smarthome.config.core@default:default,org.eclipse.smarthome.config.xml.test@default:false,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core.autoupdate@default:default,org.eclipse.smarthome.core.test@default:false,org.eclipse.smarthome.core@default:default,org.eclipse.smarthome.io.transport.mqtt.test@default:false,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
Loading

0 comments on commit d4ad8c1

Please sign in to comment.