diff --git a/.classpath b/.classpath index 4a2f234..f7fbb2c 100644 --- a/.classpath +++ b/.classpath @@ -18,7 +18,7 @@ - + diff --git a/.gitignore b/.gitignore index 53ac5da..f1b1b9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /doc/ -/target/ -/.settings/ +/target/ +/.settings/ diff --git a/lib/aws-iot-device-sdk-java-1.3.4.jar b/lib/aws-iot-device-sdk-java-1.3.4.jar deleted file mode 100644 index 8365cfa..0000000 Binary files a/lib/aws-iot-device-sdk-java-1.3.4.jar and /dev/null differ diff --git a/lib/org.eclipse.paho.client.mqttv3-1.2.2.jar b/lib/org.eclipse.paho.client.mqttv3-1.2.2.jar deleted file mode 100644 index ea2d9a6..0000000 Binary files a/lib/org.eclipse.paho.client.mqttv3-1.2.2.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 66e9ab6..92562b6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,34 +1,44 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 - - org.openhab.addons.bundles - org.openhab.addons.reactor.bundles - 2.5.3-SNAPSHOT - + + org.openhab.addons.bundles + org.openhab.addons.reactor.bundles + 3.0.0-SNAPSHOT + - org.openhab.binding.worxlandroid + org.openhab.binding.worxlandroid - openHAB Add-ons :: Bundles :: WorxLandroid Binding + openHAB Add-ons :: Bundles :: WorxLandroid Binding - - - com.fasterxml.jackson.core - jackson-core - 2.9.9 - - - com.fasterxml.jackson.core - jackson-databind - 2.9.10.5 - - - com.fasterxml.jackson.core - jackson-annotations - 2.9.0 - - + + + com.fasterxml.jackson.core + jackson-core + 2.9.9 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.10.5 + + + com.fasterxml.jackson.core + jackson-annotations + 2.9.0 + + + com.amazonaws + aws-iot-device-sdk-java + 1.3.7 + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml index ed9dd6e..fe462b0 100644 --- a/src/main/feature/feature.xml +++ b/src/main/feature/feature.xml @@ -1,14 +1,14 @@ - mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features + mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features - - openhab-runtime-base - mvn:org.openhab.addons.bundles/org.openhab.binding.worxlandroid/${project.version} - - + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.worxlandroid/${project.version} + + diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBindingConstants.java b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBindingConstants.java index 5dbd8f4..0ccab0f 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBindingConstants.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBindingConstants.java @@ -16,7 +16,7 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingTypeUID; /** * The {@link WorxLandroidBindingConstants} class defines datCommon constants, which are diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBridgeHandler.java b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBridgeHandler.java index f734ae6..96700ba 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBridgeHandler.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidBridgeHandler.java @@ -27,12 +27,6 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler; -import org.eclipse.smarthome.core.types.Command; import org.openhab.binding.worxlandroid.internal.config.BridgeConfiguration; import org.openhab.binding.worxlandroid.internal.discovery.MowerDiscoveryService; import org.openhab.binding.worxlandroid.internal.mqtt.AWSClient; @@ -43,6 +37,12 @@ import org.openhab.binding.worxlandroid.internal.webapi.WorxLandroidWebApiImpl; import org.openhab.binding.worxlandroid.internal.webapi.response.UsersCertificateResponse; import org.openhab.binding.worxlandroid.internal.webapi.response.UsersMeResponse; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.binding.BaseBridgeHandler; +import org.openhab.core.types.Command; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -157,7 +157,6 @@ public void initialize() { logger.error("Iniialization error - toString: {}", e.toString()); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Error: " + e.getMessage()); } - } @Override @@ -222,7 +221,6 @@ public void publishMessage(AWSMessage awsMessage) throws AWSIotException { logger.debug("publish topic -> {}", awsMessage.getTopic()); logger.debug("publish message -> {}", awsMessage.getStringPayload()); awsClient.publish(awsMessage); - } @Override @@ -241,6 +239,5 @@ public void onAWSConnectionFailure() { public void onAWSConnectionClosed() { logger.debug("AWS connection closed"); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "AWS connection closed!"); - } -} \ No newline at end of file +} diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidHandlerFactory.java b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidHandlerFactory.java index 9a77e8b..2a47a99 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidHandlerFactory.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidHandlerFactory.java @@ -24,16 +24,16 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.eclipse.smarthome.io.net.http.HttpClientFactory; import org.openhab.binding.worxlandroid.internal.discovery.MowerDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.io.net.http.HttpClientFactory; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.BaseThingHandlerFactory; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.thing.binding.ThingHandlerFactory; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidMowerHandler.java b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidMowerHandler.java index 38fbe63..414e837 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidMowerHandler.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/WorxLandroidMowerHandler.java @@ -26,21 +26,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.library.types.DateTimeType; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.library.types.OnOffType; -import org.eclipse.smarthome.core.library.types.StringType; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.RefreshType; import org.openhab.binding.worxlandroid.internal.codes.WorxLandroidActionCodes; import org.openhab.binding.worxlandroid.internal.codes.WorxLandroidDayCodes; import org.openhab.binding.worxlandroid.internal.codes.WorxLandroidErrorCodes; @@ -55,6 +40,21 @@ import org.openhab.binding.worxlandroid.internal.webapi.WorxLandroidWebApiImpl; import org.openhab.binding.worxlandroid.internal.webapi.response.ProductItemsResponse; import org.openhab.binding.worxlandroid.internal.webapi.response.ProductItemsStatusResponse; +import org.openhab.core.library.types.DateTimeType; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.thing.binding.builder.ThingBuilder; +import org.openhab.core.types.Command; +import org.openhab.core.types.RefreshType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidActionCodes.java b/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidActionCodes.java index 18d89d8..b6be886 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidActionCodes.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidActionCodes.java @@ -48,5 +48,4 @@ public String getDescription() { public String toString() { return String.format("%s | ActionCode: %d - %s", this.name(), this.getCode(), this.getDescription()); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidDayCodes.java b/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidDayCodes.java index e62f96a..c2d073e 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidDayCodes.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/codes/WorxLandroidDayCodes.java @@ -49,5 +49,4 @@ public String getDescription() { public String toString() { return String.format("%s | DayCode: %d - %s", this.name(), this.getCode(), this.getDescription()); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/discovery/MowerDiscoveryService.java b/src/main/java/org/openhab/binding/worxlandroid/internal/discovery/MowerDiscoveryService.java index 7802682..02e2bf7 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/discovery/MowerDiscoveryService.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/discovery/MowerDiscoveryService.java @@ -19,16 +19,16 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; import org.openhab.binding.worxlandroid.internal.WorxLandroidBindingConstants; import org.openhab.binding.worxlandroid.internal.WorxLandroidBridgeHandler; import org.openhab.binding.worxlandroid.internal.webapi.WorxLandroidWebApiImpl; import org.openhab.binding.worxlandroid.internal.webapi.response.ProductItemsResponse; +import org.openhab.core.config.discovery.AbstractDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -129,5 +129,4 @@ protected void startScan() { protected void startBackgroundDiscovery() { startScan(); } - -} \ No newline at end of file +} diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSMessage.java b/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSMessage.java index da924db..8db804c 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSMessage.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSMessage.java @@ -59,4 +59,4 @@ public void onTimeout() { // called when message publishing timed out logger.warn("AWS message publishing timed out"); } -} \ No newline at end of file +} diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSTopic.java b/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSTopic.java index f86a3ae..d74754c 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSTopic.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/mqtt/AWSTopic.java @@ -52,4 +52,4 @@ public void onMessage(@Nullable AWSIotMessage message) { logger.debug("onMessage: {}", message.getStringPayload()); callback.processMessage(message); } -} \ No newline at end of file +} diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/vo/Mower.java b/src/main/java/org/openhab/binding/worxlandroid/internal/vo/Mower.java index 0a4ec72..e08eaeb 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/vo/Mower.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/vo/Mower.java @@ -171,7 +171,6 @@ public ScheduledDay getScheduledDay(WorxLandroidDayCodes dayCode) { public void put(WorxLandroidDayCodes dayCode, ScheduledDay scheduledDay) { scheduledDays.put(dayCode, scheduledDay); - } /** @@ -185,7 +184,6 @@ public ScheduledDay getScheduledDay2(WorxLandroidDayCodes dayCode) { public void putScheduledDay2(WorxLandroidDayCodes dayCode, ScheduledDay scheduledDay) { scheduledDays2.put(dayCode, scheduledDay); - } /** @@ -341,5 +339,4 @@ public long getStatus() { public void setStatus(long status) { this.status = status; } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WebApiException.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WebApiException.java index f59f378..07d1560 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WebApiException.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WebApiException.java @@ -66,5 +66,4 @@ public int getErrorCode() { public String getErrorMsg() { return errorMsg; } - -} \ No newline at end of file +} diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidApi.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidApi.java index 9485604..6bf4239 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidApi.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidApi.java @@ -78,5 +78,4 @@ public interface WorxLandroidApi { * @throws WebApiException */ public ProductItemsStatusResponse retrieveDeviceStatus(String serialNumber) throws WebApiException; - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidWebApiImpl.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidWebApiImpl.java index 2c94d1f..d77e01f 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidWebApiImpl.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/WorxLandroidWebApiImpl.java @@ -65,7 +65,6 @@ public boolean connect(String username, String password) { logger.error("Error connecting to Worx Landroid WebApi! Error = {}", e.getErrorMsg()); return false; } - } @Override @@ -77,7 +76,6 @@ public UsersCertificateResponse retrieveAwsCertificate() throws WebApiException UsersCertificateRequest awsCertificateRequest = new UsersCertificateRequest(httpClient); return awsCertificateRequest.call(apiAuth); - } @Override @@ -89,7 +87,6 @@ public UsersMeResponse retrieveWebInfo() throws WebApiException { UsersMeRequest webInfoRequest = new UsersMeRequest(httpClient); return webInfoRequest.call(apiAuth); - } @Override @@ -101,7 +98,6 @@ public ProductItemsResponse retrieveUserDevices() throws WebApiException { ProductItemsRequest productItemsRequest = new ProductItemsRequest(httpClient); return productItemsRequest.call(apiAuth); - } @Override @@ -113,7 +109,6 @@ public ProductItemsStatusResponse retrieveDeviceStatus(String serialNumber) thro ProductItemsStatusRequest productItemsStatusRequest = new ProductItemsStatusRequest(httpClient); return productItemsStatusRequest.call(apiAuth, serialNumber); - } @Override @@ -125,7 +120,5 @@ public ProductsResponse retrieveDevices() throws WebApiException { ProductsRequest productsRequest = new ProductsRequest(httpClient); return productsRequest.call(apiAuth); - } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/OauthTokenRequest.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/OauthTokenRequest.java index 4aa3f45..cf0bf47 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/OauthTokenRequest.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/OauthTokenRequest.java @@ -69,5 +69,4 @@ public OauthTokenResponse call(String username, String password) throws WebApiEx return callWebApi(request); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsRequest.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsRequest.java index ceeb3ad..4449d3a 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsRequest.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsRequest.java @@ -45,5 +45,4 @@ public ProductItemsResponse call(WebApiAuth auth) throws WebApiException { return callWebApiGet(APIURL_PRODUCTITEMS, auth); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsStatusRequest.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsStatusRequest.java index 5f1391e..fcace63 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsStatusRequest.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductItemsStatusRequest.java @@ -46,5 +46,4 @@ public ProductItemsStatusResponse call(WebApiAuth auth, String serialNumber) thr return callWebApiGet(String.format("%s/%s/status", APIURL_PRODUCTITEMS, serialNumber), auth); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductsRequest.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductsRequest.java index 5474e1a..200c69a 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductsRequest.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/ProductsRequest.java @@ -45,5 +45,4 @@ public ProductsResponse call(WebApiAuth auth) throws WebApiException { return callWebApiGet(APIURL_PRODUCTS, auth); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/UsersCertificateRequest.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/UsersCertificateRequest.java index 8c6a842..76a1953 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/UsersCertificateRequest.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/UsersCertificateRequest.java @@ -34,7 +34,6 @@ public class UsersCertificateRequest extends WebApiRequest { */ public UsersMeRequest(HttpClient httpClient) { super(httpClient); - } /** @@ -46,5 +45,4 @@ public UsersMeResponse call(WebApiAuth auth) throws WebApiException { return callWebApiGet(APIURL_USER_ME, auth); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/WebApiRequest.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/WebApiRequest.java index b25fb75..200b327 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/WebApiRequest.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/request/WebApiRequest.java @@ -121,6 +121,5 @@ protected synchronized T callWebApi(Request request) throws WebApiException { | SecurityException e) { throw new WebApiException(e); } - } -} \ No newline at end of file +} diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ApiResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ApiResponse.java index 20228b7..3516ed3 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ApiResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ApiResponse.java @@ -22,5 +22,4 @@ public interface ApiResponse { // MemberNames public static final String MN_MQTTENDPOINT = "mqtt_endpoint"; - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/OauthTokenResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/OauthTokenResponse.java index 827791a..155ffaf 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/OauthTokenResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/OauthTokenResponse.java @@ -36,7 +36,6 @@ public OauthTokenResponse(String jsonResponse) { public String getAccessType() { return getJsonResponseAsJsonObject().getAsJsonPrimitive("token_type").getAsString(); - } /** diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsResponse.java index a5931cd..059e90a 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsResponse.java @@ -83,5 +83,4 @@ public Map getDataAsPropertyMap(@Nullable String serialNumber) { return super.getDataAsPropertyMap(null, "UNKNOWN", jsonObject); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsStatusResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsStatusResponse.java index 4bb0831..86044c3 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsStatusResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductItemsStatusResponse.java @@ -33,5 +33,4 @@ public class ProductItemsStatusResponse extends WebApiResponse { public ProductItemsStatusResponse(String jsonResponse) { super(jsonResponse); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductsResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductsResponse.java index 0463505..8812be0 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductsResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/ProductsResponse.java @@ -29,5 +29,4 @@ public class ProductsResponse extends WebApiResponse { public ProductsResponse(String jsonResponse) { super(jsonResponse); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersCertificateResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersCertificateResponse.java index 75c50b6..4282bdf 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersCertificateResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersCertificateResponse.java @@ -46,5 +46,4 @@ public boolean isActive() { String active = getJsonResponseAsJsonObject().get("active").getAsString(); return Boolean.parseBoolean(active); } - } diff --git a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersMeResponse.java b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersMeResponse.java index 61ea11e..c64cec6 100644 --- a/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersMeResponse.java +++ b/src/main/java/org/openhab/binding/worxlandroid/internal/webapi/response/UsersMeResponse.java @@ -29,5 +29,4 @@ public class UsersMeResponse extends WebApiResponse { public UsersMeResponse(String jsonResponse) { super(jsonResponse); } - } diff --git a/src/main/resources/ESH-INF/binding/binding.xml b/src/main/resources/OH-INF/binding/binding.xml similarity index 100% rename from src/main/resources/ESH-INF/binding/binding.xml rename to src/main/resources/OH-INF/binding/binding.xml diff --git a/src/main/resources/ESH-INF/i18n/worxlandroid_xx_XX.properties b/src/main/resources/OH-INF/i18n/worxlandroid_xx_XX.properties similarity index 100% rename from src/main/resources/ESH-INF/i18n/worxlandroid_xx_XX.properties rename to src/main/resources/OH-INF/i18n/worxlandroid_xx_XX.properties diff --git a/src/main/resources/ESH-INF/thing/bridge.xml b/src/main/resources/OH-INF/thing/bridge.xml similarity index 69% rename from src/main/resources/ESH-INF/thing/bridge.xml rename to src/main/resources/OH-INF/thing/bridge.xml index b5862c2..454f7e2 100644 --- a/src/main/resources/ESH-INF/thing/bridge.xml +++ b/src/main/resources/OH-INF/thing/bridge.xml @@ -1,30 +1,22 @@ - - - + Represents the API and handler for Worx Landroid. - - Username to access the Landroid WebAPI. true - password - Password to access the Landroid WebAPI. + Password to access the Landroid WebAPI. true - - - diff --git a/src/main/resources/ESH-INF/thing/mower.xml b/src/main/resources/OH-INF/thing/mower.xml similarity index 78% rename from src/main/resources/ESH-INF/thing/mower.xml rename to src/main/resources/OH-INF/thing/mower.xml index abaeec3..8007c9f 100644 --- a/src/main/resources/ESH-INF/thing/mower.xml +++ b/src/main/resources/OH-INF/thing/mower.xml @@ -7,18 +7,18 @@ - + Worx Landroid Mower - + - - + + - + @@ -69,13 +69,13 @@ - + - - - - - + + + + + @@ -90,7 +90,8 @@ - Interval for polling in seconds (after 10 minutes / 600 seconds of inactivity, the connection is closed) + Interval for polling in seconds (after 10 minutes / 600 seconds of inactivity, the connection is + closed) 300 true @@ -103,14 +104,14 @@ Common channels of your mower - - - - + + + + - + @@ -118,12 +119,12 @@ Configuration common channels of your mower - - - - - - + + + + + + @@ -185,14 +186,14 @@ Data common channels of your mower - - - - - - - - + + + + + + + + @@ -200,16 +201,16 @@ Data battery channels of your mower - - - + + + - + @@ -217,9 +218,9 @@ Data dmp channels of your mower - - - + + + @@ -233,7 +234,7 @@ - + @@ -244,8 +245,8 @@ Data rain channels of your mower - - + + @@ -253,8 +254,8 @@ Configuration schedule channels of your mower - - + + @@ -262,8 +263,8 @@ Configuration one time schedule channels of your mower - - + + @@ -272,11 +273,11 @@ Configuration schedule channels for each day - - - - - + + + + + @@ -284,168 +285,168 @@ Switch Info - + DateTime Info - + Number Info - + String Info - + DateTime Info - + Number Info - + Number Info - + String Info - + String Info - + Number Info - + Number Temperature - + Number Voltage - + Number Battery - + Number Info - + Switch Info - + Number Info - + Number Info - + Number Info - + Number Info - + Number Info - + Number Info - + String Info - + Number Info - + String Info - + @@ -466,14 +467,14 @@ Number Info - + Number Info - + @@ -492,35 +493,35 @@ Number Info - + Number Info - + Number Info - + Switch Info - + Number Info - + @@ -572,13 +573,13 @@ Switch Info - + Number Info - +