diff --git a/bundles/org.openhab.binding.vwweconnect/pom.xml b/bundles/org.openhab.binding.vwweconnect/pom.xml index 233234733ce6c..68b6e5ef36408 100644 --- a/bundles/org.openhab.binding.vwweconnect/pom.xml +++ b/bundles/org.openhab.binding.vwweconnect/pom.xml @@ -1,22 +1,23 @@ - + 4.0.0 org.openhab.addons.bundles org.openhab.addons.reactor.bundles - 2.5.7-SNAPSHOT + 2.5.9-SNAPSHOT org.openhab.binding.vwweconnect openHAB Add-ons :: Bundles :: VW We Connect Binding - + !org.apache.tapestry5.json.*,!org.codehaus.jettison.json.*,!org.json.*,!com.fasterxml.jackson.* - + org.jsoup @@ -30,7 +31,7 @@ 2.4.0 compile - + org.ow2.asm asm 5.0.4 @@ -49,6 +50,6 @@ compile - + diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/feature/feature.xml b/bundles/org.openhab.binding.vwweconnect/src/main/feature/feature.xml index c5a767f6fbd84..29860ba3cdfe1 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.vwweconnect/src/main/feature/feature.xml @@ -1,16 +1,16 @@ - 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 - openhab-transport-serial - mvn:org.jsoup/jsoup/1.8.3 - mvn:com.jayway.jsonpath/json-path/2.4.0 - mvn:org.ow2.asm/asm/5.0.4 - mvn:net.minidev/accessors-smart/1.2 - mvn:net.minidev/json-smart/2.3 - mvn:org.openhab.addons.bundles/org.openhab.binding.vwweconnect/${project.version} - + + openhab-runtime-base + openhab-transport-serial + mvn:org.jsoup/jsoup/1.8.3 + mvn:com.jayway.jsonpath/json-path/2.4.0 + mvn:org.ow2.asm/asm/5.0.4 + mvn:net.minidev/accessors-smart/1.2 + mvn:net.minidev/json-smart/2.3 + mvn:org.openhab.addons.bundles/org.openhab.binding.vwweconnect/${project.version} + diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/DeviceStatusListener.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/DeviceStatusListener.java index b45b1957e4e3a..43eb1b4258dd7 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/DeviceStatusListener.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/DeviceStatusListener.java @@ -48,5 +48,4 @@ public interface DeviceStatusListener { * The thing which is added. */ void onDeviceAdded(BaseVehicle thing); - } diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VWWeConnectHandlerFactory.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VWWeConnectHandlerFactory.java index 0deff1a81e9d1..6cd00a362c7f4 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VWWeConnectHandlerFactory.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VWWeConnectHandlerFactory.java @@ -88,5 +88,4 @@ public VWWeConnectHandlerFactory() { } return thingHandler; } - } diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VehicleConfiguration.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VehicleConfiguration.java index 27b71f60e9b1f..1653c3b44ba3c 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VehicleConfiguration.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/VehicleConfiguration.java @@ -25,5 +25,4 @@ @NonNullByDefault public class VehicleConfiguration { public @Nullable String vin; - } diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/action/VWWeConnectActions.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/action/VWWeConnectActions.java index 8cc7f8522817b..4fcc34b787834 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/action/VWWeConnectActions.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/action/VWWeConnectActions.java @@ -287,5 +287,4 @@ public static void honkBlinkCommand(@Nullable ThingActions actions, Boolean honk throw new IllegalArgumentException("Instance is not an VWWeConnectActionsService class."); } } - } diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/handler/VehicleHandler.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/handler/VehicleHandler.java index 544b0e5acc6f2..7c5ce96142942 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/handler/VehicleHandler.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/handler/VehicleHandler.java @@ -473,7 +473,6 @@ public ActionResultController(String vin, String requestStatusUrl, VWWeConnectSe this.vin = vin; this.requestStatusUrl = requestStatusUrl; this.session = session; - } @Override @@ -896,5 +895,4 @@ public void actionWindowHeat(Boolean start) { public Collection> getServices() { return Collections.singletonList(VWWeConnectActions.class); } - } diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/ActionNotification.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/ActionNotification.java index b6c6fc074d33a..2d2336a4de903 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/ActionNotification.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/ActionNotification.java @@ -119,7 +119,5 @@ public boolean equals(@Nullable Object other) { .append(actionType, rhs.actionType).append(errorTitle, rhs.errorTitle) .append(actionState, rhs.actionState).isEquals(); } - } - } diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/Status.java b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/Status.java index f81e34c08f905..06aae4932f867 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/Status.java +++ b/bundles/org.openhab.binding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/Status.java @@ -355,7 +355,6 @@ public boolean equals(@Nullable Object other) { .append(rightFront, rhs.rightFront).append(leftBack, rhs.leftBack).append(trunk, rhs.trunk) .isEquals(); } - } public class Doors { diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/binding/binding.xml b/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/binding/binding.xml index 844f6e9c13213..a1b9d4ddd24f7 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/binding/binding.xml @@ -1,9 +1,8 @@ - - + VW We Connect Binding This is the binding for VW We Connect Portal. Jan Gustafsson diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/bridge.xml b/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/bridge.xml index 34c16465eb1cf..dbb82c525be2a 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/bridge.xml +++ b/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/bridge.xml @@ -10,14 +10,14 @@ This bridge represents the gateway to the VW We Connect Portal. - + Volkswagen - + @@ -25,7 +25,7 @@ String Can be used to manually refresh status - + diff --git a/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/vehicle.xml b/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/vehicle.xml index 91880504f3efc..9e8f6222ead15 100644 --- a/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/vehicle.xml +++ b/bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/vehicle.xml @@ -6,22 +6,22 @@ - + A VW Vehicle. - - - - - - - - - + + + + + + + + + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + @@ -108,7 +108,7 @@ Trip end time - + @@ -133,8 +133,8 @@ - - + + @@ -165,9 +165,9 @@ - - - + + + Distance left with given quantity of fuel @@ -178,9 +178,9 @@ - - - + + + Distance left with given quantity of CNG @@ -191,28 +191,28 @@ - - - + + + Distance left with given battery level - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -229,20 +229,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -452,7 +452,7 @@ DateTime Data timestamp - + @@ -515,14 +515,14 @@ Switch set to 'ON' when the tank level is low - + Switch set to 'ON' when the battery level is low - + @@ -621,7 +621,7 @@ Current temperature. Temperature - +