diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml index 8d724d84397a5..493123000a2a9 100644 --- a/bom/openhab-addons/pom.xml +++ b/bom/openhab-addons/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/openhab-core-index/pom.xml b/bom/openhab-core-index/pom.xml index c81267ab13699..f06da0d87c7e9 100644 --- a/bom/openhab-core-index/pom.xml +++ b/bom/openhab-core-index/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 3a0284057a2c2..661b5a74bbbeb 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 @@ -37,11 +39,14 @@ - + - + - + header diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml index 8fa6ab68e91ef..22a16c5f2f2be 100644 --- a/bom/runtime-index/pom.xml +++ b/bom/runtime-index/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml index caa653f3a3557..93cc937a3d096 100644 --- a/bom/test-index/pom.xml +++ b/bom/test-index/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.adorne/pom.xml b/bundles/org.openhab.binding.adorne/pom.xml index a982af9669214..20a34ff78f904 100644 --- a/bundles/org.openhab.binding.adorne/pom.xml +++ b/bundles/org.openhab.binding.adorne/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.airquality/pom.xml b/bundles/org.openhab.binding.airquality/pom.xml index ceca7e43b8039..600b80d2c416a 100644 --- a/bundles/org.openhab.binding.airquality/pom.xml +++ b/bundles/org.openhab.binding.airquality/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/json/AirQualityJsonResponse.java b/bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/json/AirQualityJsonResponse.java index 0efa9816c6668..3d3754a095abf 100644 --- a/bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/json/AirQualityJsonResponse.java +++ b/bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/json/AirQualityJsonResponse.java @@ -45,5 +45,4 @@ public ResponseStatus getStatus() { public AirQualityJsonData getData() { return data; } - } diff --git a/bundles/org.openhab.binding.airquality/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.airquality/src/main/resources/ESH-INF/thing/thing-types.xml index 2594876f48433..e37e14388cc19 100644 --- a/bundles/org.openhab.binding.airquality/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.airquality/src/main/resources/ESH-INF/thing/thing-types.xml @@ -65,7 +65,7 @@ Air Quality Index - + @@ -203,7 +203,7 @@ - + Color diff --git a/bundles/org.openhab.binding.airvisualnode/pom.xml b/bundles/org.openhab.binding.airvisualnode/pom.xml index 1ed51efc7668f..829b4ac312253 100644 --- a/bundles/org.openhab.binding.airvisualnode/pom.xml +++ b/bundles/org.openhab.binding.airvisualnode/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.alarmdecoder/pom.xml b/bundles/org.openhab.binding.alarmdecoder/pom.xml index 405064c39baf2..fe1be9b5deac0 100644 --- a/bundles/org.openhab.binding.alarmdecoder/pom.xml +++ b/bundles/org.openhab.binding.alarmdecoder/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/IBridgeActions.java b/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/IBridgeActions.java index 802150e6b423f..849ca7c1185bb 100644 --- a/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/IBridgeActions.java +++ b/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/IBridgeActions.java @@ -26,5 +26,4 @@ public interface IBridgeActions { public void reboot(); - } diff --git a/bundles/org.openhab.binding.alarmdecoder/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.alarmdecoder/src/main/resources/ESH-INF/thing/thing-types.xml index 520217d5c797d..b281244cf6139 100644 --- a/bundles/org.openhab.binding.alarmdecoder/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.alarmdecoder/src/main/resources/ESH-INF/thing/thing-types.xml @@ -143,16 +143,16 @@ - - + + Alarm Decoder virtual zone - - + + @@ -326,7 +326,7 @@ Switch Switch - + diff --git a/bundles/org.openhab.binding.allplay/pom.xml b/bundles/org.openhab.binding.allplay/pom.xml index 1a8ce4d4b3cb8..b300e995d3d23 100644 --- a/bundles/org.openhab.binding.allplay/pom.xml +++ b/bundles/org.openhab.binding.allplay/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.amazondashbutton/pom.xml b/bundles/org.openhab.binding.amazondashbutton/pom.xml index bc10d4350773e..48a2e685ad2f9 100644 --- a/bundles/org.openhab.binding.amazondashbutton/pom.xml +++ b/bundles/org.openhab.binding.amazondashbutton/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.amazonechocontrol/pom.xml b/bundles/org.openhab.binding.amazonechocontrol/pom.xml index 055df2f4ec889..e774610a5e59b 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/pom.xml +++ b/bundles/org.openhab.binding.amazonechocontrol/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java index a71307b3eea72..40bdd2131c850 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java @@ -1611,7 +1611,7 @@ private void queuedExecuteSequenceNode(Device device, boolean single) { Map headers = new HashMap<>(); headers.put("Routines-Version", "1.1.218665"); - + String text = executionNodeObject.text; if (text != null && !text.isEmpty()) { text = text.replaceAll("<.+?>", " ").replaceAll("\\s+", " ").trim(); diff --git a/bundles/org.openhab.binding.ambientweather/pom.xml b/bundles/org.openhab.binding.ambientweather/pom.xml index 46ae79a5d98ab..4a0911006eb99 100644 --- a/bundles/org.openhab.binding.ambientweather/pom.xml +++ b/bundles/org.openhab.binding.ambientweather/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.astro/pom.xml b/bundles/org.openhab.binding.astro/pom.xml index 71c0820197f6b..1159f2ec34a38 100644 --- a/bundles/org.openhab.binding.astro/pom.xml +++ b/bundles/org.openhab.binding.astro/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/action/AstroActions.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/action/AstroActions.java index d93ce12d5fcfa..f0c4481dfb4da 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/action/AstroActions.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/action/AstroActions.java @@ -159,5 +159,4 @@ private static IAstroActions invokeMethodOf(@Nullable ThingActions actions) { } throw new IllegalArgumentException("Actions is not an instance of AstroActions"); } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/config/AstroThingConfig.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/config/AstroThingConfig.java index 146d93655bd62..1d4908bdbb0bb 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/config/AstroThingConfig.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/config/AstroThingConfig.java @@ -53,5 +53,4 @@ public void parseGeoLocation() { } return null; } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java index 2f8896f0f0774..cd39ccabf93bf 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java @@ -367,5 +367,4 @@ public void publishDailyInfo() { public Collection> getServices() { return Collections.singletonList(AstroActions.class); } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/MoonHandler.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/MoonHandler.java index a4347e62dfdf4..55134e969793f 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/MoonHandler.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/MoonHandler.java @@ -107,5 +107,4 @@ private Moon getMoonAt(ZonedDateTime date) { longitude != null ? longitude : 0, localMoon); return localMoon.getPosition(); } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/SunHandler.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/SunHandler.java index cd5598e50a46e..06a4e03676eb4 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/SunHandler.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/SunHandler.java @@ -119,5 +119,4 @@ private Sun getSunAt(ZonedDateTime date) { longitude != null ? longitude : 0, altitude != null ? altitude : 0, localSun); return localSun.getPosition(); } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonDistance.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonDistance.java index 771d975f55c78..4a619b2acc260 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonDistance.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonDistance.java @@ -59,5 +59,4 @@ public QuantityType getDistance() { public void setDistance(double kilometer) { this.distance = kilometer; } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonPhase.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonPhase.java index c81d5aed47175..777a40b13a255 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonPhase.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/MoonPhase.java @@ -164,5 +164,4 @@ public QuantityType getAgePercent() { public void setAgePercent(double agePercent) { this.agePercent = agePercent; } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Position.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Position.java index 2a2ef3f7d6c8b..8ab877c617fb2 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Position.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Position.java @@ -84,5 +84,4 @@ public double getShadeLength() { public void setShadeLength(double shadeLength) { this.shadeLength = shadeLength; } - } diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Sun.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Sun.java index bca3598001437..98a80dcfb86d8 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Sun.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/model/Sun.java @@ -291,5 +291,4 @@ public void setPhase(SunPhase phase) { public Map getAllRanges() { return ranges; } - } diff --git a/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/moon.xml b/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/moon.xml index 31b457a654263..07a404aa0f44e 100644 --- a/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/moon.xml +++ b/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/moon.xml @@ -17,8 +17,8 @@ The moonset event range - - + + The distance to the moon @@ -33,12 +33,12 @@ The position of the moon - + geolocation - + diff --git a/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/sun.xml b/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/sun.xml index cd04841acd588..c09a6ed4ec94f 100644 --- a/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/sun.xml +++ b/bundles/org.openhab.binding.astro/src/main/resources/ESH-INF/thing/sun.xml @@ -64,16 +64,16 @@ The position of the sun - - - - - + + + + + geolocation - + diff --git a/bundles/org.openhab.binding.astro/src/test/java/org/openhab/binding/astro/internal/calc/SunCalcTest.java b/bundles/org.openhab.binding.astro/src/test/java/org/openhab/binding/astro/internal/calc/SunCalcTest.java index 0fb2f16770281..3609f9554fc89 100644 --- a/bundles/org.openhab.binding.astro/src/test/java/org/openhab/binding/astro/internal/calc/SunCalcTest.java +++ b/bundles/org.openhab.binding.astro/src/test/java/org/openhab/binding/astro/internal/calc/SunCalcTest.java @@ -318,6 +318,5 @@ public void testAstroAndMeteoSeasons() { assertEquals(1, meteoSun.getSeason().getSpring().get(Calendar.DAY_OF_MONTH)); assertFalse(meteoSun.getSeason().getSpring().get(Calendar.DAY_OF_MONTH) == equiSun.getSeason().getSpring() .get(Calendar.DAY_OF_MONTH)); - } } diff --git a/bundles/org.openhab.binding.atlona/pom.xml b/bundles/org.openhab.binding.atlona/pom.xml index 8ad2a8f806ad1..e717d00941675 100644 --- a/bundles/org.openhab.binding.atlona/pom.xml +++ b/bundles/org.openhab.binding.atlona/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.autelis/pom.xml b/bundles/org.openhab.binding.autelis/pom.xml index 63bbf6b7640f0..9cbc876f62565 100644 --- a/bundles/org.openhab.binding.autelis/pom.xml +++ b/bundles/org.openhab.binding.autelis/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.avmfritz/pom.xml b/bundles/org.openhab.binding.avmfritz/pom.xml index b91a53c292ce0..93e935b375c32 100644 --- a/bundles/org.openhab.binding.avmfritz/pom.xml +++ b/bundles/org.openhab.binding.avmfritz/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/channel-types.xml index a9b6f56779d6a..e2ec3e14124f9 100644 --- a/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/channel-types.xml +++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/channel-types.xml @@ -40,7 +40,7 @@ String Apply template for device(s). - + @@ -62,7 +62,7 @@ Device is locked for switching over external sources. Contact - + @@ -70,7 +70,7 @@ Device is locked for switching by pressing the button on the device. Contact - + @@ -79,9 +79,9 @@ Current measured temperature. Temperature - + - + @@ -89,7 +89,7 @@ Accumulated energy consumption. Energy - + @@ -97,7 +97,7 @@ Current power consumption. Energy - + @@ -105,7 +105,7 @@ Current voltage. Energy - + @@ -120,7 +120,7 @@ Current measured temperature. Temperature - + @@ -128,7 +128,7 @@ Thermostat Setpoint temperature. Temperature - + @@ -136,7 +136,7 @@ Thermostat Eco temperature. Temperature - + @@ -144,7 +144,7 @@ Thermostat Comfort temperature. Temperature - + @@ -168,7 +168,7 @@ Next change of Setpoint Temperature. Time - + @@ -176,7 +176,7 @@ Next Setpoint Temperature. Temperature - + @@ -184,7 +184,7 @@ Contact state information (OPEN/CLOSED). Contact - + @@ -192,6 +192,6 @@ States the last time the button was pressed. Time - + diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/thing-types.xml index 092593991d2d9..58c640c501b2a 100644 --- a/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/ESH-INF/thing/thing-types.xml @@ -7,8 +7,8 @@ - - + + @@ -19,155 +19,155 @@ Triggered SHORT_PRESSED or LONG_PRESSED when a button was pressed. - - - + + + ain - + - - + + Comet DECT heating thermostat. - - - - - - - - - - - - + + + + + + + + + + + + ain - + - - + + FRITZ!DECT 301 heating thermostat. - - - - - - - - - - - - + + + + + + + + + + + + ain - + - - + + FRITZ!DECT 300 heating thermostat. - - - - - - - - - - - - + + + + + + + + + + + + ain - + - - + + FRITZ!DECT210 switchable outlet. - - - - - - - + + + + + + + ain - + - - + + FRITZ!DECT200 switchable outlet. - - - - - - - + + + + + + + ain - + - - + + @@ -175,59 +175,59 @@ - - - - - - + + + + + + ain - + - - + + FRITZ!DECT Repeater 100 DECT repeater. - + ain - + - - + + HAN-FUN contact (e.g. SmartHome Tür-/Fensterkontakt or SmartHome Bewegungsmelder). - + ain - + - - + + @@ -238,63 +238,63 @@ Triggered when a button was pressed. - + ain - + - - + + Group for heating thermostats. - - - - - - - - - - - + + + + + + + + + + + ain - + - - + + Group for switchable outlets and power meters. - - - - - - + + + + + + ain - + diff --git a/bundles/org.openhab.binding.bigassfan/pom.xml b/bundles/org.openhab.binding.bigassfan/pom.xml index a62d5f286aa0f..0d93e2ca387a7 100644 --- a/bundles/org.openhab.binding.bigassfan/pom.xml +++ b/bundles/org.openhab.binding.bigassfan/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth.airthings/pom.xml b/bundles/org.openhab.binding.bluetooth.airthings/pom.xml index 1cf35b6b5f39d..10a24439d9bd1 100644 --- a/bundles/org.openhab.binding.bluetooth.airthings/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.airthings/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth.am43/pom.xml b/bundles/org.openhab.binding.bluetooth.am43/pom.xml index ca2b4a2cabffa..db98339534ab6 100644 --- a/bundles/org.openhab.binding.bluetooth.am43/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.am43/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth.bluegiga/pom.xml b/bundles/org.openhab.binding.bluetooth.bluegiga/pom.xml index f80b825f8323a..c91b2fe0a9458 100644 --- a/bundles/org.openhab.binding.bluetooth.bluegiga/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.bluegiga/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth.bluez/pom.xml b/bundles/org.openhab.binding.bluetooth.bluez/pom.xml index 7d902dbcac91b..0a03cb5934e01 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.bluez/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth.blukii/pom.xml b/bundles/org.openhab.binding.bluetooth.blukii/pom.xml index 6280af2e962d6..1285a7e7880e7 100644 --- a/bundles/org.openhab.binding.bluetooth.blukii/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.blukii/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/pom.xml b/bundles/org.openhab.binding.bluetooth.daikinmadoka/pom.xml index 39bce50cff587..e96fabe9c1d15 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/pom.xml @@ -1,24 +1,26 @@ - + + - 4.0.0 + 4.0.0 - - org.openhab.addons.bundles - org.openhab.addons.reactor.bundles - 2.5.9-SNAPSHOT - + + org.openhab.addons.bundles + org.openhab.addons.reactor.bundles + 2.5.9-SNAPSHOT + - org.openhab.binding.bluetooth.daikinmadoka + org.openhab.binding.bluetooth.daikinmadoka - openHAB Add-ons :: Bundles :: DaikinMadoka Bluetooth Adapter + openHAB Add-ons :: Bundles :: DaikinMadoka Bluetooth Adapter - - - org.openhab.addons.bundles - org.openhab.binding.bluetooth - ${project.version} - provided - - + + + org.openhab.addons.bundles + org.openhab.binding.bluetooth + ${project.version} + provided + + diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/feature/feature.xml b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/feature/feature.xml index 22a237ae7b6e8..161e30c7c19d9 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/feature/feature.xml @@ -1,10 +1,10 @@ - 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.bluetooth/${project.version} - mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.daikinmadoka/${project.version} - + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth/${project.version} + mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.daikinmadoka/${project.version} + diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/DaikinMadokaBindingConstants.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/DaikinMadokaBindingConstants.java index b193033376295..72abab538edda 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/DaikinMadokaBindingConstants.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/DaikinMadokaBindingConstants.java @@ -51,5 +51,4 @@ private DaikinMadokaBindingConstants() { public static final UUID SERVICE_UART_UUID = UUID.fromString("2141E110-213A-11E6-B67B-9E71128CAE77"); public static final UUID CHAR_WRITE_WITHOUT_RESPONSE_UUID = UUID.fromString("2141E112-213A-11E6-B67B-9E71128CAE77"); public static final UUID CHAR_NOTIF_UUID = UUID.fromString("2141E111-213A-11E6-B67B-9E71128CAE77"); - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java index ab6ca9ad1d30a..6587aec08c9c0 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java @@ -288,7 +288,6 @@ public void handleCommand(ChannelUID channelUID, Command command) { default: break; } - } @Override @@ -768,5 +767,4 @@ private void updateStateIfLinked(String channelId, State state) { updateState(channelUID, state); } } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/BRC1HUartProcessor.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/BRC1HUartProcessor.java index 728a4093ec6ca..ac6fce624e8ec 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/BRC1HUartProcessor.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/BRC1HUartProcessor.java @@ -99,5 +99,4 @@ public void chunkReceived(byte[] byteValue) { public void abandon() { this.uartMessages.clear(); } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaConfiguration.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaConfiguration.java index d961f54eb0f9e..ecc34b7b04bb5 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaConfiguration.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaConfiguration.java @@ -22,5 +22,4 @@ public class DaikinMadokaConfiguration { public String address; public Integer refreshInterval; public Integer commandTimeout; - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaHandlerFactory.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaHandlerFactory.java index 2861163f2d9f3..11620581dec31 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaHandlerFactory.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/DaikinMadokaHandlerFactory.java @@ -62,5 +62,4 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) { return null; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaMessage.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaMessage.java index 437b2396ee629..af0ce8b9d0d5d 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaMessage.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaMessage.java @@ -150,5 +150,4 @@ public String toString() { sb.append("] }"); return sb.toString(); } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaParsingException.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaParsingException.java index a83f0150170e1..4eef7f6fbf7ce 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaParsingException.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaParsingException.java @@ -31,5 +31,4 @@ public MadokaParsingException(String message) { public MadokaParsingException(Throwable t) { super(t); } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaProperties.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaProperties.java index a5e91785dc0f9..eff5af5bae6d2 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaProperties.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaProperties.java @@ -77,5 +77,4 @@ public int value() { return v; } } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaSettings.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaSettings.java index f359a78eb0876..83b24c4ec02cc 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaSettings.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaSettings.java @@ -124,5 +124,4 @@ public void setCommunicationControllerVersion(String communicationControllerVers public void setRemoteControllerVersion(String remoteControllerVersion) { this.remoteControllerVersion = remoteControllerVersion; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/BRC1HCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/BRC1HCommand.java index db3f8dbb78fe2..5f19e96b3aabe 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/BRC1HCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/BRC1HCommand.java @@ -110,5 +110,4 @@ private boolean isInAnyState(State[] acceptedStates) { } return false; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetFanspeedCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetFanspeedCommand.java index 2eb12b00cdb63..524ac95a6693d 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetFanspeedCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetFanspeedCommand.java @@ -61,7 +61,6 @@ public void handleResponse(Executor executor, ResponseListener listener, MadokaM setState(State.SUCCEEDED); executor.execute(() -> listener.receivedResponse(this)); - } @Override @@ -76,5 +75,4 @@ public int getCommandId() { public @Nullable FanSpeed getHeatingFanSpeed() { return heatingFanSpeed; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java index f52d21bb684e2..0a18a070069a1 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java @@ -90,5 +90,4 @@ public void handleResponse(Executor executor, ResponseListener listener, MadokaM public int getCommandId() { return 272; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationmodeCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationmodeCommand.java index b1e4bf404abbc..60130a9bcee15 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationmodeCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationmodeCommand.java @@ -65,5 +65,4 @@ public int getCommandId() { public @Nullable OperationMode getOperationMode() { return operationMode; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetPowerstateCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetPowerstateCommand.java index 7ab26a50a1c49..aa722d7e12a16 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetPowerstateCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetPowerstateCommand.java @@ -65,5 +65,4 @@ public int getCommandId() { public @Nullable Boolean isPowerState() { return powerState; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java index 030d92e09e77f..af6039525e055 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java @@ -74,5 +74,4 @@ public int getCommandId() { public @Nullable DecimalType getCoolingSetpoint() { return coolingSetpoint; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetVersionCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetVersionCommand.java index 58299fe57fab5..601541d31da8f 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetVersionCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetVersionCommand.java @@ -75,5 +75,4 @@ public int getCommandId() { public @Nullable String getCommunicationControllerVersion() { return communicationControllerVersion; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/ResponseListener.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/ResponseListener.java index 0e6e592b0da9d..dc3d906a96ef6 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/ResponseListener.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/ResponseListener.java @@ -44,5 +44,4 @@ public interface ResponseListener { public void receivedResponse(SetOperationmodeCommand command); public void receivedResponse(SetFanspeedCommand command); - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetFanspeedCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetFanspeedCommand.java index 994f335039a3e..c948085de2451 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetFanspeedCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetFanspeedCommand.java @@ -72,5 +72,4 @@ public FanSpeed getCoolingFanSpeed() { public FanSpeed getHeatingFanSpeed() { return heatingFanSpeed; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetOperationmodeCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetOperationmodeCommand.java index dfc4b578afa01..30ce6a826fbd2 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetOperationmodeCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetOperationmodeCommand.java @@ -64,5 +64,4 @@ public int getCommandId() { public OperationMode getOperationMode() { return operationMode; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetPowerstateCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetPowerstateCommand.java index ba78d7da85bed..3a603a7f2405d 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetPowerstateCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetPowerstateCommand.java @@ -66,5 +66,4 @@ public int getCommandId() { public OnOffType getPowerState() { return powerState; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetSetpointCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetSetpointCommand.java index f27c3d48ed1fd..b38c7d430e6f0 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetSetpointCommand.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/SetSetpointCommand.java @@ -79,5 +79,4 @@ public DecimalType getCoolingSetpoint() { public DecimalType getHeatingSetpoint() { return heatingSetpoint; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/ESH-INF/thing/daikinmadoka.xml b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/ESH-INF/thing/daikinmadoka.xml index 6cd7e2564530d..91ac13e6900c7 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/ESH-INF/thing/daikinmadoka.xml +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/ESH-INF/thing/daikinmadoka.xml @@ -6,25 +6,25 @@ - + A Daikin Madoka BRC1H Thermostat (BLE) - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java index 6b102876510f0..83547fd004e22 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java @@ -142,5 +142,4 @@ public void setLocation(@Nullable String location) { public boolean isEnabled() { return false; } - } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/internal/MadokaMessageTest.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/internal/MadokaMessageTest.java index 9309807fda697..af44f45d130ec 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/internal/MadokaMessageTest.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/internal/MadokaMessageTest.java @@ -42,5 +42,4 @@ public void testMessageBuildSetPower() { assertArrayEquals( new byte[] { 0x00, 0x07, 0x00, 0x40, 0x20, 0x20, 0x01, (byte) (powered == true ? 0x01 : 0x00) }, resp); } - } diff --git a/bundles/org.openhab.binding.bluetooth.ruuvitag/pom.xml b/bundles/org.openhab.binding.bluetooth.ruuvitag/pom.xml index feea758f53ee9..d00587ce76b02 100644 --- a/bundles/org.openhab.binding.bluetooth.ruuvitag/pom.xml +++ b/bundles/org.openhab.binding.bluetooth.ruuvitag/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bluetooth/pom.xml b/bundles/org.openhab.binding.bluetooth/pom.xml index bf6ff47d6d91f..f7f58d3f2a5b1 100644 --- a/bundles/org.openhab.binding.bluetooth/pom.xml +++ b/bundles/org.openhab.binding.bluetooth/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.boschindego/pom.xml b/bundles/org.openhab.binding.boschindego/pom.xml index 76f3ba1264547..6b269ad787826 100644 --- a/bundles/org.openhab.binding.boschindego/pom.xml +++ b/bundles/org.openhab.binding.boschindego/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bosesoundtouch/pom.xml b/bundles/org.openhab.binding.bosesoundtouch/pom.xml index d7f8a4b44c3c7..61aa89696ffef 100644 --- a/bundles/org.openhab.binding.bosesoundtouch/pom.xml +++ b/bundles/org.openhab.binding.bosesoundtouch/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bsblan/pom.xml b/bundles/org.openhab.binding.bsblan/pom.xml index f260f3e894bdf..752bf2095af8a 100644 --- a/bundles/org.openhab.binding.bsblan/pom.xml +++ b/bundles/org.openhab.binding.bsblan/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bticinosmarther/pom.xml b/bundles/org.openhab.binding.bticinosmarther/pom.xml index 1c3a87dfaab40..28a8ecbd2a1a2 100644 --- a/bundles/org.openhab.binding.bticinosmarther/pom.xml +++ b/bundles/org.openhab.binding.bticinosmarther/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/feature/feature.xml b/bundles/org.openhab.binding.bticinosmarther/src/main/feature/feature.xml index d0dd56d6f9c76..fd2bf4ad6c7c8 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/feature/feature.xml @@ -1,9 +1,9 @@ - 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.bticinosmarther/${project.version} - + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.bticinosmarther/${project.version} + diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/SmartherBindingConstants.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/SmartherBindingConstants.java index 2fa2e2cbdd579..057374e780128 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/SmartherBindingConstants.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/SmartherBindingConstants.java @@ -110,5 +110,4 @@ public class SmartherBindingConstants { // List of all adressable things public static final Set SUPPORTED_THING_TYPES_UIDS = Collections .unmodifiableSet(Stream.of(THING_TYPE_BRIDGE, THING_TYPE_MODULE).collect(Collectors.toSet())); - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountHandler.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountHandler.java index 610f18be2891d..1ec6e89555aa2 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountHandler.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountHandler.java @@ -220,5 +220,4 @@ public interface SmartherAccountHandler extends ThingHandler { * @return a string containing the formatted url, or the empty string ("") in case of issue */ String formatAuthorizationUrl(String redirectUri); - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java index d5fb334fc4889..82784e5e16986 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java @@ -288,5 +288,4 @@ protected void setHttpService(HttpService httpService) { protected void unsetHttpService(HttpService httpService) { this.httpService = null; } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAuthorizationServlet.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAuthorizationServlet.java index 5943c2ef230d3..35b165f045c35 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAuthorizationServlet.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAuthorizationServlet.java @@ -268,5 +268,4 @@ private String replaceKeysFromMap(String template, Map map) { m.appendTail(sb); return sb.toString(); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationHandler.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationHandler.java index b019027a79cb1..e0eb9b3e9f984 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationHandler.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationHandler.java @@ -62,5 +62,4 @@ public interface SmartherNotificationHandler extends ThingHandler { * in case of communication issues with the Smarther API */ void unregisterNotification(String plantId) throws SmartherGatewayException; - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationServlet.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationServlet.java index b36916dc3f1b0..704a8f2b92366 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationServlet.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherNotificationServlet.java @@ -128,5 +128,4 @@ private void handleSmartherNotification(Notification notification) { logger.warn("C2C notification {}: not applied: {}", notification.getId(), e.getMessage()); } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java index 44a49755fb2e3..b6aae953f1945 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java @@ -41,6 +41,7 @@ import org.eclipse.smarthome.core.library.types.QuantityType; import org.eclipse.smarthome.core.library.unit.SIUnits; import org.openhab.binding.bticinosmarther.internal.api.dto.Chronothermostat; +import org.openhab.binding.bticinosmarther.internal.api.dto.Enums.MeasureUnit; import org.openhab.binding.bticinosmarther.internal.api.dto.Module; import org.openhab.binding.bticinosmarther.internal.api.dto.ModuleStatus; import org.openhab.binding.bticinosmarther.internal.api.dto.Plant; @@ -48,7 +49,6 @@ import org.openhab.binding.bticinosmarther.internal.api.dto.Program; import org.openhab.binding.bticinosmarther.internal.api.dto.Subscription; import org.openhab.binding.bticinosmarther.internal.api.dto.Topology; -import org.openhab.binding.bticinosmarther.internal.api.dto.Enums.MeasureUnit; import org.openhab.binding.bticinosmarther.internal.api.exception.SmartherAuthorizationException; import org.openhab.binding.bticinosmarther.internal.api.exception.SmartherGatewayException; import org.openhab.binding.bticinosmarther.internal.api.exception.SmartherTokenExpiredException; @@ -501,5 +501,4 @@ private ContentResponse requestWithRetry(final Function cal } } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApiConnector.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApiConnector.java index a8f33a4e7e91c..11aa8d604d969 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApiConnector.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApiConnector.java @@ -332,5 +332,4 @@ private String processErrorState(ContentResponse response) } } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Chronothermostat.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Chronothermostat.java index 1667ed681ec29..eb1c916ecd95d 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Chronothermostat.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Chronothermostat.java @@ -230,5 +230,4 @@ public String toString() { function, mode, setPointTemperature, programs, temperatureFormat, loadState, time, activationTime, thermometer, hygrometer, online, sender); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Enums.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Enums.java index 14360ce3133aa..f472eb06b9119 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Enums.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Enums.java @@ -264,5 +264,4 @@ public static & TypeWithStringProperty> E lookup(Class en, } throw new SmartherIllegalPropertyValueException(en.getSimpleName(), value); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Location.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Location.java index 15474483f8e3f..cd1ee531e300f 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Location.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Location.java @@ -181,5 +181,4 @@ public String toString() { return String.format("plantId=%s, name=%s, subscriptionId=%s, endpointUrl=%s", plantId, name, subscriptionId, endpointUrl); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java index 0d72c76861d3e..ffcd8159f01b0 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java @@ -92,20 +92,20 @@ public State toState() throws SmartherIllegalPropertyValueException { switch (MeasureUnit.fromValue(unit)) { case CELSIUS: - state = optValue.map(t -> new QuantityType(new DecimalType(t), SIUnits.CELSIUS)) + state = optValue. map(t -> new QuantityType(new DecimalType(t), SIUnits.CELSIUS)) .orElse(UnDefType.UNDEF); break; case FAHRENHEIT: state = optValue - .map(t -> new QuantityType(new DecimalType(t), ImperialUnits.FAHRENHEIT)) + . map(t -> new QuantityType(new DecimalType(t), ImperialUnits.FAHRENHEIT)) .orElse(UnDefType.UNDEF); break; case PERCENTAGE: - state = optValue.map(t -> new QuantityType(new DecimalType(t), Units.PERCENT)) + state = optValue. map(t -> new QuantityType(new DecimalType(t), Units.PERCENT)) .orElse(UnDefType.UNDEF); break; case DIMENSIONLESS: - state = optValue.map(t -> new DecimalType(t)).orElse(UnDefType.UNDEF); + state = optValue. map(t -> new DecimalType(t)).orElse(UnDefType.UNDEF); } return state; @@ -116,5 +116,4 @@ public String toString() { return (StringUtil.isBlank(timestamp)) ? String.format("value=%s, unit=%s", value, unit) : String.format("value=%s, unit=%s, timestamp=%s", value, unit, timestamp); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Module.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Module.java index b08b3d397945e..8b7fa82675121 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Module.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Module.java @@ -59,5 +59,4 @@ public String getName() { public String toString() { return String.format("id=%s, name=%s, type=%s", id, name, deviceType); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleRef.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleRef.java index d4bcd8e32c1ce..c8e30f0eb1f45 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleRef.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleRef.java @@ -34,5 +34,4 @@ public String getId() { public String toString() { return String.format("id=%s", id); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleStatus.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleStatus.java index 7fd80c8a2fa74..74c61c7626e99 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleStatus.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/ModuleStatus.java @@ -47,5 +47,4 @@ public List getChronothermostats() { public String toString() { return String.format("chronothermostats=[%s]", chronothermostats); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Modules.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Modules.java index cb83f8f056dc1..1670866bb0c55 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Modules.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Modules.java @@ -52,5 +52,4 @@ public class Modules { } return modules.stream().map(a -> String.valueOf(a.getName())).collect(Collectors.joining(NAME_SEPARATOR)); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Notification.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Notification.java index c5257eae18910..892a5362dee75 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Notification.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Notification.java @@ -108,5 +108,4 @@ public String toString() { return String.format("id=%s, eventType=%s, subject=%s, eventTime=%s, data=[%s]", id, eventType, subject, eventTime, data); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plant.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plant.java index cbdf90a699dcf..1e528d49f8b4d 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plant.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plant.java @@ -58,5 +58,4 @@ public String getName() { public String toString() { return String.format("id=%s, name=%s", id, name); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/PlantRef.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/PlantRef.java index d8537fe3f9d9a..333d377fb62dc 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/PlantRef.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/PlantRef.java @@ -44,5 +44,4 @@ public ModuleRef getModule() { public String toString() { return String.format("id=%s, module=[%s]", id, module); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plants.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plants.java index 340477f2c7300..bba82510faf63 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plants.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Plants.java @@ -31,5 +31,4 @@ public class Plants { public List getPlants() { return plants; } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Program.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Program.java index 9607a9d885cdc..9691b0d3badc0 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Program.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Program.java @@ -46,5 +46,4 @@ public String getName() { public String toString() { return String.format("number=%d, name=%s", number, name); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sender.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sender.java index 7a61dad182837..b675aec818c29 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sender.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sender.java @@ -57,5 +57,4 @@ public PlantRef getPlant() { public String toString() { return String.format("addressType=%s, system=%s, plant=[%s]", addressType, system, plant); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sensor.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sensor.java index 0b6f00b77cb8e..0a36ad66f8ece 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sensor.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Sensor.java @@ -66,5 +66,4 @@ public State toState() throws SmartherIllegalPropertyValueException { public String toString() { return String.format("measures=%s", measures); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Subscription.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Subscription.java index be2e1d99972c4..d33f2062efd63 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Subscription.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Subscription.java @@ -59,5 +59,4 @@ public String getEndpointUrl() { public String toString() { return String.format("plantId=%s, id=%s, endpoint=%s", plantId, subscriptionId, endpointUrl); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Topology.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Topology.java index 6c83e2a3782fc..00ebf3de6125a 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Topology.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Topology.java @@ -44,5 +44,4 @@ public class Topology { public List getModules() { return (plant != null) ? plant.getModules() : new ArrayList<>(); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherAuthorizationException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherAuthorizationException.java index 8af8deb07225f..f24e0f4ef05e0 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherAuthorizationException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherAuthorizationException.java @@ -45,5 +45,4 @@ public SmartherAuthorizationException(String message) { public SmartherAuthorizationException(String message, Throwable cause) { super(message, cause); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherGatewayException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherGatewayException.java index b121f27d2372d..ca7233f3c5fd4 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherGatewayException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherGatewayException.java @@ -60,5 +60,4 @@ public SmartherGatewayException(String message, Throwable cause) { public SmartherGatewayException(Throwable cause) { super(cause); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherIllegalPropertyValueException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherIllegalPropertyValueException.java index 98a1945297fdc..03ef6d2f81310 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherIllegalPropertyValueException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherIllegalPropertyValueException.java @@ -49,5 +49,4 @@ public SmartherIllegalPropertyValueException(String message) { public SmartherIllegalPropertyValueException(String propertyName, String invalidValue) { super(String.format(MSG_FORMAT, propertyName, invalidValue)); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherInvalidResponseException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherInvalidResponseException.java index b4fc113d9925d..857a78de62856 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherInvalidResponseException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherInvalidResponseException.java @@ -33,5 +33,4 @@ public class SmartherInvalidResponseException extends SmartherGatewayException { public SmartherInvalidResponseException(String message) { super(message); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherNotificationException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherNotificationException.java index b697b93b70361..ea1029d656634 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherNotificationException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherNotificationException.java @@ -45,5 +45,4 @@ public SmartherNotificationException(String message) { public SmartherNotificationException(String message, Throwable exception) { super(message, exception); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherSubscriptionAlreadyExistsException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherSubscriptionAlreadyExistsException.java index d8e516d1fbfc3..76c64bc231576 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherSubscriptionAlreadyExistsException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherSubscriptionAlreadyExistsException.java @@ -33,5 +33,4 @@ public class SmartherSubscriptionAlreadyExistsException extends SmartherNotifica public SmartherSubscriptionAlreadyExistsException(String message) { super(message); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherTokenExpiredException.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherTokenExpiredException.java index 3c706936e2714..b6eadedabcff3 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherTokenExpiredException.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/exception/SmartherTokenExpiredException.java @@ -33,5 +33,4 @@ public class SmartherTokenExpiredException extends SmartherAuthorizationExceptio public SmartherTokenExpiredException(String message) { super(message); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherBridgeConfiguration.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherBridgeConfiguration.java index 14214002920e4..6013e1bf2eaaa 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherBridgeConfiguration.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherBridgeConfiguration.java @@ -197,5 +197,4 @@ public List getNotifications() { public void setNotifications(List notifications) { this.notifications = notifications; } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherModuleConfiguration.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherModuleConfiguration.java index 6429487a9eb73..a24ff42e438ca 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherModuleConfiguration.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/config/SmartherModuleConfiguration.java @@ -142,5 +142,4 @@ public int getStatusRefreshPeriod() { public void setStatusRefreshPeriod(int statusRefreshPeriod) { this.statusRefreshPeriod = statusRefreshPeriod; } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/discovery/SmartherModuleDiscoveryService.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/discovery/SmartherModuleDiscoveryService.java index 845c2390ade10..c4ad713eb50aa 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/discovery/SmartherModuleDiscoveryService.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/discovery/SmartherModuleDiscoveryService.java @@ -172,5 +172,4 @@ private String getThingIdFromModule(Module module) { final String moduleId = module.getId(); return moduleId.substring(0, moduleId.indexOf(ID_SEPARATOR)); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/factory/SmartherHandlerFactory.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/factory/SmartherHandlerFactory.java index 34ceaa910d888..495249f1ceb54 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/factory/SmartherHandlerFactory.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/factory/SmartherHandlerFactory.java @@ -90,5 +90,4 @@ protected synchronized void removeHandler(ThingHandler thingHandler) { authService.removeSmartherAccountHandler((SmartherBridgeHandler) thingHandler); } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherBridgeHandler.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherBridgeHandler.java index ff949d4d4b8d5..9deae1e90a4d4 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherBridgeHandler.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherBridgeHandler.java @@ -762,5 +762,4 @@ private boolean isValidNotificationUrl(@Nullable String str) { return false; } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherDynamicStateDescriptionProvider.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherDynamicStateDescriptionProvider.java index c673c7bc11c6a..d4a0608bb9a54 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherDynamicStateDescriptionProvider.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherDynamicStateDescriptionProvider.java @@ -70,5 +70,4 @@ public void setPrograms(ChannelUID channelUID, @Nullable List programs) .collect(Collectors.toList())); } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java index 465097faffb86..7fc2728c2abd7 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java @@ -731,5 +731,4 @@ private void updateModuleStatus() throws SmartherIllegalPropertyValueException { updateChannelState(CHANNEL_SETTINGS_POWER, OnOffType.OFF); } } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/BridgeStatus.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/BridgeStatus.java index e98fa1358fd9a..30cb934356f44 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/BridgeStatus.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/BridgeStatus.java @@ -124,5 +124,4 @@ public String toString() { return String.format("apiCallsHandled=%s, notifsReceived=%s, notifsRejected=%s", apiCallsHandled, notificationsReceived, notificationsRejected); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/ModuleSettings.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/ModuleSettings.java index 10ece5249ee09..03bb8c926b408 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/ModuleSettings.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/model/ModuleSettings.java @@ -311,5 +311,4 @@ public String toString() { "plantId=%s, moduleId=%s, mode=%s, setPointTemperature=%s, program=%s, boostTime=%s, endDate=%s, endHour=%s, endMinute=%s", plantId, moduleId, mode, setPointTemperature, program, boostTime, endDate, endHour, endMinute); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/DateUtil.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/DateUtil.java index db94a6656ff44..4993edc693b35 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/DateUtil.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/DateUtil.java @@ -177,5 +177,4 @@ public static String formatRange(ZonedDateTime date1, ZonedDateTime date2, Strin DateTimeFormatter dtf = DateTimeFormatter.ofPattern(pattern); return String.format(RANGE_FORMAT, date1.format(dtf), date2.format(dtf)); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/ModelUtil.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/ModelUtil.java index 221bbe5a481f0..54cf4a92804d0 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/ModelUtil.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/ModelUtil.java @@ -41,5 +41,4 @@ private ModelUtil() { public static Gson gsonInstance() { return GSON; } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/StringUtil.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/StringUtil.java index 2ca5e8308b13d..051aad3a8b5ba 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/StringUtil.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/util/StringUtil.java @@ -175,5 +175,4 @@ public static String readerToString(Reader reader) throws IOException { return writer.toString(); } - } diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/config/config.xml index 6072e93e6dbe2..a9d46e0162925 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/config/config.xml +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/config/config.xml @@ -26,31 +26,41 @@ - This is the Subscription Key provided by BTicino/Legrand when you subscribe to Smarther - v2.0 product. Go to -https://developer.legrand.com/tutorials/getting-started/ + This is the Subscription Key provided by BTicino/Legrand when you subscribe to Smarther - v2.0 product. + Go to + https://developer.legrand.com/tutorials/getting-started/ true - + - This is the Client ID provided by BTicino/Legrand when you add a new Application to your developer account. Go to -https://developer.legrand.com/tutorials/create-an-application/ + This is the Client ID provided by BTicino/Legrand when you add a new Application to your developer + account. Go to + https://developer.legrand.com/tutorials/create-an-application/ true - This is the Client Secret provided by BTicino/Legrand when you add a new Application to your developer account. + This is the Client Secret provided by BTicino/Legrand when you add a new Application to your developer + account. true password - ON = the bridge subscribes each of its locations to receive C2C notifications upon changes on each of its modules' status or sensors -data - temperature, humidity (requires a public https endpoint has been set as "First Reply Url" when registering the Application on Legrand's development -portal); OFF = for each module connected to this bridge, status+sensors data are requested to Smarther API gateway on a periodical basis and whenever new -settings are applied (period can be changed via module's "Status Refresh Period" parameter). + ON = the bridge subscribes each of its locations to receive C2C notifications upon changes on each of + its modules' status or sensors + data - temperature, humidity (requires a public https endpoint has been set as "First + Reply Url" when registering the + Application on Legrand's development + portal); OFF = for each module connected to this + bridge, status+sensors data are requested to Smarther API gateway on a + periodical basis and whenever new + settings are + applied (period can be changed via module's "Status Refresh Period" parameter). false true true @@ -58,9 +68,12 @@ settings are applied (period can be changed via module's "Status Refresh Period" - This is the frequency the Smarther API gateway is called to update bridge status. There are limits to the number of -requests that can be sent to the Smarther API gateway. The more often you poll, the faster locations are updated - at the risk of running out of your request -quota. + This is the frequency the Smarther API gateway is called to update bridge status. There are limits to + the number of + requests that can be sent to the Smarther API gateway. The more often you poll, the faster locations + are updated - at the + risk of running out of your request + quota. false true Minutes @@ -84,13 +97,16 @@ quota. - + - This is the Plant Id of the location the Chronothermostat module is installed in, provided by Smarther API. + This is the Plant Id of the location the Chronothermostat module is installed in, provided by Smarther + API. true - + This is the Module Id of the Chronothermostat module, provided by Smarther API. true @@ -98,8 +114,10 @@ quota. - ON = the module settings are automatically updated according to the module status whenever it changes (e.g. polling, notification, -etc.). OFF = the module settings are aligned to the module status only upon module initialization. + ON = the module settings are automatically updated according to the module status whenever it changes + (e.g. polling, notification, + etc.). OFF = the module settings are aligned to the module status only upon module + initialization. false true false @@ -107,9 +125,12 @@ etc.). OFF = the module settings are aligned to the module status only upon modu - This is the frequency the Smarther API gateway is called to refresh Programs list used in "automatic" mode. There are limits to the -number of requests that can be sent to the Smarther API gateway. The more often you poll, the faster locations are updated - at the risk of running out of your -request quota. + This is the frequency the Smarther API gateway is called to refresh Programs list used in "automatic" + mode. There are limits to the + number of requests that can be sent to the Smarther API gateway. The more often you + poll, the faster locations are updated + - at the risk of running out of your + request quota. false true Hours @@ -118,8 +139,9 @@ request quota. - This is the number of days to be displayed in module settings, as options list for "End Date" field in "manual" mode (e.g. 1 = only -"Today" is displayed, 5 = "Today" + "Tomorrow" + following 3 days are displayed). + This is the number of days to be displayed in module settings, as options list for "End Date" field in + "manual" mode (e.g. 1 = only + "Today" is displayed, 5 = "Today" + "Tomorrow" + following 3 days are displayed). false true 5 @@ -127,9 +149,12 @@ request quota. - This is the frequency the Smarther API gateway is called to update module status and sensors data. There are limits to the number of -requests that can be sent to the Smarther API gateway. The more often you poll, the faster locations are updated - at the risk of running out of your request -quota. + This is the frequency the Smarther API gateway is called to update module status and sensors data. There + are limits to the number of + requests that can be sent to the Smarther API gateway. The more often you poll, the + faster locations are updated - at the + risk of running out of your request + quota. false true Minutes diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/bridge-types.xml b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/bridge-types.xml index 3536e931e90e4..f45ad8f501651 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/bridge-types.xml +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/bridge-types.xml @@ -38,8 +38,8 @@ - - + + @@ -48,7 +48,7 @@ subscriptionKey - + @@ -56,9 +56,9 @@ Current operational status of the bridge - - - + + + @@ -66,7 +66,7 @@ Convenience configuration channels for the bridge - + @@ -75,27 +75,28 @@ Number Total number of API calls handled by the bridge - + Number Total number of C2C notifications received by the bridge - + Number Total number of C2C notifications rejected by the bridge - + Switch - This is a convenience switch to trigger a call to the Smarther API gateway, to manually fetch the updated client locations list. + This is a convenience switch to trigger a call to the Smarther API gateway, to manually fetch the updated + client locations list. diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/thing-types.xml index df06f8db3cad9..7fb478c480a77 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/ESH-INF/thing/thing-types.xml @@ -7,17 +7,17 @@ - + This thing represents a BTicino Smarther chronothermostat module. - - - - + + + + @@ -27,7 +27,7 @@ moduleId - + @@ -35,8 +35,8 @@ Measures taken from the module on-board sensors - - + + @@ -44,13 +44,13 @@ Current operational status of the module - - - - - - - + + + + + + + @@ -58,14 +58,14 @@ New operational settings to be applied to the module - - - - - - - - + + + + + + + + @@ -73,7 +73,7 @@ Convenience configuration channels for the module - + @@ -83,7 +83,7 @@ Indoor temperature as measured by the sensor Temperature - + @@ -91,28 +91,28 @@ Indoor humidity as measured by the sensor Humidity - + Switch Current operational state of the module - + String Current operational function set on the module - + String Current operational mode set on the module - + @@ -120,28 +120,28 @@ Current operational target temperature set on the module Temperature - + String Current operational program set on the module - + String Current operational end time set on the module - + String Current operational temperature format of the module - + @@ -164,7 +164,7 @@ New operational set-point temperature to be set on the module (valid only for Mode = "Manual") Temperature - + @@ -196,14 +196,14 @@ Number New operational end hour to be set on the module (valid only for Mode = "Manual") - + Number New operational end minute to be set on the module (valid only for Mode = "Manual") - + @@ -215,7 +215,8 @@ Switch - This is a convenience switch to trigger a call to the Smarther API gateway, to manually fetch the updated module programs list. + This is a convenience switch to trigger a call to the Smarther API gateway, to manually fetch the updated + module programs list. diff --git a/bundles/org.openhab.binding.buienradar/pom.xml b/bundles/org.openhab.binding.buienradar/pom.xml index f3ae95e4ec058..5837639fb89fb 100644 --- a/bundles/org.openhab.binding.buienradar/pom.xml +++ b/bundles/org.openhab.binding.buienradar/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.openhab.addons.bundles diff --git a/bundles/org.openhab.binding.caddx/pom.xml b/bundles/org.openhab.binding.caddx/pom.xml index 5d748df1f45a0..80e9885de7f47 100644 --- a/bundles/org.openhab.binding.caddx/pom.xml +++ b/bundles/org.openhab.binding.caddx/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.cbus/pom.xml b/bundles/org.openhab.binding.cbus/pom.xml index a30d8ea84d464..84a29996e11f2 100644 --- a/bundles/org.openhab.binding.cbus/pom.xml +++ b/bundles/org.openhab.binding.cbus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.chromecast/pom.xml b/bundles/org.openhab.binding.chromecast/pom.xml index 0b42a8770b1ed..a3c8395b16db7 100644 --- a/bundles/org.openhab.binding.chromecast/pom.xml +++ b/bundles/org.openhab.binding.chromecast/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.cm11a/pom.xml b/bundles/org.openhab.binding.cm11a/pom.xml index 2eb8f2d72a47e..42381d4ed81dc 100644 --- a/bundles/org.openhab.binding.cm11a/pom.xml +++ b/bundles/org.openhab.binding.cm11a/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.coolmasternet/pom.xml b/bundles/org.openhab.binding.coolmasternet/pom.xml index aaba622adcca6..3b5ceae0267f3 100644 --- a/bundles/org.openhab.binding.coolmasternet/pom.xml +++ b/bundles/org.openhab.binding.coolmasternet/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.coronastats/pom.xml b/bundles/org.openhab.binding.coronastats/pom.xml index ccf8a9acd12be..150d72967ee6d 100644 --- a/bundles/org.openhab.binding.coronastats/pom.xml +++ b/bundles/org.openhab.binding.coronastats/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.daikin/pom.xml b/bundles/org.openhab.binding.daikin/pom.xml index 249b8e0b1d3cf..8d40b2ca62c51 100644 --- a/bundles/org.openhab.binding.daikin/pom.xml +++ b/bundles/org.openhab.binding.daikin/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.danfossairunit/pom.xml b/bundles/org.openhab.binding.danfossairunit/pom.xml index 9ef627ae8b65e..89adbcf8e3b0e 100644 --- a/bundles/org.openhab.binding.danfossairunit/pom.xml +++ b/bundles/org.openhab.binding.danfossairunit/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.darksky/pom.xml b/bundles/org.openhab.binding.darksky/pom.xml index f99e0082972ef..9c1aab5b47930 100644 --- a/bundles/org.openhab.binding.darksky/pom.xml +++ b/bundles/org.openhab.binding.darksky/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.deconz/pom.xml b/bundles/org.openhab.binding.deconz/pom.xml index 8786004e636eb..9edbc5696d4fd 100644 --- a/bundles/org.openhab.binding.deconz/pom.xml +++ b/bundles/org.openhab.binding.deconz/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/Util.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/Util.java index 17dabb1bce1df..b83ec39f12be4 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/Util.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/Util.java @@ -62,8 +62,7 @@ public static int constrainToRange(int intValue, int min, int max) { */ public static DateTimeType convertTimestampToDateTime(String timestamp) { if (timestamp.endsWith("Z")) { - return new DateTimeType( - ZonedDateTime.parse(timestamp)); + return new DateTimeType(ZonedDateTime.parse(timestamp)); } else { return new DateTimeType( ZonedDateTime.ofInstant(LocalDateTime.parse(timestamp, DateTimeFormatter.ISO_LOCAL_DATE_TIME), diff --git a/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java b/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java index 27e0fbe1468b6..6100ef51577e4 100644 --- a/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java +++ b/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java @@ -18,11 +18,8 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; import java.time.ZoneId; -import java.time.ZoneOffset; import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; import org.apache.commons.io.IOUtils; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -104,6 +101,7 @@ public void dateTimeConversionTest() { Assert.assertEquals(new DateTimeType(ZonedDateTime.parse("2020-08-22T11:09:00Z")), dateTime); dateTime = Util.convertTimestampToDateTime("2020-08-22T11:09:47"); - Assert.assertEquals(new DateTimeType(ZonedDateTime.parse("2020-08-22T11:09:47Z")).toZone(ZoneId.systemDefault()), dateTime); + Assert.assertEquals( + new DateTimeType(ZonedDateTime.parse("2020-08-22T11:09:47Z")).toZone(ZoneId.systemDefault()), dateTime); } } diff --git a/bundles/org.openhab.binding.denonmarantz/pom.xml b/bundles/org.openhab.binding.denonmarantz/pom.xml index 0f49c28947fe9..658e2d21c1272 100644 --- a/bundles/org.openhab.binding.denonmarantz/pom.xml +++ b/bundles/org.openhab.binding.denonmarantz/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.digiplex/pom.xml b/bundles/org.openhab.binding.digiplex/pom.xml index f218228f12133..b3b344e9e75aa 100644 --- a/bundles/org.openhab.binding.digiplex/pom.xml +++ b/bundles/org.openhab.binding.digiplex/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.digitalstrom/pom.xml b/bundles/org.openhab.binding.digitalstrom/pom.xml index 4d0d19949e708..cdabc7c8d82be 100644 --- a/bundles/org.openhab.binding.digitalstrom/pom.xml +++ b/bundles/org.openhab.binding.digitalstrom/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.dlinksmarthome/pom.xml b/bundles/org.openhab.binding.dlinksmarthome/pom.xml index 64242befd662d..d203784ec2353 100644 --- a/bundles/org.openhab.binding.dlinksmarthome/pom.xml +++ b/bundles/org.openhab.binding.dlinksmarthome/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.dmx/pom.xml b/bundles/org.openhab.binding.dmx/pom.xml index a718b11fb0bb7..9854fd26485e9 100644 --- a/bundles/org.openhab.binding.dmx/pom.xml +++ b/bundles/org.openhab.binding.dmx/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.doorbird/pom.xml b/bundles/org.openhab.binding.doorbird/pom.xml index b8175ee3620fc..4dbf2b0ab0d08 100644 --- a/bundles/org.openhab.binding.doorbird/pom.xml +++ b/bundles/org.openhab.binding.doorbird/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.draytonwiser/pom.xml b/bundles/org.openhab.binding.draytonwiser/pom.xml index 7014ae482fc59..b89d069bc788e 100644 --- a/bundles/org.openhab.binding.draytonwiser/pom.xml +++ b/bundles/org.openhab.binding.draytonwiser/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.dscalarm/pom.xml b/bundles/org.openhab.binding.dscalarm/pom.xml index 032f132d9d341..d714985157184 100644 --- a/bundles/org.openhab.binding.dscalarm/pom.xml +++ b/bundles/org.openhab.binding.dscalarm/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.dsmr/pom.xml b/bundles/org.openhab.binding.dsmr/pom.xml index d644c8f42bb0f..3ac688b4b54c7 100644 --- a/bundles/org.openhab.binding.dsmr/pom.xml +++ b/bundles/org.openhab.binding.dsmr/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.dwdpollenflug/pom.xml b/bundles/org.openhab.binding.dwdpollenflug/pom.xml index 0ed0d25143b26..109c0c51b5397 100644 --- a/bundles/org.openhab.binding.dwdpollenflug/pom.xml +++ b/bundles/org.openhab.binding.dwdpollenflug/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.dwdunwetter/pom.xml b/bundles/org.openhab.binding.dwdunwetter/pom.xml index 4ea84103c571c..25cb487313585 100644 --- a/bundles/org.openhab.binding.dwdunwetter/pom.xml +++ b/bundles/org.openhab.binding.dwdunwetter/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.ecobee/pom.xml b/bundles/org.openhab.binding.ecobee/pom.xml index ee3bbc0af9b5f..c498c31abcf8d 100644 --- a/bundles/org.openhab.binding.ecobee/pom.xml +++ b/bundles/org.openhab.binding.ecobee/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.elerotransmitterstick/pom.xml b/bundles/org.openhab.binding.elerotransmitterstick/pom.xml index a106f00329f5f..8b41f694e9365 100644 --- a/bundles/org.openhab.binding.elerotransmitterstick/pom.xml +++ b/bundles/org.openhab.binding.elerotransmitterstick/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.energenie/pom.xml b/bundles/org.openhab.binding.energenie/pom.xml index a2258834e819e..f177128b0ae78 100644 --- a/bundles/org.openhab.binding.energenie/pom.xml +++ b/bundles/org.openhab.binding.energenie/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.enigma2/pom.xml b/bundles/org.openhab.binding.enigma2/pom.xml index b098ea2f66973..c491c7ee04848 100644 --- a/bundles/org.openhab.binding.enigma2/pom.xml +++ b/bundles/org.openhab.binding.enigma2/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.enigma2/src/main/feature/feature.xml b/bundles/org.openhab.binding.enigma2/src/main/feature/feature.xml index c11cd51078003..b0e3dee4f1e29 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.enigma2/src/main/feature/feature.xml @@ -1,9 +1,9 @@ - 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.enigma2/${project.version} - + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.enigma2/${project.version} + diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/actions/Enigma2Actions.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/actions/Enigma2Actions.java index f49b54357887e..f182430d47a23 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/actions/Enigma2Actions.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/actions/Enigma2Actions.java @@ -12,6 +12,9 @@ */ package org.openhab.binding.enigma2.actions; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.core.thing.binding.ThingActions; @@ -22,9 +25,6 @@ import org.openhab.core.automation.annotation.ActionInput; import org.openhab.core.automation.annotation.RuleAction; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - /** * This is the automation engine actions handler service for the * enigma2 actions. diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/handler/Enigma2Handler.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/handler/Enigma2Handler.java index 37c18cfc09c1e..6916385a2e443 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/handler/Enigma2Handler.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/handler/Enigma2Handler.java @@ -14,6 +14,15 @@ import static org.openhab.binding.enigma2.internal.Enigma2BindingConstants.*; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.core.library.types.*; @@ -32,15 +41,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.time.LocalDateTime; -import java.util.Collection; -import java.util.Collections; -import java.util.Optional; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * The {@link Enigma2Handler} is responsible for handling commands, which are * sent to one of the channels. @@ -73,7 +73,8 @@ public void initialize() { } enigma2Client = Optional.of(new Enigma2Client(configuration.host, configuration.user, configuration.password, configuration.timeout)); - refreshJob = scheduler.scheduleWithFixedDelay(this::refresh, 2, configuration.refreshInterval, TimeUnit.SECONDS); + refreshJob = scheduler.scheduleWithFixedDelay(this::refresh, 2, configuration.refreshInterval, + TimeUnit.SECONDS); } private void refresh() { @@ -100,7 +101,7 @@ private void refresh() { @Override public void dispose() { ScheduledFuture job = this.refreshJob; - if(job != null) { + if (job != null) { job.cancel(true); } this.refreshJob = null; diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2BindingConstants.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2BindingConstants.java index 57844e7a5295d..6a26ba8568f34 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2BindingConstants.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2BindingConstants.java @@ -12,12 +12,12 @@ */ package org.openhab.binding.enigma2.internal; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ThingTypeUID; - import java.util.Collections; import java.util.Set; +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.smarthome.core.thing.ThingTypeUID; + /** * The {@link Enigma2BindingConstants} class defines common constants, which are * used across the whole binding. diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2Client.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2Client.java index 8cf8da55d5321..24df68b6bdb3d 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2Client.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2Client.java @@ -153,7 +153,7 @@ public void refreshEpg() { private Optional transmitWithResult(String path) { try { Optional xml = transmit(path); - if(xml.isPresent()) { + if (xml.isPresent()) { DocumentBuilder builder = factory.newDocumentBuilder(); return Optional.ofNullable(builder.parse(new InputSource(new StringReader(xml.get())))); } diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2HttpClient.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2HttpClient.java index a0c8e70b8d4ae..02a3559d6f7ee 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2HttpClient.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2HttpClient.java @@ -12,12 +12,12 @@ */ package org.openhab.binding.enigma2.internal; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.net.http.HttpUtil; - import java.io.IOException; import java.util.regex.Pattern; +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.smarthome.io.net.http.HttpUtil; + /** * The {@link Enigma2HttpClient} class is responsible for sending HTTP-Get requests to the Enigma2 device. * It is devided from {@link Enigma2Client} for better testing purpose. @@ -26,7 +26,8 @@ */ @NonNullByDefault public class Enigma2HttpClient { - public static final Pattern PATTERN = Pattern.compile("[^\\u0009\\u000A\\u000D\\u0020-\\uD7FF\\uE000-\\uFFFD\\u10000-\\u10FFF]+"); + public static final Pattern PATTERN = Pattern + .compile("[^\\u0009\\u000A\\u000D\\u0020-\\uD7FF\\uE000-\\uFFFD\\u10000-\\u10FFF]+"); private final int timeout; public Enigma2HttpClient(int timeout) { diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java index 098da525d6096..076836fc0bf72 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java @@ -25,9 +25,9 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.config.discovery.DiscoveryResult; import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; +import org.eclipse.smarthome.config.discovery.mdns.MDNSDiscoveryParticipant; import org.eclipse.smarthome.core.thing.ThingTypeUID; import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.config.discovery.mdns.MDNSDiscoveryParticipant; import org.openhab.binding.enigma2.internal.Enigma2BindingConstants; import org.openhab.binding.enigma2.internal.Enigma2HttpClient; import org.osgi.service.component.annotations.Component; @@ -58,7 +58,7 @@ public Set getSupportedThingTypeUIDs() { if (ipAddress != null && isEnigma2Device(ipAddress)) { logger.debug("Enigma2 device discovered: IP-Adress={}, name={}", ipAddress, info.getName()); ThingUID uid = getThingUID(info); - if(uid != null) { + if (uid != null) { Map properties = new HashMap<>(); properties.put(Enigma2BindingConstants.CONFIG_HOST, ipAddress); properties.put(Enigma2BindingConstants.CONFIG_REFRESH, 5); @@ -73,7 +73,7 @@ public Set getSupportedThingTypeUIDs() { public @Nullable ThingUID getThingUID(ServiceInfo info) { logger.debug("ServiceInfo {}", info); String ipAddress = getIPAddress(info); - if( ipAddress != null) { + if (ipAddress != null) { return new ThingUID(Enigma2BindingConstants.THING_TYPE_DEVICE, ipAddress.replace(".", "_")); } return null; @@ -95,7 +95,8 @@ private boolean isEnigma2Device(String ipAddress) { private @Nullable String getIPAddress(ServiceInfo info) { InetAddress[] addresses = info.getInet4Addresses(); if (addresses.length > 1) { - logger.debug("Enigma2 device {} reports multiple addresses - using the first one! {}", info.getName(), addresses); + logger.debug("Enigma2 device {} reports multiple addresses - using the first one! {}", info.getName(), + addresses); } return Stream.of(addresses).findFirst().map(InetAddress::getHostAddress).orElse(null); } diff --git a/bundles/org.openhab.binding.enigma2/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.enigma2/src/main/resources/ESH-INF/thing/thing-types.xml index c52f4408f34ed..13623591534de 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.enigma2/src/main/resources/ESH-INF/thing/thing-types.xml @@ -7,15 +7,15 @@ The Thing represents an Enigma2 device - - - - - - - - - + + + + + + + + + diff --git a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/actions/Enigma2ActionsTest.java b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/actions/Enigma2ActionsTest.java index eadf7465877c5..5f353d866544f 100644 --- a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/actions/Enigma2ActionsTest.java +++ b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/actions/Enigma2ActionsTest.java @@ -12,14 +12,14 @@ */ package org.openhab.binding.enigma2.actions; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; -import static org.mockito.Mockito.*; - import org.openhab.binding.enigma2.handler.Enigma2Handler; import org.openhab.binding.enigma2.internal.Enigma2BindingConstants; @@ -181,4 +181,4 @@ public void testSendQuestionTimeoutStatic() { public void testSendQuestionStaticWithException() { Enigma2Actions.sendQuestion(null, SOME_TEXT); } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/handler/Enigma2HandlerTest.java b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/handler/Enigma2HandlerTest.java index 657a84e09b9d5..cfb53278665ec 100644 --- a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/handler/Enigma2HandlerTest.java +++ b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/handler/Enigma2HandlerTest.java @@ -12,6 +12,15 @@ */ package org.openhab.binding.enigma2.handler; +import static org.eclipse.jdt.annotation.Checks.requireNonNull; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Optional; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.config.core.Configuration; @@ -28,15 +37,6 @@ import org.openhab.binding.enigma2.internal.Enigma2Configuration; import org.openhab.binding.enigma2.internal.Enigma2RemoteKey; -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.Optional; - -import static org.eclipse.jdt.annotation.Checks.requireNonNull; -import static org.mockito.Mockito.*; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; - /** * The {@link Enigma2HandlerTest} class is responsible for testing {@link Enigma2Handler}. * diff --git a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2ClientTest.java b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2ClientTest.java index c38e07b187f81..702b5e9563bbc 100644 --- a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2ClientTest.java +++ b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2ClientTest.java @@ -12,18 +12,18 @@ */ package org.openhab.binding.enigma2.internal; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; +import static org.eclipse.jdt.annotation.Checks.requireNonNull; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import java.io.IOException; import java.time.LocalDateTime; -import static org.eclipse.jdt.annotation.Checks.requireNonNull; -import static org.mockito.Mockito.*; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.Nullable; +import org.junit.Before; +import org.junit.Test; /** * The {@link Enigma2ClientTest} class is responsible for testing {@link Enigma2Client}. diff --git a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2HandlerFactoryTest.java b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2HandlerFactoryTest.java index e8a55a92a9402..6814bd1afd1e8 100644 --- a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2HandlerFactoryTest.java +++ b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2HandlerFactoryTest.java @@ -12,6 +12,13 @@ */ package org.openhab.binding.enigma2.internal; +import static org.eclipse.jdt.annotation.Checks.requireNonNull; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.openhab.binding.enigma2.internal.Enigma2BindingConstants.THING_TYPE_DEVICE; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.config.core.Configuration; @@ -19,13 +26,6 @@ import org.eclipse.smarthome.core.thing.ThingTypeUID; import org.junit.Test; -import static org.eclipse.jdt.annotation.Checks.requireNonNull; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.openhab.binding.enigma2.internal.Enigma2BindingConstants.THING_TYPE_DEVICE; - /** * The {@link Enigma2HandlerFactoryTest} class is responsible for testing {@link Enigma2HandlerFactory}. * diff --git a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2RemoteKeyTest.java b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2RemoteKeyTest.java index ea5188dc2470a..218d7efa62622 100644 --- a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2RemoteKeyTest.java +++ b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2RemoteKeyTest.java @@ -12,12 +12,12 @@ */ package org.openhab.binding.enigma2.internal; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.Test; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; - /** * The {@link Enigma2RemoteKeyTest} class is responsible for testing {@link Enigma2RemoteKey}. * diff --git a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipantTest.java b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipantTest.java index 12d1f74ddd970..58c12b25cf240 100644 --- a/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipantTest.java +++ b/bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipantTest.java @@ -12,6 +12,17 @@ */ package org.openhab.binding.enigma2.internal.discovery; +import static org.eclipse.jdt.annotation.Checks.requireNonNull; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.when; + +import java.net.Inet4Address; +import java.net.InetAddress; + +import javax.jmdns.ServiceInfo; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.config.discovery.DiscoveryResult; @@ -21,17 +32,6 @@ import org.openhab.binding.enigma2.internal.Enigma2BindingConstants; import org.openhab.binding.enigma2.internal.Enigma2HttpClient; -import javax.jmdns.ServiceInfo; - -import java.net.Inet4Address; -import java.net.InetAddress; - -import static org.eclipse.jdt.annotation.Checks.requireNonNull; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; -import static org.mockito.Mockito.*; -import static org.mockito.Mockito.when; - /** * The {@link Enigma2DiscoveryParticipantTest} class is responsible for testing {@link Enigma2DiscoveryParticipant}. * @@ -80,10 +80,8 @@ public void testCreateResult() throws Exception { is(new ThingUID(Enigma2BindingConstants.THING_TYPE_DEVICE, "192_168_10_3"))); assertThat(discoveryResult.getProperties(), is(notNullValue())); assertThat(discoveryResult.getProperties(), hasEntry(Enigma2BindingConstants.CONFIG_HOST, "192.168.10.3")); - assertThat(discoveryResult.getProperties(), - hasEntry(Enigma2BindingConstants.CONFIG_REFRESH, 5)); - assertThat(discoveryResult.getProperties(), - hasEntry(Enigma2BindingConstants.CONFIG_TIMEOUT, 5)); + assertThat(discoveryResult.getProperties(), hasEntry(Enigma2BindingConstants.CONFIG_REFRESH, 5)); + assertThat(discoveryResult.getProperties(), hasEntry(Enigma2BindingConstants.CONFIG_TIMEOUT, 5)); } @Test diff --git a/bundles/org.openhab.binding.enocean/pom.xml b/bundles/org.openhab.binding.enocean/pom.xml index 38964a273ebf3..2105c1405b991 100644 --- a/bundles/org.openhab.binding.enocean/pom.xml +++ b/bundles/org.openhab.binding.enocean/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.enturno/pom.xml b/bundles/org.openhab.binding.enturno/pom.xml index 6656c3cd09ada..d47c4816573e6 100644 --- a/bundles/org.openhab.binding.enturno/pom.xml +++ b/bundles/org.openhab.binding.enturno/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.etherrain/pom.xml b/bundles/org.openhab.binding.etherrain/pom.xml index e3f3d20ca70f1..2b4cb8e35ebf8 100644 --- a/bundles/org.openhab.binding.etherrain/pom.xml +++ b/bundles/org.openhab.binding.etherrain/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.evohome/pom.xml b/bundles/org.openhab.binding.evohome/pom.xml index a9107096a2af9..dd18ed455abcb 100644 --- a/bundles/org.openhab.binding.evohome/pom.xml +++ b/bundles/org.openhab.binding.evohome/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.exec/pom.xml b/bundles/org.openhab.binding.exec/pom.xml index 60a3ae46c0280..3d3a3b836d6bf 100644 --- a/bundles/org.openhab.binding.exec/pom.xml +++ b/bundles/org.openhab.binding.exec/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.feed/pom.xml b/bundles/org.openhab.binding.feed/pom.xml index 06b14699da24e..006a091a2bb38 100644 --- a/bundles/org.openhab.binding.feed/pom.xml +++ b/bundles/org.openhab.binding.feed/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.feican/pom.xml b/bundles/org.openhab.binding.feican/pom.xml index cd68e7acf7163..1dea7faecce8a 100644 --- a/bundles/org.openhab.binding.feican/pom.xml +++ b/bundles/org.openhab.binding.feican/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.fmiweather/pom.xml b/bundles/org.openhab.binding.fmiweather/pom.xml index 3b3112fd40cca..e014847e796a2 100644 --- a/bundles/org.openhab.binding.fmiweather/pom.xml +++ b/bundles/org.openhab.binding.fmiweather/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.folding/pom.xml b/bundles/org.openhab.binding.folding/pom.xml index 285c1f94e1d45..52d90825bbdcd 100644 --- a/bundles/org.openhab.binding.folding/pom.xml +++ b/bundles/org.openhab.binding.folding/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.foobot/pom.xml b/bundles/org.openhab.binding.foobot/pom.xml index 4f4cd3d31d6ca..bc907010a53a9 100644 --- a/bundles/org.openhab.binding.foobot/pom.xml +++ b/bundles/org.openhab.binding.foobot/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.freebox/pom.xml b/bundles/org.openhab.binding.freebox/pom.xml index 424ad65a384e0..1aa7c78ded52b 100644 --- a/bundles/org.openhab.binding.freebox/pom.xml +++ b/bundles/org.openhab.binding.freebox/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.fronius/pom.xml b/bundles/org.openhab.binding.fronius/pom.xml index fc5da883e225b..2f2e4b480543e 100644 --- a/bundles/org.openhab.binding.fronius/pom.xml +++ b/bundles/org.openhab.binding.fronius/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.fsinternetradio/pom.xml b/bundles/org.openhab.binding.fsinternetradio/pom.xml index 6c6369892d9a5..32830e7d6ca7c 100644 --- a/bundles/org.openhab.binding.fsinternetradio/pom.xml +++ b/bundles/org.openhab.binding.fsinternetradio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.ftpupload/pom.xml b/bundles/org.openhab.binding.ftpupload/pom.xml index b9cc07de9c2b4..cb18561a5b4e7 100644 --- a/bundles/org.openhab.binding.ftpupload/pom.xml +++ b/bundles/org.openhab.binding.ftpupload/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.gardena/pom.xml b/bundles/org.openhab.binding.gardena/pom.xml index cffb255733994..03e667ffdfea4 100644 --- a/bundles/org.openhab.binding.gardena/pom.xml +++ b/bundles/org.openhab.binding.gardena/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.globalcache/pom.xml b/bundles/org.openhab.binding.globalcache/pom.xml index 095aa13697d14..957e64990ae14 100644 --- a/bundles/org.openhab.binding.globalcache/pom.xml +++ b/bundles/org.openhab.binding.globalcache/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.goecharger/pom.xml b/bundles/org.openhab.binding.goecharger/pom.xml index eae8037ddcec0..d89b18418f572 100644 --- a/bundles/org.openhab.binding.goecharger/pom.xml +++ b/bundles/org.openhab.binding.goecharger/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.gpstracker/pom.xml b/bundles/org.openhab.binding.gpstracker/pom.xml index 009fa01a9e015..db062b29d2b96 100644 --- a/bundles/org.openhab.binding.gpstracker/pom.xml +++ b/bundles/org.openhab.binding.gpstracker/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.gree/pom.xml b/bundles/org.openhab.binding.gree/pom.xml index 56532ce5d268f..9e9d05e9bb47c 100644 --- a/bundles/org.openhab.binding.gree/pom.xml +++ b/bundles/org.openhab.binding.gree/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java index 3d4100dcb036d..26071e395b3fc 100644 --- a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java +++ b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java @@ -162,5 +162,4 @@ public Map getDevices() { public int getScannedDeviceCount() { return deviceTable.size(); } - } diff --git a/bundles/org.openhab.binding.gree/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.gree/src/main/resources/ESH-INF/thing/thing-types.xml index 1aa75875aad71..526aaf53d3dad 100644 --- a/bundles/org.openhab.binding.gree/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.gree/src/main/resources/ESH-INF/thing/thing-types.xml @@ -7,19 +7,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/bundles/org.openhab.binding.groheondus/pom.xml b/bundles/org.openhab.binding.groheondus/pom.xml index 181bb712ad44a..ee9ec27a2913b 100644 --- a/bundles/org.openhab.binding.groheondus/pom.xml +++ b/bundles/org.openhab.binding.groheondus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.harmonyhub/pom.xml b/bundles/org.openhab.binding.harmonyhub/pom.xml index 901faa95b219a..f6afa4116346e 100644 --- a/bundles/org.openhab.binding.harmonyhub/pom.xml +++ b/bundles/org.openhab.binding.harmonyhub/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hdanywhere/pom.xml b/bundles/org.openhab.binding.hdanywhere/pom.xml index 52ecbe3cca6d5..b3c64aea13fe1 100644 --- a/bundles/org.openhab.binding.hdanywhere/pom.xml +++ b/bundles/org.openhab.binding.hdanywhere/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hdpowerview/pom.xml b/bundles/org.openhab.binding.hdpowerview/pom.xml index 74db69c773475..a9db38d98d086 100644 --- a/bundles/org.openhab.binding.hdpowerview/pom.xml +++ b/bundles/org.openhab.binding.hdpowerview/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.helios/pom.xml b/bundles/org.openhab.binding.helios/pom.xml index 6d809e35ead39..f03f8669b754b 100644 --- a/bundles/org.openhab.binding.helios/pom.xml +++ b/bundles/org.openhab.binding.helios/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.heliosventilation/pom.xml b/bundles/org.openhab.binding.heliosventilation/pom.xml index f549b1ff85b30..81718f4cd5eba 100644 --- a/bundles/org.openhab.binding.heliosventilation/pom.xml +++ b/bundles/org.openhab.binding.heliosventilation/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/feature/feature.xml b/bundles/org.openhab.binding.heliosventilation/src/main/feature/feature.xml index 079e81596decf..aad3588e51bde 100644 --- a/bundles/org.openhab.binding.heliosventilation/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.heliosventilation/src/main/feature/feature.xml @@ -2,9 +2,9 @@ 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.openhab.addons.bundles/org.openhab.binding.heliosventilation/${project.version} - + + openhab-runtime-base + openhab-transport-serial + mvn:org.openhab.addons.bundles/org.openhab.binding.heliosventilation/${project.version} + diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java index 129ec4b8a6fac..54367d0db5d9f 100644 --- a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java +++ b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java @@ -86,5 +86,4 @@ private static Map readChannelProperties() { return result; } - } diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationConfiguration.java b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationConfiguration.java index be054b8fd2122..994ed800328d7 100644 --- a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationConfiguration.java +++ b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationConfiguration.java @@ -32,5 +32,4 @@ public class HeliosVentilationConfiguration { * The Panel Poll Period. Default is 60 sec. = 1 minute; */ public int pollPeriod = 60; - } diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java index c870b18670240..d9d8ec6e8a9ad 100644 --- a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java +++ b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java @@ -254,7 +254,6 @@ private void disconnect() { } serialPort = null; } - } private void poll(HeliosVentilationDataPoint v) { @@ -401,7 +400,6 @@ public void update(ChannelUID channelUID, Command command) { v = v.next(); } while (v != null); }); - } /** diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/binding/binding.xml b/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/binding/binding.xml index a5a21351eabdc..c03ae38e8a5d9 100644 --- a/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/binding/binding.xml @@ -4,7 +4,8 @@ xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd"> HeliosVentilation Binding - This is the binding for Helios Ventilation Systems KWL EC 200/300/500 Pro. It requires a connection to the RS485 bus used by the original remote controls KWL-FB (9417). + This is the binding for Helios Ventilation Systems KWL EC 200/300/500 Pro. It requires a connection to the + RS485 bus used by the original remote controls KWL-FB (9417). Raphael Mack diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/thing/thing-types.xml index e3827b96aaba3..db4dada09df48 100644 --- a/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.heliosventilation/src/main/resources/ESH-INF/thing/thing-types.xml @@ -10,39 +10,40 @@ A domestic ventilation system (KWL) from Helios. - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + serial-port - The serial port name for the RS485 interfaces. Valid values are e.g. COM1 for Windows and /dev/ttyS0 or /dev/ttyUSB0 for Linux. + The serial port name for the RS485 interfaces. Valid values are e.g. COM1 for Windows and /dev/ttyS0 or + /dev/ttyUSB0 for Linux. @@ -58,7 +59,7 @@ Temperature measured in the outdoor air flow. Temperature - + @@ -66,7 +67,7 @@ Temperature measured in the extract (indoor, room temperature) air flow. Temperature - + @@ -74,7 +75,7 @@ Temperature measured in the supply (incoming) air flow. Temperature - + @@ -82,7 +83,7 @@ Temperature measured in the outgoing air flow. Temperature - + @@ -91,36 +92,37 @@ Set temperature for the supply air. Not used in all ventilation systems. Temperature - + Number HVAC - + Number HVAC - + Number HVAC - + Number:Temperature - Bypass temperature to disable the bypass function if outside temperature is below this threshold even if ventilation system is in summer mode. + Bypass temperature to disable the bypass function if outside temperature is below this threshold even if + ventilation system is in summer mode. Temperature - + @@ -128,7 +130,7 @@ Stop the supply fan if outside temperature is below this threshold. Temperature - + @@ -136,7 +138,7 @@ Set temperature for preheater. Temperature - + @@ -144,7 +146,7 @@ Limit for relative humidity sensor. Humidity - + @@ -152,7 +154,7 @@ Speed of the supply air fan (incoming air). HVAC - + @@ -160,14 +162,14 @@ Speed of the extract air fan (outgoing air). HVAC - + Number:Temperature Hysteresis on defroster temperature. - + @@ -191,7 +193,8 @@ Switch - Ventilation system is in winter mode and will not use bypass for cooling. If OFF, the bypass function will be used for cooling if the outside temperature is above the Cell Bypass Temperature. + Ventilation system is in winter mode and will not use bypass for cooling. If OFF, the bypass function + will be used for cooling if the outside temperature is above the Cell Bypass Temperature. @@ -220,14 +223,14 @@ Number:Dimensionless HVAC - + Number:Dimensionless HVAC - + diff --git a/bundles/org.openhab.binding.heos/pom.xml b/bundles/org.openhab.binding.heos/pom.xml index aa9111fe1aaeb..a084ae78001de 100644 --- a/bundles/org.openhab.binding.heos/pom.xml +++ b/bundles/org.openhab.binding.heos/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.homematic/pom.xml b/bundles/org.openhab.binding.homematic/pom.xml index 1184b0ace829a..77b7e63de8065 100644 --- a/bundles/org.openhab.binding.homematic/pom.xml +++ b/bundles/org.openhab.binding.homematic/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hpprinter/pom.xml b/bundles/org.openhab.binding.hpprinter/pom.xml index 583a1df8a4320..0b2c53ad02bfb 100644 --- a/bundles/org.openhab.binding.hpprinter/pom.xml +++ b/bundles/org.openhab.binding.hpprinter/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBinder.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBinder.java index d5c74da6fde6c..5e437384fb599 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBinder.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBinder.java @@ -38,16 +38,16 @@ import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder; import org.eclipse.smarthome.core.types.State; import org.openhab.binding.hpprinter.internal.api.HPFeatures; +import org.openhab.binding.hpprinter.internal.api.HPProductUsageFeatures; +import org.openhab.binding.hpprinter.internal.api.HPProductUsageFeatures.PrinterType; import org.openhab.binding.hpprinter.internal.api.HPProperties; import org.openhab.binding.hpprinter.internal.api.HPScannerStatus; import org.openhab.binding.hpprinter.internal.api.HPScannerStatusFeatures; import org.openhab.binding.hpprinter.internal.api.HPServerResult; import org.openhab.binding.hpprinter.internal.api.HPServerResult.RequestStatus; import org.openhab.binding.hpprinter.internal.api.HPStatus; -import org.openhab.binding.hpprinter.internal.api.HPProductUsageFeatures; import org.openhab.binding.hpprinter.internal.api.HPUsage; import org.openhab.binding.hpprinter.internal.api.HPWebServerClient; -import org.openhab.binding.hpprinter.internal.api.HPProductUsageFeatures.PrinterType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,8 +84,7 @@ public class HPPrinterBinder { * @param scheduler {ScheduledExecutorService} The scheduler service object. * @param config {HPPrinterConfiguration} The configuration object. */ - public HPPrinterBinder(HPPrinterHandler handler, HttpClient httpClient, - ScheduledExecutorService scheduler, + public HPPrinterBinder(HPPrinterHandler handler, HttpClient httpClient, ScheduledExecutorService scheduler, HPPrinterConfiguration config) { this.handler = handler; this.scheduler = scheduler; @@ -96,7 +95,6 @@ public HPPrinterBinder(HPPrinterHandler handler, HttpClient httpClient, throw new IllegalStateException("ip-address should have been validated already and may not be empty."); } printerClient = new HPWebServerClient(httpClient, ipAddress); - } public void retrieveProperties() { @@ -128,14 +126,14 @@ public void dynamicallyAddChannels(ThingUID thingUid) { if (features.getProductStatusSupported()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_STATUS), CoreItemFactory.STRING) - .withLabel("Status").withDescription("Printer status") - .withType(chanTypeStatus).build()); + .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_STATUS), CoreItemFactory.STRING) + .withLabel("Status").withDescription("Printer status").withType(chanTypeStatus).build()); channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_TRAYEMPTYOROPEN), CoreItemFactory.SWITCH) - .withLabel("Tray Empty/Open").withDescription("The tray is empty or open") - .withType(chanTypeReadSwitch).build()); + .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_TRAYEMPTYOROPEN), + CoreItemFactory.SWITCH) + .withLabel("Tray Empty/Open").withDescription("The tray is empty or open") + .withType(chanTypeReadSwitch).build()); } if (features.getScannerStatusSupported()) { @@ -145,16 +143,18 @@ public void dynamicallyAddChannels(ThingUID thingUid) { if (feature.hasStatus()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_SCANNER_STATUS), CoreItemFactory.STRING) - .withLabel("Scanner").withDescription("Scanner status") - .withType(chanTypeStatus).build()); + .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_SCANNER_STATUS), + CoreItemFactory.STRING) + .withLabel("Scanner").withDescription("Scanner status").withType(chanTypeStatus) + .build()); } if (feature.hasAdf()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_SCANNER_ADFLOADED), CoreItemFactory.SWITCH) - .withLabel("ADF Loaded").withDescription("The automatic document feeder is loaded") - .withType(chanTypeReadSwitch).build()); + .create(new ChannelUID(thingUid, CGROUP_STATUS, CHANNEL_SCANNER_ADFLOADED), + CoreItemFactory.SWITCH) + .withLabel("ADF Loaded").withDescription("The automatic document feeder is loaded") + .withType(chanTypeReadSwitch).build()); } } } @@ -163,52 +163,58 @@ public void dynamicallyAddChannels(ThingUID thingUid) { HPServerResult result = printerClient.getProductFeatures(); if (result.getStatus() == RequestStatus.SUCCESS) { HPProductUsageFeatures feature = result.getData(); - + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_BLACK_LEVEL), HPPrinterBindingConstants.ITEM_TYPE_INK) - .withLabel("Black Level").withDescription("Shows the amount of Black Ink/Toner remaining") - .withType(chanTypeInkLevel).build()); + .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_BLACK_LEVEL), + HPPrinterBindingConstants.ITEM_TYPE_INK) + .withLabel("Black Level").withDescription("Shows the amount of Black Ink/Toner remaining") + .withType(chanTypeInkLevel).build()); channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_TOTAL_PAGES), CoreItemFactory.NUMBER) - .withLabel("Total Lifetime Pages").withDescription("The amount of pages printed over the printer lifetime") + .withLabel("Total Lifetime Pages") + .withDescription("The amount of pages printed over the printer lifetime") .withType(chanTypeTotals).build()); if (feature.hasCumulativeMarking()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_BLACK_MARKING), HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) + .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_BLACK_MARKING), + HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) .withLabel("Black Marking Used").withDescription("The amount of Black Marking used") .withType(chanTypeMarking).build()); } - + switch (feature.getType()) { case SINGLECOLOR: if (feature.hasCumulativeMarking()) { channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_COLOR_MARKING), - HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) - .withLabel("Colour Marking Used").withDescription("The amount of Colour Marking used") - .withType(chanTypeMarking).build()); + HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) + .withLabel("Colour Marking Used") + .withDescription("The amount of Colour Marking used").withType(chanTypeMarking) + .build()); } - + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_COLOR_LEVEL), HPPrinterBindingConstants.ITEM_TYPE_INK) - .withLabel("Color Level").withDescription("Shows the amount of Colour Ink/Toner remaining") + .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_COLOR_LEVEL), + HPPrinterBindingConstants.ITEM_TYPE_INK) + .withLabel("Color Level") + .withDescription("Shows the amount of Colour Ink/Toner remaining") .withType(chanTypeInkLevel).build()); - + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_TOTAL_COLORPAGES), CoreItemFactory.NUMBER) - .withLabel("Total Colour Pages").withDescription("The amount of colour pages printed") - .withType(chanTypeTotals).build()); - + .withLabel("Total Colour Pages") + .withDescription("The amount of colour pages printed").withType(chanTypeTotals) + .build()); + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_TOTAL_MONOPAGES), CoreItemFactory.NUMBER) .withLabel("Total Monochrome Pages") - .withDescription("The amount of monochrome pages printed") - .withType(chanTypeTotals).build()); - + .withDescription("The amount of monochrome pages printed").withType(chanTypeTotals) + .build()); if (feature.hasPagesRemaining()) { channels.add(ChannelBuilder @@ -227,26 +233,29 @@ public void dynamicallyAddChannels(ThingUID thingUid) { } break; - + case MULTICOLOR: if (feature.hasCumulativeMarking()) { channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_CYAN_MARKING), - HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) - .withLabel("Cyan Marking Used").withDescription("The amount of Cyan Marking used") - .withType(chanTypeMarking).build()); - + HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) + .withLabel("Cyan Marking Used") + .withDescription("The amount of Cyan Marking used").withType(chanTypeMarking) + .build()); + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_MAGENTA_MARKING), - HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) - .withLabel("Magenta Marking Used").withDescription("The amount of Magenta Marking used") - .withType(chanTypeMarking).build()); - + HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) + .withLabel("Magenta Marking Used") + .withDescription("The amount of Magenta Marking used").withType(chanTypeMarking) + .build()); + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_YELLOW_MARKING), - HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) - .withLabel("Yellow Marking Used").withDescription("The amount of Yellow Marking used") - .withType(chanTypeMarking).build()); + HPPrinterBindingConstants.ITEM_TYPE_CUMLMARK) + .withLabel("Yellow Marking Used") + .withDescription("The amount of Yellow Marking used").withType(chanTypeMarking) + .build()); } if (feature.hasPagesRemaining()) { @@ -270,7 +279,7 @@ public void dynamicallyAddChannels(ThingUID thingUid) { .withLabel("Magenta Pages Remaining") .withDescription("Estimated Magenta pages remaining") .withType(chanTypeTotalsAdvanced).build()); - + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_YELLOW_PAGES_REMAINING), CoreItemFactory.NUMBER) @@ -278,38 +287,44 @@ public void dynamicallyAddChannels(ThingUID thingUid) { .withDescription("Estimated Yellow pages remaining") .withType(chanTypeTotalsAdvanced).build()); } - + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_CYAN_LEVEL), HPPrinterBindingConstants.ITEM_TYPE_INK) - .withLabel("Cyan Level").withDescription("Shows the amount of Cyan Ink/Toner remaining") + .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_CYAN_LEVEL), + HPPrinterBindingConstants.ITEM_TYPE_INK) + .withLabel("Cyan Level") + .withDescription("Shows the amount of Cyan Ink/Toner remaining") .withType(chanTypeInkLevel).build()); - + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_MAGENTA_LEVEL), HPPrinterBindingConstants.ITEM_TYPE_INK) + .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_MAGENTA_LEVEL), + HPPrinterBindingConstants.ITEM_TYPE_INK) .withLabel("Magenta Level") .withDescription("Shows the amount of Magenta Ink/Toner remaining") .withType(chanTypeInkLevel).build()); - + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_YELLOW_LEVEL), HPPrinterBindingConstants.ITEM_TYPE_INK) - .withLabel("Yellow Level").withDescription("Shows the amount of Yellow Ink/Toner remaining") + .create(new ChannelUID(thingUid, CGROUP_INK, CHANNEL_YELLOW_LEVEL), + HPPrinterBindingConstants.ITEM_TYPE_INK) + .withLabel("Yellow Level") + .withDescription("Shows the amount of Yellow Ink/Toner remaining") .withType(chanTypeInkLevel).build()); - + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_TOTAL_COLORPAGES), CoreItemFactory.NUMBER) - .withLabel("Total Colour Pages").withDescription("The amount of colour pages printed") - .withType(chanTypeTotals).build()); - + .withLabel("Total Colour Pages") + .withDescription("The amount of colour pages printed").withType(chanTypeTotals) + .build()); + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_TOTAL_MONOPAGES), CoreItemFactory.NUMBER) .withLabel("Total Monochrome Pages") - .withDescription("The amount of monochrome pages printed") - .withType(chanTypeTotals).build()); - + .withDescription("The amount of monochrome pages printed").withType(chanTypeTotals) + .build()); + break; - + default: if (feature.hasPagesRemaining()) { channels.add(ChannelBuilder @@ -320,30 +335,33 @@ public void dynamicallyAddChannels(ThingUID thingUid) { .withType(chanTypeTotalsAdvanced).build()); } } - + if (feature.hasJamEvents()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_JAM_EVENTS), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_JAM_EVENTS), + CoreItemFactory.NUMBER) .withLabel("Jams").withDescription("The amount of times the paper has jammed") .withType(chanTypeTotalsAdvanced).build()); } - + if (feature.hasMispickEvents()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_MISPICK_EVENTS), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_MISPICK_EVENTS), + CoreItemFactory.NUMBER) .withLabel("Missed Picks") .withDescription("The amount of times the paper failed to feed into the printer") .withType(chanTypeTotalsAdvanced).build()); } - + if (feature.hasSubscriptionCount()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_SUBSCRIPTION), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_SUBSCRIPTION), + CoreItemFactory.NUMBER) .withLabel("Subscription Count") .withDescription("The amount of times an item has been printed in subscription") .withType(chanTypeTotalsAdvanced).build()); } - + if (feature.hasTotalFrontPanelCancelPresses()) { channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_USAGE, CHANNEL_FRONT_PANEL_CANCEL), @@ -353,148 +371,166 @@ public void dynamicallyAddChannels(ThingUID thingUid) { .withType(chanTypeTotalsAdvanced).build()); } - //Other + // Other if (feature.hasCloudPrint()) { channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_OTHER, CHANNEL_CLOUD_PRINT), CoreItemFactory.NUMBER) .withLabel("Cloud Print Count") - .withDescription("The amount of times a document has been printed via Google Cloud Print") + .withDescription( + "The amount of times a document has been printed via Google Cloud Print") .withType(chanTypeTotalsAdvanced).build()); } - - //Scan + + // Scan if (feature.hasScanADF()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_ADF), CoreItemFactory.NUMBER) - .withLabel("Document Feeder Count").withDescription("Times scanned via the Document Feeder") - .withType(chanTypeTotals).build()); + .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_ADF), + CoreItemFactory.NUMBER) + .withLabel("Document Feeder Count") + .withDescription("Times scanned via the Document Feeder").withType(chanTypeTotals) + .build()); } - + if (feature.hasScanFlatbed()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_FLATBED), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_FLATBED), + CoreItemFactory.NUMBER) .withLabel("Flatbed Count").withDescription("Times scanned via the Flatbed/Glass") .withType(chanTypeTotals).build()); } - + if (feature.hasScanToEmail()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_TOEMAIL), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_TOEMAIL), + CoreItemFactory.NUMBER) .withLabel("Scan to Email Count").withDescription("Times scanned using Scan to Email") .withType(chanTypeTotalsAdvanced).build()); } - + if (feature.hasScanToFolder()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_TOFOLDER), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_TOFOLDER), + CoreItemFactory.NUMBER) .withLabel("Scan to Folder Count").withDescription("Times scanned using Scan to Folder") .withType(chanTypeTotalsAdvanced).build()); } - + if (feature.hasScanToHost()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_TOHOST), CoreItemFactory.NUMBER) - .withLabel("Scan to Host Count").withDescription("Times scanned using Scan to Host Device") + .create(new ChannelUID(thingUid, CGROUP_SCAN, CHANNEL_TOTAL_TOHOST), + CoreItemFactory.NUMBER) + .withLabel("Scan to Host Count") + .withDescription("Times scanned using Scan to Host Device") .withType(chanTypeTotalsAdvanced).build()); } - //Scanner Engine + // Scanner Engine if (feature.hasScannerEngine()) { if (feature.hasScanADF()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_TOTAL_ADF), CoreItemFactory.NUMBER) - .withLabel("Document Feeder Count").withDescription("Times scanned via the Document Feeder") - .withType(chanTypeTotals).build()); + .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_TOTAL_ADF), + CoreItemFactory.NUMBER) + .withLabel("Document Feeder Count") + .withDescription("Times scanned via the Document Feeder").withType(chanTypeTotals) + .build()); } - + if (feature.hasScanFlatbed()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_TOTAL_FLATBED), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_TOTAL_FLATBED), + CoreItemFactory.NUMBER) .withLabel("Flatbed Count").withDescription("Times scanned via the Flatbed/Glass") .withType(chanTypeTotals).build()); } channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_JAM_EVENTS), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_JAM_EVENTS), + CoreItemFactory.NUMBER) .withLabel("Jams").withDescription("The amount of times the paper has jammed") .withType(chanTypeTotalsAdvanced).build()); channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_MISPICK_EVENTS), CoreItemFactory.NUMBER) - .withLabel("Missed Picks").withDescription("The amount of times the paper failed to feed into the printer") + .create(new ChannelUID(thingUid, CGROUP_SCANNER, CHANNEL_MISPICK_EVENTS), + CoreItemFactory.NUMBER) + .withLabel("Missed Picks") + .withDescription("The amount of times the paper failed to feed into the printer") .withType(chanTypeTotalsAdvanced).build()); } - //Copy Engine + // Copy Engine if (feature.hasCopyApplication()) { if (feature.hasScanADF()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_ADF), CoreItemFactory.NUMBER) - .withLabel("Document Feeder Count").withDescription("Times scanned via the Document Feeder") - .withType(chanTypeTotals).build()); + .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_ADF), + CoreItemFactory.NUMBER) + .withLabel("Document Feeder Count") + .withDescription("Times scanned via the Document Feeder").withType(chanTypeTotals) + .build()); } - + if (feature.hasScanFlatbed()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_FLATBED), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_FLATBED), + CoreItemFactory.NUMBER) .withLabel("Flatbed Count").withDescription("Times scanned via the Flatbed/Glass") .withType(chanTypeTotals).build()); } channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_PAGES), CoreItemFactory.NUMBER) + .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_PAGES), + CoreItemFactory.NUMBER) .withLabel("Total Pages").withDescription("The amount of pages copied") .withType(chanTypeTotals).build()); - if (feature.getType() == PrinterType.MULTICOLOR || feature.getType() == PrinterType.SINGLECOLOR) { + if (feature.getType() == PrinterType.MULTICOLOR + || feature.getType() == PrinterType.SINGLECOLOR) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_COLORPAGES), - CoreItemFactory.NUMBER) - .withLabel("Total Colour Pages").withDescription("The amount of colour pages copied") - .withType(chanTypeTotals).build()); + .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_COLORPAGES), + CoreItemFactory.NUMBER) + .withLabel("Total Colour Pages") + .withDescription("The amount of colour pages copied").withType(chanTypeTotals) + .build()); channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_COPY, CHANNEL_TOTAL_MONOPAGES), CoreItemFactory.NUMBER) - .withLabel("Total Monochrome Pages").withDescription("The amount of monochrome pages copied") - .withType(chanTypeTotals).build()); + .withLabel("Total Monochrome Pages") + .withDescription("The amount of monochrome pages copied").withType(chanTypeTotals) + .build()); } } - //App Usage + // App Usage if (feature.hasPrintApplication()) { channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_WIN), CoreItemFactory.NUMBER) - .withLabel("Windows") - .withType(chanTypeTotalsAdvanced).build()); - + .withLabel("Windows").withType(chanTypeTotalsAdvanced).build()); + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_ANDROID), CoreItemFactory.NUMBER) - .withLabel("Android") - .withType(chanTypeTotalsAdvanced).build()); - + .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_ANDROID), + CoreItemFactory.NUMBER) + .withLabel("Android").withType(chanTypeTotalsAdvanced).build()); + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_IOS), CoreItemFactory.NUMBER) - .withLabel("iOS") - .withType(chanTypeTotalsAdvanced).build()); - + .withLabel("iOS").withType(chanTypeTotalsAdvanced).build()); + channels.add(ChannelBuilder .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_OSX), CoreItemFactory.NUMBER) - .withLabel("OSX") - .withType(chanTypeTotalsAdvanced).build()); - + .withLabel("OSX").withType(chanTypeTotalsAdvanced).build()); + channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_SAMSUNG), CoreItemFactory.NUMBER) - .withLabel("Samsung") - .withType(chanTypeTotalsAdvanced).build()); - + .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_SAMSUNG), + CoreItemFactory.NUMBER) + .withLabel("Samsung").withType(chanTypeTotalsAdvanced).build()); + if (feature.hasPrintApplicationChrome()) { channels.add(ChannelBuilder - .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_CHROME), CoreItemFactory.NUMBER) - .withLabel("Chrome") - .withType(chanTypeTotalsAdvanced).build()); + .create(new ChannelUID(thingUid, CGROUP_APP, CHANNEL_TOTAL_CHROME), + CoreItemFactory.NUMBER) + .withLabel("Chrome").withType(chanTypeTotalsAdvanced).build()); } } } @@ -562,13 +598,15 @@ private synchronized void startBackgroundSchedules() { usageScheduler = scheduler.scheduleWithFixedDelay(this::checkUsage, 0, usageCheckInterval, TimeUnit.SECONDS); - //Only schedule below items when there channels are linked - if (handler.areStatusChannelsLinked(new String[] {CHANNEL_STATUS, CHANNEL_TRAYEMPTYOROPEN})) { - statusScheduler = scheduler.scheduleWithFixedDelay(this::checkStatus, 0, statusCheckInterval, TimeUnit.SECONDS); + // Only schedule below items when there channels are linked + if (handler.areStatusChannelsLinked(new String[] { CHANNEL_STATUS, CHANNEL_TRAYEMPTYOROPEN })) { + statusScheduler = scheduler.scheduleWithFixedDelay(this::checkStatus, 0, statusCheckInterval, + TimeUnit.SECONDS); } - if (handler.areStatusChannelsLinked(new String[] {CHANNEL_SCANNER_STATUS, CHANNEL_SCANNER_ADFLOADED})) { - scannerStatusScheduler = scheduler.scheduleWithFixedDelay(this::checkScannerStatus, 0, statusCheckInterval, TimeUnit.SECONDS); + if (handler.areStatusChannelsLinked(new String[] { CHANNEL_SCANNER_STATUS, CHANNEL_SCANNER_ADFLOADED })) { + scannerStatusScheduler = scheduler.scheduleWithFixedDelay(this::checkScannerStatus, 0, statusCheckInterval, + TimeUnit.SECONDS); } } @@ -576,8 +614,10 @@ private void checkScannerStatus() { HPServerResult result = printerClient.getScannerStatus(); if (result.getStatus() == RequestStatus.SUCCESS) { - handler.updateState(CGROUP_STATUS, CHANNEL_SCANNER_STATUS, new StringType(result.getData().getScannerStatus())); - handler.updateState(CGROUP_STATUS, CHANNEL_SCANNER_ADFLOADED, convertToOnOffType(result.getData().getAdfLoaded())); + handler.updateState(CGROUP_STATUS, CHANNEL_SCANNER_STATUS, + new StringType(result.getData().getScannerStatus())); + handler.updateState(CGROUP_STATUS, CHANNEL_SCANNER_ADFLOADED, + convertToOnOffType(result.getData().getAdfLoaded())); } else { goneOffline(); } @@ -588,7 +628,8 @@ private void checkStatus() { if (result.getStatus() == RequestStatus.SUCCESS) { handler.updateState(CGROUP_STATUS, CHANNEL_STATUS, new StringType(result.getData().getPrinterStatus())); - handler.updateState(CGROUP_STATUS, CHANNEL_TRAYEMPTYOROPEN, convertToOnOffType(result.getData().getTrayEmptyOrOpen())); + handler.updateState(CGROUP_STATUS, CHANNEL_TRAYEMPTYOROPEN, + convertToOnOffType(result.getData().getTrayEmptyOrOpen())); } else { goneOffline(); } @@ -606,7 +647,7 @@ private void checkUsage() { HPServerResult result = printerClient.getUsage(); if (result.getStatus() == RequestStatus.SUCCESS) { - //Inks + // Inks handler.updateState(CGROUP_INK, CHANNEL_BLACK_LEVEL, new QuantityType<>(result.getData().getInkBlack(), SmartHomeUnits.PERCENT)); handler.updateState(CGROUP_INK, CHANNEL_COLOR_LEVEL, @@ -643,59 +684,69 @@ private void checkUsage() { handler.updateState(CGROUP_USAGE, CHANNEL_YELLOW_MARKING, new QuantityType<>( result.getData().getInkYellowMarking(), MetricPrefix.MILLI(SmartHomeUnits.LITRE))); - handler.updateState(CGROUP_USAGE, CHANNEL_BLACK_PAGES_REMAINING, + handler.updateState(CGROUP_USAGE, CHANNEL_BLACK_PAGES_REMAINING, new DecimalType(result.getData().getInkBlackPagesRemaining())); - handler.updateState(CGROUP_USAGE, CHANNEL_COLOR_PAGES_REMAINING, + handler.updateState(CGROUP_USAGE, CHANNEL_COLOR_PAGES_REMAINING, new DecimalType(result.getData().getInkColorPagesRemaining())); - handler.updateState(CGROUP_USAGE, CHANNEL_CYAN_PAGES_REMAINING, + handler.updateState(CGROUP_USAGE, CHANNEL_CYAN_PAGES_REMAINING, new DecimalType(result.getData().getInkCyanPagesRemaining())); - handler.updateState(CGROUP_USAGE, CHANNEL_MAGENTA_PAGES_REMAINING, + handler.updateState(CGROUP_USAGE, CHANNEL_MAGENTA_PAGES_REMAINING, new DecimalType(result.getData().getInkMagentaPagesRemaining())); - handler.updateState(CGROUP_USAGE, CHANNEL_YELLOW_PAGES_REMAINING, + handler.updateState(CGROUP_USAGE, CHANNEL_YELLOW_PAGES_REMAINING, new DecimalType(result.getData().getInkYellowPagesRemaining())); - //Scan - handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_ADF, new DecimalType( - result.getData().getScanAdfCount())); + // Scan + handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_ADF, new DecimalType(result.getData().getScanAdfCount())); - handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_FLATBED, new DecimalType( - result.getData().getScanFlatbedCount())); + handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_FLATBED, + new DecimalType(result.getData().getScanFlatbedCount())); - handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_TOEMAIL, new DecimalType( - result.getData().getScanToEmailCount())); + handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_TOEMAIL, + new DecimalType(result.getData().getScanToEmailCount())); - handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_TOFOLDER, new DecimalType( - result.getData().getScanToFolderCount())); + handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_TOFOLDER, + new DecimalType(result.getData().getScanToFolderCount())); - handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_TOHOST, new DecimalType( - result.getData().getScanToHostCount())); + handler.updateState(CGROUP_SCAN, CHANNEL_TOTAL_TOHOST, + new DecimalType(result.getData().getScanToHostCount())); - //Scanner - handler.updateState(CGROUP_SCANNER, CHANNEL_TOTAL_ADF, new DecimalType(result.getData().getScannerAdfCount())); - handler.updateState(CGROUP_SCANNER, CHANNEL_TOTAL_FLATBED, new DecimalType(result.getData().getScannerFlatbedCount())); - handler.updateState(CGROUP_SCANNER, CHANNEL_JAM_EVENTS, new DecimalType(result.getData().getScannerJamEvents())); - handler.updateState(CGROUP_SCANNER, CHANNEL_MISPICK_EVENTS, new DecimalType(result.getData().getScannerMispickEvents())); + // Scanner + handler.updateState(CGROUP_SCANNER, CHANNEL_TOTAL_ADF, + new DecimalType(result.getData().getScannerAdfCount())); + handler.updateState(CGROUP_SCANNER, CHANNEL_TOTAL_FLATBED, + new DecimalType(result.getData().getScannerFlatbedCount())); + handler.updateState(CGROUP_SCANNER, CHANNEL_JAM_EVENTS, + new DecimalType(result.getData().getScannerJamEvents())); + handler.updateState(CGROUP_SCANNER, CHANNEL_MISPICK_EVENTS, + new DecimalType(result.getData().getScannerMispickEvents())); - //Copy + // Copy handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_ADF, new DecimalType(result.getData().getCopyAdfCount())); - handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_FLATBED, new DecimalType(result.getData().getCopyFlatbedCount())); - handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_PAGES, new DecimalType(result.getData().getCopyTotalImpressions())); - handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_COLORPAGES, new DecimalType(result.getData().getCopyTotalColorImpressions())); - handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_MONOPAGES, new DecimalType(result.getData().getCopyTotalMonochromeImpressions())); + handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_FLATBED, + new DecimalType(result.getData().getCopyFlatbedCount())); + handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_PAGES, + new DecimalType(result.getData().getCopyTotalImpressions())); + handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_COLORPAGES, + new DecimalType(result.getData().getCopyTotalColorImpressions())); + handler.updateState(CGROUP_COPY, CHANNEL_TOTAL_MONOPAGES, + new DecimalType(result.getData().getCopyTotalMonochromeImpressions())); // App Usage handler.updateState(CGROUP_APP, CHANNEL_TOTAL_WIN, new DecimalType(result.getData().getAppWindowsCount())); handler.updateState(CGROUP_APP, CHANNEL_TOTAL_OSX, new DecimalType(result.getData().getAppOSXCount())); handler.updateState(CGROUP_APP, CHANNEL_TOTAL_IOS, new DecimalType(result.getData().getAppIosCount())); - handler.updateState(CGROUP_APP, CHANNEL_TOTAL_ANDROID, new DecimalType(result.getData().getAppAndroidCount())); - handler.updateState(CGROUP_APP, CHANNEL_TOTAL_SAMSUNG, new DecimalType(result.getData().getAppSamsungCount())); - handler.updateState(CGROUP_APP, CHANNEL_TOTAL_CHROME, new DecimalType(result.getData().getAppChromeCount())); - - //Other + handler.updateState(CGROUP_APP, CHANNEL_TOTAL_ANDROID, + new DecimalType(result.getData().getAppAndroidCount())); + handler.updateState(CGROUP_APP, CHANNEL_TOTAL_SAMSUNG, + new DecimalType(result.getData().getAppSamsungCount())); + handler.updateState(CGROUP_APP, CHANNEL_TOTAL_CHROME, + new DecimalType(result.getData().getAppChromeCount())); + + // Other handler.updateState(CGROUP_OTHER, CHANNEL_CLOUD_PRINT, new DecimalType(result.getData().getCloudPrintImpressions())); diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBindingConstants.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBindingConstants.java index c0f25b6af730d..97bbd114feff7 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBindingConstants.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterBindingConstants.java @@ -87,14 +87,14 @@ public class HPPrinterBindingConstants { public static final String CHANNEL_FRONT_PANEL_CANCEL = "fpCancelCount"; public static final String CHANNEL_CLOUD_PRINT = "cloudPrint"; - //Scanner + // Scanner public static final String CHANNEL_TOTAL_ADF = "totalAdf"; public static final String CHANNEL_TOTAL_FLATBED = "totalFlatbed"; public static final String CHANNEL_TOTAL_TOEMAIL = "totalToEmail"; public static final String CHANNEL_TOTAL_TOFOLDER = "totalToFolder"; public static final String CHANNEL_TOTAL_TOHOST = "totalToHost"; - //App Usage + // App Usage public static final String CHANNEL_TOTAL_WIN = "totalWin"; public static final String CHANNEL_TOTAL_ANDROID = "totalAndroid"; public static final String CHANNEL_TOTAL_IOS = "totalIos"; @@ -106,10 +106,9 @@ public class HPPrinterBindingConstants { public static final String CGROUP_INK = "ink"; public static final String CGROUP_STATUS = "status"; public static final String CGROUP_USAGE = "usage"; - public static final String CGROUP_SCANNER = "scanner"; //Scanner Engine + public static final String CGROUP_SCANNER = "scanner"; // Scanner Engine public static final String CGROUP_SCAN = "scan"; // Scan Application public static final String CGROUP_COPY = "copy"; public static final String CGROUP_APP = "app"; public static final String CGROUP_OTHER = "other"; - } diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java index 50a20c9548a6a..6ebf6fd686187 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java @@ -12,6 +12,8 @@ */ package org.openhab.binding.hpprinter.internal; +import static org.openhab.binding.hpprinter.internal.HPPrinterBindingConstants.*; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -31,7 +33,6 @@ import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.State; -import static org.openhab.binding.hpprinter.internal.HPPrinterBindingConstants.*; /** * The {@link HPPrinterHandler} is responsible for handling commands, which are * sent to one of the channels. @@ -83,12 +84,12 @@ public void dispose() { binder = null; } } - + protected Boolean areStatusChannelsLinked(final String[] channels) { for (int i = 0; i < channels.length; i++) { - if (isLinked(new ChannelUID(thing.getUID(), CGROUP_STATUS, channels[i]))) { - return true; - } + if (isLinked(new ChannelUID(thing.getUID(), CGROUP_STATUS, channels[i]))) { + return true; + } } return false; } @@ -108,7 +109,7 @@ public void channelUnlinked(ChannelUID channelUID) { } protected void updateStatus(final ThingStatus status, final ThingStatusDetail thingStatusDetail, - @Nullable final String message) { + @Nullable final String message) { super.updateStatus(status, thingStatusDetail, message); } diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPProductUsageFeatures.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPProductUsageFeatures.java index 23a0dd032b309..c18af924614b4 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPProductUsageFeatures.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPProductUsageFeatures.java @@ -64,7 +64,7 @@ public HPProductUsageFeatures(final Document document) { final Element currInk = (Element) consumableInk.item(i); final String inkName = currInk.getElementsByTagName("dd:MarkerColor").item(0).getTextContent(); final String consumeType = currInk.getElementsByTagName("dd:ConsumableTypeEnum").item(0).getTextContent(); - + if (consumeType.equalsIgnoreCase("printhead")) { continue; } @@ -89,8 +89,9 @@ public HPProductUsageFeatures(final Document document) { break; } } - - pagesRemaining = (((Element) consumableInk.item(0)).getElementsByTagName("dd:EstimatedPagesRemaining").getLength() > 0); + + pagesRemaining = (((Element) consumableInk.item(0)).getElementsByTagName("dd:EstimatedPagesRemaining") + .getLength() > 0); final NodeList printerSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:PrinterSubunit"); if (printerSubUnit.getLength() > 0) { @@ -98,11 +99,14 @@ public HPProductUsageFeatures(final Document document) { jamEvents = (currPrinterSubUnit.getElementsByTagName("dd:JamEvents").getLength() > 0); mispickEvents = (currPrinterSubUnit.getElementsByTagName("dd:MispickEvents").getLength() > 0); - subscriptionImpressions = (currPrinterSubUnit.getElementsByTagName("pudyn:SubscriptionImpressions").getLength() > 0); - frontPanelCancel = (currPrinterSubUnit.getElementsByTagName("dd:TotalFrontPanelCancelPresses").getLength() > 0); + subscriptionImpressions = (currPrinterSubUnit.getElementsByTagName("pudyn:SubscriptionImpressions") + .getLength() > 0); + frontPanelCancel = (currPrinterSubUnit.getElementsByTagName("dd:TotalFrontPanelCancelPresses") + .getLength() > 0); } - final NodeList scannerSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:ScanApplicationSubunit"); + final NodeList scannerSubUnit = document.getDocumentElement() + .getElementsByTagName("pudyn:ScanApplicationSubunit"); if (scannerSubUnit.getLength() > 0) { final Element currScannerSubUnit = (Element) scannerSubUnit.item(0); @@ -113,26 +117,30 @@ public HPProductUsageFeatures(final Document document) { scanToHost = (currScannerSubUnit.getElementsByTagName("dd:ScanToHostImages").getLength() > 0); } - final NodeList scanAppSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:ScanApplicationSubunit"); + final NodeList scanAppSubUnit = document.getDocumentElement() + .getElementsByTagName("pudyn:ScanApplicationSubunit"); if (scanAppSubUnit.getLength() > 0) { printApplication = true; final Element currAppSubUnit = (Element) scanAppSubUnit.item(0); - + printApplicationChrome = (currAppSubUnit.getElementsByTagName("pudyn:RemoteDeviceType").getLength() > 0); } - final NodeList printAppSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:PrintApplicationSubunit"); + final NodeList printAppSubUnit = document.getDocumentElement() + .getElementsByTagName("pudyn:PrintApplicationSubunit"); if (printAppSubUnit.getLength() > 0) { final Element currPrintAppSubUnit = (Element) printAppSubUnit.item(0); cloudPrint = (currPrintAppSubUnit.getElementsByTagName("dd:CloudPrintImpressions").getLength() > 0); } - final NodeList scannerEngineSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:ScannerEngineSubunit"); + final NodeList scannerEngineSubUnit = document.getDocumentElement() + .getElementsByTagName("pudyn:ScannerEngineSubunit"); scannerEngine = (scannerEngineSubUnit.getLength() > 0); - final NodeList copyAppSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:CopyApplicationSubunit"); + final NodeList copyAppSubUnit = document.getDocumentElement() + .getElementsByTagName("pudyn:CopyApplicationSubunit"); copyApplication = (copyAppSubUnit.getLength() > 0); } @@ -238,7 +246,7 @@ public boolean hasScanFlatbed() { public boolean hasCloudPrint() { return cloudPrint; } - + /** * Printer data contains Print Application Usage Information. * diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatus.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatus.java index 5195eb843471b..4c4f4e661dd97 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatus.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatus.java @@ -40,13 +40,13 @@ public HPScannerStatus(Document document) { if (state.getLength() > 0) { localScannerStatus = state.item(0).getTextContent(); } - + NodeList adfState = nodes.getElementsByTagName("scan:AdfState"); if (adfState.getLength() > 0) { String adfStatus = adfState.item(0).getTextContent(); localAdfLoaded = convertAdfStatus(adfStatus); } - + adfLoaded = localAdfLoaded; status = localScannerStatus; } diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatusFeatures.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatusFeatures.java index 34a00fdf4d348..5da117402acb5 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatusFeatures.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPScannerStatusFeatures.java @@ -36,7 +36,7 @@ public HPScannerStatusFeatures(Document document) { Element nodes = (Element) document.getDocumentElement(); localHasStatus = (nodes.getElementsByTagName("pwg:State").getLength() > 0); localHasAdf = (nodes.getElementsByTagName("scan:AdfState").getLength() > 0); - + hasStatus = localHasStatus; hasAdf = localHasAdf; } diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPUsage.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPUsage.java index 2bb6430b4ed00..919b7de5b8266 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPUsage.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPUsage.java @@ -52,27 +52,27 @@ public class HPUsage { private int inkMagentaPagesRemaining; private int inkYellowPagesRemaining; - //Scan + // Scan private int scanAdfCount; private int scanFlatbedCount; private int scanToEmailCount; private int scanToFolderCount; private int scanToHostCount; - //Scanner + // Scanner private int scannerAdfCount; private int scannerFlatbedCount; private int scannerJamEvents; private int scannerMispickEvents; - //Copy + // Copy private int copyAdfCount; private int copyFlatbedCount; private int copyTotalImpressions; private int copyTotalMonochromeImpressions; private int copyTotalColorImpressions; - - //App + + // App private int appWindowsCount; private int appOsxCount; private int appIosCount; @@ -80,7 +80,7 @@ public class HPUsage { private int appSamsungCount; private int appChromeCount; - //Other + // Other private int cloudPrintImpressions; public HPUsage() { @@ -129,7 +129,8 @@ public HPUsage(Document document) { } if (hasPagesRemaining) { - pagesRemaining = Integer.parseInt(((Element) currInk).getElementsByTagName("dd:EstimatedPagesRemaining").item(0).getTextContent()); + pagesRemaining = Integer.parseInt(((Element) currInk).getElementsByTagName("dd:EstimatedPagesRemaining") + .item(0).getTextContent()); } switch (inkName.toLowerCase()) { @@ -196,20 +197,19 @@ public HPUsage(Document document) { .getElementsByTagName("dd:TotalFrontPanelCancelPresses"); if (frontpanelCancelCount.getLength() > 0) this.frontpanelCancelCount = Integer.parseInt(frontpanelCancelCount.item(0).getTextContent()); - - //Print Apps + + // Print Apps NodeList printAppsSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:PrintApplicationSubunit"); if (printAppsSubUnit.getLength() > 0) { Element currPrintAppsSubUnit = (Element) printAppsSubUnit.item(0); - NodeList cloudPrintImpressions = currPrintAppsSubUnit - .getElementsByTagName("dd:CloudPrintImpressions"); + NodeList cloudPrintImpressions = currPrintAppsSubUnit.getElementsByTagName("dd:CloudPrintImpressions"); if (cloudPrintImpressions.getLength() > 0) this.cloudPrintImpressions = Integer.parseInt(cloudPrintImpressions.item(0).getTextContent()); } - - //Scan + + // Scan NodeList scanSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:ScanApplicationSubunit"); if (scanSubUnit.getLength() > 0) { Element currScanSubUnit = (Element) scanSubUnit.item(0); @@ -223,7 +223,7 @@ public HPUsage(Document document) { this.scanToHostCount = setInt("dd:ScanToHostImages", currScanSubUnit); } - //Scanner + // Scanner NodeList scannerSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:ScannerEngineSubunit"); if (scannerSubUnit.getLength() > 0) { Element currScannerSubUnit = (Element) scannerSubUnit.item(0); @@ -234,7 +234,7 @@ public HPUsage(Document document) { this.scannerMispickEvents = setInt("dd:MispickEvents", currScannerSubUnit); } - //Copy + // Copy NodeList copySubUnit = document.getDocumentElement().getElementsByTagName("pudyn:CopyApplicationSubunit"); if (copySubUnit.getLength() > 0) { Element currCopySubUnit = (Element) copySubUnit.item(0); @@ -246,28 +246,37 @@ public HPUsage(Document document) { this.copyTotalImpressions = setInt("dd:TotalImpressions", currCopySubUnit); } - //App Usage + // App Usage NodeList appSubUnit = document.getDocumentElement().getElementsByTagName("pudyn:MobileApplicationSubunit"); if (appSubUnit.getLength() > 0) { Element currAppSubUnit = (Element) appSubUnit.item(0); - - this.appWindowsCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "Windows", "pudyn:TotalImpressions"); - this.appOsxCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "OSX", "pudyn:TotalImpressions"); - this.appIosCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "iOS", "pudyn:TotalImpressions"); - this.appAndroidCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "Android", "pudyn:TotalImpressions"); - this.appSamsungCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "samsung", "pudyn:TotalImpressions"); - this.appChromeCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "Chrome", "pudyn:TotalImpressions"); + + this.appWindowsCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "Windows", + "pudyn:TotalImpressions"); + this.appOsxCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "OSX", + "pudyn:TotalImpressions"); + this.appIosCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "iOS", + "pudyn:TotalImpressions"); + this.appAndroidCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "Android", + "pudyn:TotalImpressions"); + this.appSamsungCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "samsung", + "pudyn:TotalImpressions"); + this.appChromeCount = setIntCollateDirectChildren(currAppSubUnit, "pudyn:RemoteDeviceType", "Chrome", + "pudyn:TotalImpressions"); } } - private static int setIntCollateDirectChildren(Element parentNode, String collateTagName, String collateTagNameValue, String valueTagName) { + private static int setIntCollateDirectChildren(Element parentNode, String collateTagName, + String collateTagNameValue, String valueTagName) { int value = 0; for (Node n = parentNode.getFirstChild(); n != null; n = n.getNextSibling()) { if (n instanceof Element) { Element nodeItem = (Element) n; - if (nodeItem.getElementsByTagName(collateTagName).item(0).getTextContent().equalsIgnoreCase(collateTagNameValue)) { - int nodeValue = Integer.parseInt(nodeItem.getElementsByTagName(valueTagName).item(0).getTextContent()); + if (nodeItem.getElementsByTagName(collateTagName).item(0).getTextContent() + .equalsIgnoreCase(collateTagNameValue)) { + int nodeValue = Integer + .parseInt(nodeItem.getElementsByTagName(valueTagName).item(0).getTextContent()); value += nodeValue; } @@ -279,8 +288,8 @@ private static int setIntCollateDirectChildren(Element parentNode, String collat private int setInt(String tagName, Element parentNode) { NodeList nodeList = parentNode.getElementsByTagName(tagName); - if (nodeList.getLength() > 0) - return Integer.parseInt(nodeList.item(0).getTextContent()); + if (nodeList.getLength() > 0) + return Integer.parseInt(nodeList.item(0).getTextContent()); return 0; } @@ -455,5 +464,4 @@ public int getCopyTotalColorImpressions() { public int getCopyTotalMonochromeImpressions() { return copyTotalMonochromeImpressions; } - } diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPWebServerClient.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPWebServerClient.java index 9bcf916f6b38c..fdfb9ac8d922e 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPWebServerClient.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPWebServerClient.java @@ -82,7 +82,6 @@ public HPServerResult getScannerFeatures() { return fetchData(serverAddress + HPScannerStatusFeatures.ENDPOINT, (HPScannerStatusFeatures::new)); } - /** * Gets the Usage information from the Embedded Web Server. * diff --git a/bundles/org.openhab.binding.hpprinter/src/main/resources/ESH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.hpprinter/src/main/resources/ESH-INF/thing/channel-types.xml index 12288d2ff2824..72054a69be92e 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/resources/ESH-INF/thing/channel-types.xml +++ b/bundles/org.openhab.binding.hpprinter/src/main/resources/ESH-INF/thing/channel-types.xml @@ -16,7 +16,7 @@ Amount of pages. - + Number diff --git a/bundles/org.openhab.binding.hue/pom.xml b/bundles/org.openhab.binding.hue/pom.xml index 9f6e6de698e32..2381a01fada20 100644 --- a/bundles/org.openhab.binding.hue/pom.xml +++ b/bundles/org.openhab.binding.hue/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java index 89a6cc1985bf8..8854602fe5b2b 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java @@ -113,6 +113,5 @@ public List getUsages() { return Arrays.asList(new String[] { buildCommandUsage(" " + USER_NAME, "show the user name"), buildCommandUsage(" " + SCENES, "list all the scenes with their id"), buildCommandUsage(" " + SCENES, "list all the scenes from this group with their id") }); - } } diff --git a/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/Group.xml b/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/Group.xml index dded6ad149ae4..c492f59bfc77f 100644 --- a/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/Group.xml +++ b/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/Group.xml @@ -18,7 +18,7 @@ - + groupId diff --git a/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/bridge.xml b/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/bridge.xml index 4d9c9049db9a7..9a4633a63fbf9 100644 --- a/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/bridge.xml +++ b/bundles/org.openhab.binding.hue/src/main/resources/ESH-INF/thing/bridge.xml @@ -9,7 +9,7 @@ The Hue bridge represents the Philips Hue bridge. - + @@ -43,7 +43,8 @@ Milliseconds between fetching sensor-values from the Hue bridge. A higher value means more delay for - the sensor values, but a too low value can cause congestion on the Hue bridge. Use 0 to disable the polling for sensors. Default is 500. + the sensor values, but a too low value can cause congestion on the Hue bridge. Use 0 to disable the polling for + sensors. Default is 500. true 500 diff --git a/bundles/org.openhab.binding.hydrawise/pom.xml b/bundles/org.openhab.binding.hydrawise/pom.xml index 62e7a549d53c7..244408dda11ba 100644 --- a/bundles/org.openhab.binding.hydrawise/pom.xml +++ b/bundles/org.openhab.binding.hydrawise/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hyperion/pom.xml b/bundles/org.openhab.binding.hyperion/pom.xml index d32ec21eece3c..ec9e9a3a41489 100644 --- a/bundles/org.openhab.binding.hyperion/pom.xml +++ b/bundles/org.openhab.binding.hyperion/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java index 540f4a2646333..32bf1b712d1d3 100644 --- a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java +++ b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java @@ -176,10 +176,10 @@ protected void handleServerInfoResponse(NgResponse response) { // update Hyperion, older API compatibility Hyperion hyperion = info.getHyperion(); if (hyperion != null) { - + updateHyperion(hyperion); } - + // populate the effect states List effects = info.getEffects(); populateEffects(effects); diff --git a/bundles/org.openhab.binding.iaqualink/pom.xml b/bundles/org.openhab.binding.iaqualink/pom.xml index 40ce3eea1f49d..c28d6b7c0782d 100644 --- a/bundles/org.openhab.binding.iaqualink/pom.xml +++ b/bundles/org.openhab.binding.iaqualink/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.icalendar/pom.xml b/bundles/org.openhab.binding.icalendar/pom.xml index 177c9f086c412..e139b5ce10dd3 100644 --- a/bundles/org.openhab.binding.icalendar/pom.xml +++ b/bundles/org.openhab.binding.icalendar/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.openhab.addons.bundles diff --git a/bundles/org.openhab.binding.icloud/pom.xml b/bundles/org.openhab.binding.icloud/pom.xml index 5cac42955bf5f..8282926ac8ea7 100644 --- a/bundles/org.openhab.binding.icloud/pom.xml +++ b/bundles/org.openhab.binding.icloud/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.ihc/pom.xml b/bundles/org.openhab.binding.ihc/pom.xml index 9d0cc3ba690c9..7d2a7c219c01b 100644 --- a/bundles/org.openhab.binding.ihc/pom.xml +++ b/bundles/org.openhab.binding.ihc/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.ihc/src/test/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementServiceTest.java b/bundles/org.openhab.binding.ihc/src/test/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementServiceTest.java index 3c566f971103a..e40186c51c838 100644 --- a/bundles/org.openhab.binding.ihc/src/test/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementServiceTest.java +++ b/bundles/org.openhab.binding.ihc/src/test/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementServiceTest.java @@ -50,7 +50,6 @@ public void setUp() throws IhcExecption, SocketTimeoutException { requestProps.clear(); requestProps.put("SOAPAction", "getDetectedDeviceList"); - } @Test diff --git a/bundles/org.openhab.binding.innogysmarthome/pom.xml b/bundles/org.openhab.binding.innogysmarthome/pom.xml index 2ae88b398c982..cdced78654573 100644 --- a/bundles/org.openhab.binding.innogysmarthome/pom.xml +++ b/bundles/org.openhab.binding.innogysmarthome/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java index 246c67802cdfa..b1d8857613f7c 100644 --- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java +++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java @@ -267,14 +267,12 @@ private void startWebsocket() { InnogyWebSocket createWebSocket() throws IOException, AuthenticationException { final AccessTokenResponse accessTokenResponse = client.getAccessTokenResponse(); - final String webSocketUrl = WEBSOCKET_API_URL_EVENTS.replace("{token}", - accessTokenResponse.getAccessToken()); + final String webSocketUrl = WEBSOCKET_API_URL_EVENTS.replace("{token}", accessTokenResponse.getAccessToken()); logger.debug("WebSocket URL: {}...{}", webSocketUrl.substring(0, 70), webSocketUrl.substring(webSocketUrl.length() - 10)); - return new InnogyWebSocket(this, URI.create(webSocketUrl), - bridgeConfiguration.websocketidletimeout * 1000); + return new InnogyWebSocket(this, URI.create(webSocketUrl), bridgeConfiguration.websocketidletimeout * 1000); } @Override @@ -286,11 +284,13 @@ public void onAccessTokenResponse(final AccessTokenResponse credential) { * Schedules a re-initialization in the given future. * * @param delayed when it is scheduled delayed, it starts with a delay of - * {@link org.openhab.binding.innogysmarthome.internal.InnogyBindingConstants#REINITIALIZE_DELAY_SECONDS} seconds, - * otherwise it starts directly + * {@link org.openhab.binding.innogysmarthome.internal.InnogyBindingConstants#REINITIALIZE_DELAY_SECONDS} + * seconds, + * otherwise it starts directly */ private synchronized void scheduleRestartClient(final boolean delayed) { - @Nullable final ScheduledFuture localReinitJob = reinitJob; + @Nullable + final ScheduledFuture localReinitJob = reinitJob; if (localReinitJob != null && isAlreadyScheduled(localReinitJob)) { logger.debug("Scheduling reinitialize - ignored: already triggered in {} seconds.", @@ -963,6 +963,7 @@ private void refreshAccessToken() { /** * Checks if the job is already (re-)scheduled. + * * @param job job to check * @return true, when the job is already (re-)scheduled, otherwise false */ diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java index dc4629b09a7c9..4042c7cd46007 100644 --- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java +++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java @@ -80,7 +80,8 @@ public InnogyDeviceHandler(final Thing thing) { public void handleCommand(final ChannelUID channelUID, final Command command) { logger.debug("handleCommand called for channel '{}' of type '{}' with command '{}'", channelUID, getThing().getThingTypeUID().getId(), command); - @Nullable final InnogyBridgeHandler innogyBridgeHandler = getInnogyBridgeHandler(); + @Nullable + final InnogyBridgeHandler innogyBridgeHandler = getInnogyBridgeHandler(); if (innogyBridgeHandler == null) { logger.warn("BridgeHandler not found. Cannot handle command without bridge."); return; @@ -91,7 +92,8 @@ public void handleCommand(final ChannelUID channelUID, final Command command) { } if (command instanceof RefreshType) { - @Nullable final Device device = innogyBridgeHandler.getDeviceById(deviceId); + @Nullable + final Device device = innogyBridgeHandler.getDeviceById(deviceId); if (device != null) { onDeviceStateChanged(device); } @@ -102,7 +104,8 @@ public void handleCommand(final ChannelUID channelUID, final Command command) { if (CHANNEL_SWITCH.equals(channelUID.getId())) { // DEBUGGING HELPER // ---------------- - @Nullable final Device device = innogyBridgeHandler.getDeviceById(deviceId); + @Nullable + final Device device = innogyBridgeHandler.getDeviceById(deviceId); if (device != null && DEBUG.equals(device.getConfig().getName())) { logger.debug("DEBUG SWITCH ACTIVATED!"); if (OnOffType.ON.equals(command)) { @@ -244,7 +247,8 @@ private void initializeThing(@Nullable final ThingStatus bridgeStatus) { */ private boolean initializeProperties() { synchronized (this.lock) { - @Nullable final Device device = getDevice(); + @Nullable + final Device device = getDevice(); if (device != null) { final Map properties = editProperties(); properties.put(PROPERTY_ID, device.getId()); @@ -326,11 +330,13 @@ private boolean initializeProperties() { private @Nullable InnogyBridgeHandler getInnogyBridgeHandler() { synchronized (this.lock) { if (this.bridgeHandler == null) { - @Nullable final Bridge bridge = getBridge(); + @Nullable + final Bridge bridge = getBridge(); if (bridge == null) { return null; } - @Nullable final ThingHandler handler = bridge.getHandler(); + @Nullable + final ThingHandler handler = bridge.getHandler(); if (handler instanceof InnogyBridgeHandler) { this.bridgeHandler = (InnogyBridgeHandler) handler; this.bridgeHandler.registerDeviceStatusListener(this); @@ -355,7 +361,8 @@ public void onDeviceStateChanged(final Device device) { // DEVICE STATES if (device.hasDeviceState()) { - @Nullable Boolean reachable = null; + @Nullable + Boolean reachable = null; if (device.getDeviceState().hasIsReachableState()) { reachable = device.getDeviceState().isReachable(); } @@ -905,7 +912,8 @@ public void onDeviceStateChanged(final Device changedDevice, final Event event) } else { logger.debug("Capability {} has no state (yet?) - refreshing device.", capability.getName()); - @Nullable final InnogyBridgeHandler innogyBridgeHandler = getInnogyBridgeHandler(); + @Nullable + final InnogyBridgeHandler innogyBridgeHandler = getInnogyBridgeHandler(); if (innogyBridgeHandler != null) { device = innogyBridgeHandler.refreshDevice(deviceId); } @@ -943,7 +951,8 @@ private int invertValueIfConfigured(final String channelId, final int value) { return value; } - @Nullable final Channel channel = getThing().getChannel(channelId); + @Nullable + final Channel channel = getThing().getChannel(channelId); if (channel == null) { logger.debug("Channel {} was null! Value not inverted.", channelId); return value; diff --git a/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java b/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java index 6a1231d4f3011..e202d864e2f2c 100644 --- a/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java +++ b/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java @@ -178,7 +178,8 @@ private class InnogyBridgeHandlerAccessible extends InnogyBridgeHandler { private int executionCount; private int directExecutionCount; - private InnogyBridgeHandlerAccessible(Bridge bridge, OAuthFactory oAuthFactory, HttpClient httpClient) throws Exception { + private InnogyBridgeHandlerAccessible(Bridge bridge, OAuthFactory oAuthFactory, HttpClient httpClient) + throws Exception { super(bridge, oAuthFactory, httpClient); Device bridgeDevice = new Device(); diff --git a/bundles/org.openhab.binding.insteon/pom.xml b/bundles/org.openhab.binding.insteon/pom.xml index b416634c8e448..968b314bcb4a3 100644 --- a/bundles/org.openhab.binding.insteon/pom.xml +++ b/bundles/org.openhab.binding.insteon/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.insteon/src/main/resources/device_features.xml b/bundles/org.openhab.binding.insteon/src/main/resources/device_features.xml index 1054e85316352..26535c0fcb63e 100644 --- a/bundles/org.openhab.binding.insteon/src/main/resources/device_features.xml +++ b/bundles/org.openhab.binding.insteon/src/main/resources/device_features.xml @@ -442,20 +442,20 @@ NoOpCommandHandler NoPollHandler - - SimpleDispatcher - NoOpMsgHandler - NoOpMsgHandler - NoOpMsgHandler - NoOpMsgHandler - NoOpMsgHandler - MotionSensor2AlternateHeartbeatHandler - NoOpMsgHandler - NoOpMsgHandler - MotionSensorDataReplyHandler - NoOpCommandHandler - NoPollHandler - + + SimpleDispatcher + NoOpMsgHandler + NoOpMsgHandler + NoOpMsgHandler + NoOpMsgHandler + NoOpMsgHandler + MotionSensor2AlternateHeartbeatHandler + NoOpMsgHandler + NoOpMsgHandler + MotionSensorDataReplyHandler + NoOpCommandHandler + NoPollHandler + SimpleDispatcher NoOpMsgHandler diff --git a/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml b/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml index 2d50b075f0d14..df23c5c2f63d3 100644 --- a/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml +++ b/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml @@ -585,14 +585,14 @@ GenericLastTime - - 2844-222 - Motion Sensor II - WirelessMotionSensorContact - WirelessMotionSensorLightLevelAboveThreshold - WirelessMotionSensorLowBattery - MotionSensor2Data - WirelessMotionSensor2TamperSwitch - GenericLastTime - + + 2844-222 + Motion Sensor II + WirelessMotionSensorContact + WirelessMotionSensorLightLevelAboveThreshold + WirelessMotionSensorLowBattery + MotionSensor2Data + WirelessMotionSensor2TamperSwitch + GenericLastTime + diff --git a/bundles/org.openhab.binding.ipp/pom.xml b/bundles/org.openhab.binding.ipp/pom.xml index 12c52d49c046b..32245d24d52cd 100644 --- a/bundles/org.openhab.binding.ipp/pom.xml +++ b/bundles/org.openhab.binding.ipp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.irtrans/pom.xml b/bundles/org.openhab.binding.irtrans/pom.xml index 81cd7fda157aa..ff1eefb30ed83 100644 --- a/bundles/org.openhab.binding.irtrans/pom.xml +++ b/bundles/org.openhab.binding.irtrans/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.jeelink/pom.xml b/bundles/org.openhab.binding.jeelink/pom.xml index 65c8b8d027a7f..8e48bbdace33b 100644 --- a/bundles/org.openhab.binding.jeelink/pom.xml +++ b/bundles/org.openhab.binding.jeelink/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.keba/pom.xml b/bundles/org.openhab.binding.keba/pom.xml index b103456c3ff41..454cdce5720c2 100644 --- a/bundles/org.openhab.binding.keba/pom.xml +++ b/bundles/org.openhab.binding.keba/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.km200/pom.xml b/bundles/org.openhab.binding.km200/pom.xml index 4c812b96e32f4..ab329f33c8fcb 100644 --- a/bundles/org.openhab.binding.km200/pom.xml +++ b/bundles/org.openhab.binding.km200/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.knx/pom.xml b/bundles/org.openhab.binding.knx/pom.xml index f160611de1d66..e2989bcec310c 100644 --- a/bundles/org.openhab.binding.knx/pom.xml +++ b/bundles/org.openhab.binding.knx/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.kodi/pom.xml b/bundles/org.openhab.binding.kodi/pom.xml index 8e9f2e1e19517..a624c55ff2ede 100644 --- a/bundles/org.openhab.binding.kodi/pom.xml +++ b/bundles/org.openhab.binding.kodi/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.konnected/pom.xml b/bundles/org.openhab.binding.konnected/pom.xml index 1ea8c33b9cb43..b50001f9a1386 100644 --- a/bundles/org.openhab.binding.konnected/pom.xml +++ b/bundles/org.openhab.binding.konnected/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.kostalinverter/pom.xml b/bundles/org.openhab.binding.kostalinverter/pom.xml index 501c7f2f1e606..46c123c359b96 100644 --- a/bundles/org.openhab.binding.kostalinverter/pom.xml +++ b/bundles/org.openhab.binding.kostalinverter/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lametrictime/pom.xml b/bundles/org.openhab.binding.lametrictime/pom.xml index bede4c495e480..d1e26397b98da 100644 --- a/bundles/org.openhab.binding.lametrictime/pom.xml +++ b/bundles/org.openhab.binding.lametrictime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/LaMetricTimeHandlerFactory.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/LaMetricTimeHandlerFactory.java index 06c1467db7dc1..aa3aca0aad260 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/LaMetricTimeHandlerFactory.java +++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/LaMetricTimeHandlerFactory.java @@ -181,5 +181,4 @@ private synchronized ClientBuilder getClientBuilder() { } return clientBuilder; } - } diff --git a/bundles/org.openhab.binding.leapmotion/pom.xml b/bundles/org.openhab.binding.leapmotion/pom.xml index 28fcdba1bd310..d6a14f26187f9 100644 --- a/bundles/org.openhab.binding.leapmotion/pom.xml +++ b/bundles/org.openhab.binding.leapmotion/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lghombot/pom.xml b/bundles/org.openhab.binding.lghombot/pom.xml index 991eeeacd54ac..995eda95778d1 100644 --- a/bundles/org.openhab.binding.lghombot/pom.xml +++ b/bundles/org.openhab.binding.lghombot/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lgtvserial/pom.xml b/bundles/org.openhab.binding.lgtvserial/pom.xml index c4f259436ccf8..cac8967028606 100644 --- a/bundles/org.openhab.binding.lgtvserial/pom.xml +++ b/bundles/org.openhab.binding.lgtvserial/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lgwebos/pom.xml b/bundles/org.openhab.binding.lgwebos/pom.xml index 19d7e9b18629d..edf8c7c6aafaf 100644 --- a/bundles/org.openhab.binding.lgwebos/pom.xml +++ b/bundles/org.openhab.binding.lgwebos/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/action/ILGWebOSActions.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/action/ILGWebOSActions.java index 6de651eb8c775..5eb004b054e3b 100644 --- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/action/ILGWebOSActions.java +++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/action/ILGWebOSActions.java @@ -43,5 +43,4 @@ public interface ILGWebOSActions { public void decreaseChannel(); public void sendRCButton(String rcButton); - } diff --git a/bundles/org.openhab.binding.lifx/pom.xml b/bundles/org.openhab.binding.lifx/pom.xml index 2a9da1cb01709..fb438b1284904 100644 --- a/bundles/org.openhab.binding.lifx/pom.xml +++ b/bundles/org.openhab.binding.lifx/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.linky/pom.xml b/bundles/org.openhab.binding.linky/pom.xml index 941f252a68c00..8e8fe2d2c8025 100644 --- a/bundles/org.openhab.binding.linky/pom.xml +++ b/bundles/org.openhab.binding.linky/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.linuxinput/pom.xml b/bundles/org.openhab.binding.linuxinput/pom.xml index 5c9a8a8450b8f..bcef9bb27225b 100644 --- a/bundles/org.openhab.binding.linuxinput/pom.xml +++ b/bundles/org.openhab.binding.linuxinput/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lirc/pom.xml b/bundles/org.openhab.binding.lirc/pom.xml index 634c05b6cdd9f..fee93867e75fc 100644 --- a/bundles/org.openhab.binding.lirc/pom.xml +++ b/bundles/org.openhab.binding.lirc/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.logreader/pom.xml b/bundles/org.openhab.binding.logreader/pom.xml index 23bdf6429ca62..c748ab3403b02 100644 --- a/bundles/org.openhab.binding.logreader/pom.xml +++ b/bundles/org.openhab.binding.logreader/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.logreader/src/main/java/org/openhab/binding/logreader/internal/handler/LogHandler.java b/bundles/org.openhab.binding.logreader/src/main/java/org/openhab/binding/logreader/internal/handler/LogHandler.java index 3db263fceb2eb..00b4233575355 100644 --- a/bundles/org.openhab.binding.logreader/src/main/java/org/openhab/binding/logreader/internal/handler/LogHandler.java +++ b/bundles/org.openhab.binding.logreader/src/main/java/org/openhab/binding/logreader/internal/handler/LogHandler.java @@ -14,7 +14,6 @@ import static org.openhab.binding.logreader.internal.LogReaderBindingConstants.*; -import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.regex.PatternSyntaxException; diff --git a/bundles/org.openhab.binding.loxone/pom.xml b/bundles/org.openhab.binding.loxone/pom.xml index 9ce38961f16c0..7063509ff206a 100644 --- a/bundles/org.openhab.binding.loxone/pom.xml +++ b/bundles/org.openhab.binding.loxone/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lutron/pom.xml b/bundles/org.openhab.binding.lutron/pom.xml index ccf6b5902fd1e..3beefe522133b 100644 --- a/bundles/org.openhab.binding.lutron/pom.xml +++ b/bundles/org.openhab.binding.lutron/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/action/IDimmerActions.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/action/IDimmerActions.java index 9e3ad90c609bd..551e8a6598a96 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/action/IDimmerActions.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/action/IDimmerActions.java @@ -27,5 +27,4 @@ public interface IDimmerActions { public void setLevel(@Nullable Double level, @Nullable Double fadeTime, @Nullable Double delayTime); - } diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/LutronHandlerFactory.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/LutronHandlerFactory.java index 5c878c9488bbf..b081905d6da0b 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/LutronHandlerFactory.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/LutronHandlerFactory.java @@ -111,7 +111,8 @@ public class LutronHandlerFactory extends BaseThingHandlerFactory { private final HttpClient httpClient; @Activate - public LutronHandlerFactory(final @Reference SerialPortManager serialPortManager, @Reference HttpClientFactory httpClientFactory) { + public LutronHandlerFactory(final @Reference SerialPortManager serialPortManager, + @Reference HttpClientFactory httpClientFactory) { this.serialPortManager = serialPortManager; this.httpClient = httpClientFactory.getCommonHttpClient(); } diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/keypadconfig/KeypadConfigTabletopSeetouch.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/keypadconfig/KeypadConfigTabletopSeetouch.java index 5e906d0443599..2cd7fe7f0b8cd 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/keypadconfig/KeypadConfigTabletopSeetouch.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/keypadconfig/KeypadConfigTabletopSeetouch.java @@ -115,16 +115,16 @@ public ComponentType type() { private static final List BUTTON_GROUPBOTTOM_RL = Arrays.asList(Component.BUTTON16, Component.BUTTON17, Component.LOWER3, Component.RAISE3); - private static final List BUTTON_GROUPBOTTOM_CRL = Arrays.asList(Component.LOWER1, Component.RAISE1, - Component.LOWER2, Component.RAISE2, Component.LOWER3, Component.RAISE3); + private static final List BUTTON_GROUPBOTTOM_CRL = Arrays.asList(Component.LOWER1, + Component.RAISE1, Component.LOWER2, Component.RAISE2, Component.LOWER3, Component.RAISE3); private static final List BUTTON_GROUPBOTTOM_GENERIC = Arrays.asList(Component.BUTTON16, Component.BUTTON17, Component.LOWER1, Component.RAISE1, Component.LOWER2, Component.RAISE2, Component.LOWER3, Component.RAISE3); - private static final List LED_GROUP1 = Arrays.asList(Component.LED1, Component.LED2, Component.LED3, - Component.LED4, Component.LED5); - private static final List LED_GROUP2 = Arrays.asList(Component.LED6, Component.LED7, Component.LED8, - Component.LED9, Component.LED10); + private static final List LED_GROUP1 = Arrays.asList(Component.LED1, Component.LED2, + Component.LED3, Component.LED4, Component.LED5); + private static final List LED_GROUP2 = Arrays.asList(Component.LED6, Component.LED7, + Component.LED8, Component.LED9, Component.LED10); private static final List LED_GROUP3 = Arrays.asList(Component.LED11, Component.LED12, Component.LED13, Component.LED14, Component.LED15); @@ -151,15 +151,16 @@ public KeypadConfigTabletopSeetouch() { modelData.put("T10RL", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUPBOTTOM_RL, LED_GROUP1, LED_GROUP2, LED_GROUPBOTTOM_RL)); - modelData.put("T15RL", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUP3, BUTTON_GROUPBOTTOM_RL, LED_GROUP1, - LED_GROUP2, LED_GROUP3, LED_GROUPBOTTOM_RL)); + modelData.put("T15RL", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUP3, BUTTON_GROUPBOTTOM_RL, + LED_GROUP1, LED_GROUP2, LED_GROUP3, LED_GROUPBOTTOM_RL)); modelData.put("T5CRL", combinedList(BUTTON_GROUP1, BUTTON_GROUPBOTTOM_CRL, LED_GROUP1)); - modelData.put("T10CRL", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUPBOTTOM_CRL, LED_GROUP1, LED_GROUP2)); + modelData.put("T10CRL", + combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUPBOTTOM_CRL, LED_GROUP1, LED_GROUP2)); - modelData.put("T15CRL", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUP3, BUTTON_GROUPBOTTOM_CRL, LED_GROUP1, - LED_GROUP2, LED_GROUP3)); + modelData.put("T15CRL", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUP3, BUTTON_GROUPBOTTOM_CRL, + LED_GROUP1, LED_GROUP2, LED_GROUP3)); modelData.put("Generic", combinedList(BUTTON_GROUP1, BUTTON_GROUP2, BUTTON_GROUP3, BUTTON_GROUPBOTTOM_GENERIC, LED_GROUP1, LED_GROUP2, LED_GROUP3, LED_GROUPBOTTOM_RL)); // Superset of all models diff --git a/bundles/org.openhab.binding.lutron/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.lutron/src/main/resources/ESH-INF/thing/thing-types.xml index ca7b759d3a8c6..75a5ed8db0774 100644 --- a/bundles/org.openhab.binding.lutron/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.lutron/src/main/resources/ESH-INF/thing/thing-types.xml @@ -94,7 +94,8 @@ If set to true, dimmer will go to the last non-zero level set when an ON command is received. - If the last level cannot be determined, the value of onLevel will be used instead. + If the + last level cannot be determined, the value of onLevel will be used instead. false true diff --git a/bundles/org.openhab.binding.mail/pom.xml b/bundles/org.openhab.binding.mail/pom.xml index ac0bf7ac65704..9f277df68a8fa 100644 --- a/bundles/org.openhab.binding.mail/pom.xml +++ b/bundles/org.openhab.binding.mail/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.max/pom.xml b/bundles/org.openhab.binding.max/pom.xml index 49cb9ef1f3b19..807372d683240 100644 --- a/bundles/org.openhab.binding.max/pom.xml +++ b/bundles/org.openhab.binding.max/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mcp23017/pom.xml b/bundles/org.openhab.binding.mcp23017/pom.xml index 742954b840381..04e1cc50ef771 100644 --- a/bundles/org.openhab.binding.mcp23017/pom.xml +++ b/bundles/org.openhab.binding.mcp23017/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.melcloud/pom.xml b/bundles/org.openhab.binding.melcloud/pom.xml index cd62cd4698a34..4b831f643666e 100644 --- a/bundles/org.openhab.binding.melcloud/pom.xml +++ b/bundles/org.openhab.binding.melcloud/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.meteoalerte/pom.xml b/bundles/org.openhab.binding.meteoalerte/pom.xml index 7afd5e7266da2..fe7770cf72a1d 100644 --- a/bundles/org.openhab.binding.meteoalerte/pom.xml +++ b/bundles/org.openhab.binding.meteoalerte/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/feature/feature.xml b/bundles/org.openhab.binding.meteoalerte/src/main/feature/feature.xml index 1cf6357c83694..3160a15d72368 100644 --- a/bundles/org.openhab.binding.meteoalerte/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.meteoalerte/src/main/feature/feature.xml @@ -1,9 +1,9 @@ - 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.meteoalerte/${project.version} - + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.meteoalerte/${project.version} + diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/MeteoAlerteHandlerFactory.java b/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/MeteoAlerteHandlerFactory.java index 5a69891aff49f..728044867cf28 100644 --- a/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/MeteoAlerteHandlerFactory.java +++ b/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/MeteoAlerteHandlerFactory.java @@ -70,5 +70,4 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) { return null; } - } diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/handler/MeteoAlerteHandler.java b/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/handler/MeteoAlerteHandler.java index 27153c1d0cfef..9fea737c88a83 100644 --- a/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/handler/MeteoAlerteHandler.java +++ b/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/handler/MeteoAlerteHandler.java @@ -203,5 +203,4 @@ public void updateDate(String channelId, ZonedDateTime zonedDateTime) { updateState(channelId, new DateTimeType(localDateTime)); } } - } diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/json/ResponseFieldDTO.java b/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/json/ResponseFieldDTO.java index ce8e20019acbe..75ce458c5ede6 100644 --- a/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/json/ResponseFieldDTO.java +++ b/bundles/org.openhab.binding.meteoalerte/src/main/java/org/openhab/binding/meteoalerte/internal/json/ResponseFieldDTO.java @@ -152,5 +152,4 @@ public Optional getDateRun() { } return Optional.empty(); } - } diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/binding/binding.xml b/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/binding/binding.xml index dd7970270cb18..0f28fe6b005f4 100644 --- a/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/binding/binding.xml @@ -1,8 +1,7 @@ - + Meteo Alerte Binding Retrieves Meteo Alert levels in France diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/thing/thing-types.xml index 07a7f4d5da86f..5b8ac5553540d 100644 --- a/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.meteoalerte/src/main/resources/ESH-INF/thing/thing-types.xml @@ -1,5 +1,6 @@ - @@ -56,8 +57,8 @@ - - + + @@ -202,8 +203,6 @@ Image Pictogramme associé au niveau d'alerte. - + - - diff --git a/bundles/org.openhab.binding.meteoblue/pom.xml b/bundles/org.openhab.binding.meteoblue/pom.xml index c22912e7f8762..38eb3099e6f0d 100644 --- a/bundles/org.openhab.binding.meteoblue/pom.xml +++ b/bundles/org.openhab.binding.meteoblue/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.meteostick/pom.xml b/bundles/org.openhab.binding.meteostick/pom.xml index 30ffe123e4f23..7414f15d1efc3 100644 --- a/bundles/org.openhab.binding.meteostick/pom.xml +++ b/bundles/org.openhab.binding.meteostick/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.miele/pom.xml b/bundles/org.openhab.binding.miele/pom.xml index e0c5d5ddc84b7..7de452758d500 100644 --- a/bundles/org.openhab.binding.miele/pom.xml +++ b/bundles/org.openhab.binding.miele/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mihome/pom.xml b/bundles/org.openhab.binding.mihome/pom.xml index 3ef341cd8953d..6bd5b3c13fc11 100644 --- a/bundles/org.openhab.binding.mihome/pom.xml +++ b/bundles/org.openhab.binding.mihome/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.miio/pom.xml b/bundles/org.openhab.binding.miio/pom.xml index 6bee063567b2e..c78c25078e2a5 100644 --- a/bundles/org.openhab.binding.miio/pom.xml +++ b/bundles/org.openhab.binding.miio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.openhab.addons.bundles diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java index 68c8eea269be0..129c3c316988b 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java @@ -423,5 +423,4 @@ public ArrayList getObstacles() { public byte[] getBlocks() { return blocks; } - } diff --git a/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/commonChannels.xml b/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/commonChannels.xml index 22298aa5f333b..e4fa871ca9b7b 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/commonChannels.xml +++ b/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/commonChannels.xml @@ -7,10 +7,10 @@ - - - - + + + + @@ -18,22 +18,22 @@ String - + String - + Number - + Number - + @@ -152,90 +152,90 @@ Number - + Number - + Number Particulate Matter 2.5 - + Number Carbon Dioxide - + Number Total Volatile Organic Compounds - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number @@ -256,7 +256,7 @@ Number - + String @@ -271,42 +271,42 @@ Number - + Number - + Number - + Number - + Switch - + String - + Switch - + Switch - + String @@ -334,7 +334,7 @@ Number - + Switch @@ -366,7 +366,7 @@ Switch - + String @@ -382,22 +382,22 @@ Number - + Number - + Number - + Number - + String @@ -421,22 +421,22 @@ Number - + Number - + Number - + Number - + Number diff --git a/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/vacuumThing.xml b/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/vacuumThing.xml index c3ca091180805..236e9c5b39343 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/vacuumThing.xml +++ b/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/vacuumThing.xml @@ -8,90 +8,90 @@ - - - - - - - + + + + + + + Xiaomi - + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + @@ -99,12 +99,12 @@ Number - + Number - + Switch @@ -113,113 +113,113 @@ String - + Number - + Number - + Number - + Number Energy - + Number - + String - + Number - + Number - + Switch - + Switch - + Switch - + Switch - - + + Number - + Number - + Number - + Number - + Number - + Number - + Number - + Number - + @@ -296,17 +296,17 @@ Number Total Cleaning Time in minutes - + Number - + Number - + @@ -315,44 +315,44 @@ Last Cleaning Start Time Date - + DateTime Last Cleaning End Time Date - + Number Cleaning Duration in minutes - + Number - + Number - + Number - + String - + Image - + diff --git a/bundles/org.openhab.binding.milight/pom.xml b/bundles/org.openhab.binding.milight/pom.xml index b18461d1bcfa7..2451c11f5f5e1 100644 --- a/bundles/org.openhab.binding.milight/pom.xml +++ b/bundles/org.openhab.binding.milight/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.millheat/pom.xml b/bundles/org.openhab.binding.millheat/pom.xml index 3c3a8667adbf5..b85701e919d72 100644 --- a/bundles/org.openhab.binding.millheat/pom.xml +++ b/bundles/org.openhab.binding.millheat/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.minecraft/pom.xml b/bundles/org.openhab.binding.minecraft/pom.xml index 2813d26ea8743..d43ffc28a93d4 100644 --- a/bundles/org.openhab.binding.minecraft/pom.xml +++ b/bundles/org.openhab.binding.minecraft/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java index 963c22ebf6d73..309cadfa5ccd1 100644 --- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java +++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java @@ -101,9 +101,8 @@ public synchronized void registerPollTask(int address, int length, ModbusReadFun throw new IllegalStateException("registerPollTask called without proper configuration"); } - ModbusReadRequestBlueprint request = new ModbusReadRequestBlueprint(getSlaveId(), - readFunctionCode, address, length, myconfig.getMaxTries()); - + ModbusReadRequestBlueprint request = new ModbusReadRequestBlueprint(getSlaveId(), readFunctionCode, address, + length, myconfig.getMaxTries()); long refreshMillis = myconfig.getRefreshMillis(); @@ -205,8 +204,8 @@ protected void writeInt16(int address, short shortValue) { ModbusRegister register = new ModbusRegister(b1, b2); ModbusRegisterArray data = new ModbusRegisterArray(new ModbusRegister[] { register }); - ModbusWriteRegisterRequestBlueprint request = new ModbusWriteRegisterRequestBlueprint(slaveId, - address, data, false, myconfig.getMaxTries()); + ModbusWriteRegisterRequestBlueprint request = new ModbusWriteRegisterRequestBlueprint(slaveId, address, data, + false, myconfig.getMaxTries()); mycomms.submitOneTimeWrite(request, result -> { if (hasConfigurationError()) { @@ -214,7 +213,9 @@ protected void writeInt16(int address, short shortValue) { } logger.debug("Successful write, matching request {}", request); StiebelEltronHandler.this.updateStatus(ThingStatus.ONLINE); - }, failure -> {StiebelEltronHandler.this.handleWriteError(failure);}); + }, failure -> { + StiebelEltronHandler.this.handleWriteError(failure); + }); } /** @@ -675,7 +676,6 @@ protected void handleWriteError(AsyncModbusFailure String.format("Error with write: %s: %s", cls, msg)); } - /** * Returns true, if we're in a CONFIGURATION_ERROR state * diff --git a/bundles/org.openhab.binding.modbus.sunspec/pom.xml b/bundles/org.openhab.binding.modbus.sunspec/pom.xml index 4888fa8bebc26..5daa13aad1b00 100644 --- a/bundles/org.openhab.binding.modbus.sunspec/pom.xml +++ b/bundles/org.openhab.binding.modbus.sunspec/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.modbus/pom.xml b/bundles/org.openhab.binding.modbus/pom.xml index d1943ef0916a5..317cc119d70e0 100644 --- a/bundles/org.openhab.binding.modbus/pom.xml +++ b/bundles/org.openhab.binding.modbus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mpd/pom.xml b/bundles/org.openhab.binding.mpd/pom.xml index 0434b6dc7b127..be3543a676354 100644 --- a/bundles/org.openhab.binding.mpd/pom.xml +++ b/bundles/org.openhab.binding.mpd/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mqtt.generic/pom.xml b/bundles/org.openhab.binding.mqtt.generic/pom.xml index b31c31a1706bf..0321d0481aa95 100644 --- a/bundles/org.openhab.binding.mqtt.generic/pom.xml +++ b/bundles/org.openhab.binding.mqtt.generic/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml index 11b2e15d33c49..c6fd539d24389 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml +++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mqtt.homie/pom.xml b/bundles/org.openhab.binding.mqtt.homie/pom.xml index 65b81cabd7b2b..78ff3026f2182 100644 --- a/bundles/org.openhab.binding.mqtt.homie/pom.xml +++ b/bundles/org.openhab.binding.mqtt.homie/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.mqtt/pom.xml b/bundles/org.openhab.binding.mqtt/pom.xml index c48ebc3a7a33b..2ebba028f110a 100644 --- a/bundles/org.openhab.binding.mqtt/pom.xml +++ b/bundles/org.openhab.binding.mqtt/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nanoleaf/pom.xml b/bundles/org.openhab.binding.nanoleaf/pom.xml index e50dddda9cab6..d8fb6c8fe5822 100644 --- a/bundles/org.openhab.binding.nanoleaf/pom.xml +++ b/bundles/org.openhab.binding.nanoleaf/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.neato/pom.xml b/bundles/org.openhab.binding.neato/pom.xml index d4c702f89b37b..81fc24e5342ec 100644 --- a/bundles/org.openhab.binding.neato/pom.xml +++ b/bundles/org.openhab.binding.neato/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java index 0132aeae8404c..7bc836a3ac5d7 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java @@ -12,6 +12,11 @@ */ package org.openhab.binding.neato.internal; +import static org.openhab.binding.neato.internal.classes.Category.HOUSE; +import static org.openhab.binding.neato.internal.classes.Category.MAP; +import static org.openhab.binding.neato.internal.classes.Mode.TURBO; +import static org.openhab.binding.neato.internal.classes.NavigationMode.DEEP; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -38,11 +43,6 @@ import com.google.gson.Gson; -import static org.openhab.binding.neato.internal.classes.Category.HOUSE; -import static org.openhab.binding.neato.internal.classes.Category.MAP; -import static org.openhab.binding.neato.internal.classes.Mode.TURBO; -import static org.openhab.binding.neato.internal.classes.NavigationMode.DEEP; - /** * The {@link NeatoRobot} class defines common constants, which are * used across the whole binding. diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Category.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Category.java index 27f6013aee243..e003c4d3a16e0 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Category.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Category.java @@ -25,6 +25,7 @@ public enum Category { HOUSE(2), SPOT(3), MAP(4); + private final int category; Category(int category) { @@ -34,5 +35,4 @@ public enum Category { public int getCategory() { return category; } - } diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Mode.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Mode.java index 8eb5a8eacd02f..9112e20032b9b 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Mode.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Mode.java @@ -33,5 +33,4 @@ public enum Mode { public int getMode() { return mode; } - } diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NavigationMode.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NavigationMode.java index 607dd0a711b4e..8263c2b656903 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NavigationMode.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NavigationMode.java @@ -24,6 +24,7 @@ public enum NavigationMode { NORMAL(1), EXTRA_CARE(2), DEEP(3); // Note that navigationMode can only be set to 3 if mode is 2, otherwise an error will be returned. + private final int navigationMode; NavigationMode(int navigationMode) { @@ -33,5 +34,4 @@ public enum NavigationMode { public int getNavigationMode() { return navigationMode; } - } diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NeatoState.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NeatoState.java index 9f5ffb73f1192..952b5796d6b79 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NeatoState.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/NeatoState.java @@ -191,20 +191,10 @@ public Meta getMeta() { @Override public String toString() { - return "NeatoState{" + - "version=" + version + - ", reqId='" + reqId + '\'' + - ", result='" + result + '\'' + - ", error='" + error + '\'' + - ", data=" + data + - ", state=" + state + - ", action=" + action + - ", cleaning=" + cleaning + - ", details=" + details + - ", availableCommands=" + availableCommands + - ", availableServices=" + availableServices + - ", meta=" + meta + - '}'; + return "NeatoState{" + "version=" + version + ", reqId='" + reqId + '\'' + ", result='" + result + '\'' + + ", error='" + error + '\'' + ", data=" + data + ", state=" + state + ", action=" + action + + ", cleaning=" + cleaning + ", details=" + details + ", availableCommands=" + availableCommands + + ", availableServices=" + availableServices + ", meta=" + meta + '}'; } public void setMeta(Meta meta) { diff --git a/bundles/org.openhab.binding.neeo/pom.xml b/bundles/org.openhab.binding.neeo/pom.xml index 89fdca7f57a01..e2e22388621a3 100644 --- a/bundles/org.openhab.binding.neeo/pom.xml +++ b/bundles/org.openhab.binding.neeo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.neohub/pom.xml b/bundles/org.openhab.binding.neohub/pom.xml index 9a27996bfeedf..6c0273d358fc9 100644 --- a/bundles/org.openhab.binding.neohub/pom.xml +++ b/bundles/org.openhab.binding.neohub/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nest/pom.xml b/bundles/org.openhab.binding.nest/pom.xml index ca12acf251279..c4ce490fce932 100644 --- a/bundles/org.openhab.binding.nest/pom.xml +++ b/bundles/org.openhab.binding.nest/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.netatmo/pom.xml b/bundles/org.openhab.binding.netatmo/pom.xml index e07459ce83510..a7c19e293e1ea 100644 --- a/bundles/org.openhab.binding.netatmo/pom.xml +++ b/bundles/org.openhab.binding.netatmo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.network/pom.xml b/bundles/org.openhab.binding.network/pom.xml index 017f293958b81..401534b9c120e 100644 --- a/bundles/org.openhab.binding.network/pom.xml +++ b/bundles/org.openhab.binding.network/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/WakeOnLanPacketSender.java b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/WakeOnLanPacketSender.java index 6c8499728472c..de09d27fa86ae 100644 --- a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/WakeOnLanPacketSender.java +++ b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/WakeOnLanPacketSender.java @@ -126,5 +126,4 @@ private Stream broadcastAddressStream() { } }).filter(Objects::nonNull); } - } diff --git a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/action/NetworkActions.java b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/action/NetworkActions.java index ed1868c42a857..18f1b22fd8b1b 100644 --- a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/action/NetworkActions.java +++ b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/action/NetworkActions.java @@ -88,5 +88,4 @@ private static INetworkActions invokeMethodOf(@Nullable ThingActions actions) { } throw new IllegalArgumentException("Actions is not an instance of " + NetworkActions.class.getName()); } - } diff --git a/bundles/org.openhab.binding.network/src/test/java/org/openhab/binding/network/internal/WakeOnLanPacketSenderTest.java b/bundles/org.openhab.binding.network/src/test/java/org/openhab/binding/network/internal/WakeOnLanPacketSenderTest.java index 4812d3c448266..f0a93e8f91ed0 100644 --- a/bundles/org.openhab.binding.network/src/test/java/org/openhab/binding/network/internal/WakeOnLanPacketSenderTest.java +++ b/bundles/org.openhab.binding.network/src/test/java/org/openhab/binding/network/internal/WakeOnLanPacketSenderTest.java @@ -94,5 +94,4 @@ public void sendWithTooLongMacAddressThrowsException() { public void sendWithUnsupportedSeparatorInMacAddressThrowsException() { new WakeOnLanPacketSender("6f=70=65=6e=48=41").sendPacket(); } - } diff --git a/bundles/org.openhab.binding.networkupstools/pom.xml b/bundles/org.openhab.binding.networkupstools/pom.xml index c2113c3cf8bd0..b7d423af9d51a 100644 --- a/bundles/org.openhab.binding.networkupstools/pom.xml +++ b/bundles/org.openhab.binding.networkupstools/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nibeheatpump/pom.xml b/bundles/org.openhab.binding.nibeheatpump/pom.xml index 88ce84d5a9ad3..9beac625e11d6 100644 --- a/bundles/org.openhab.binding.nibeheatpump/pom.xml +++ b/bundles/org.openhab.binding.nibeheatpump/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nibeuplink/pom.xml b/bundles/org.openhab.binding.nibeuplink/pom.xml index 1c64846c211de..bfb21c915c71e 100644 --- a/bundles/org.openhab.binding.nibeuplink/pom.xml +++ b/bundles/org.openhab.binding.nibeuplink/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nikobus/pom.xml b/bundles/org.openhab.binding.nikobus/pom.xml index fd48d5b0d64e9..0701d673c2392 100644 --- a/bundles/org.openhab.binding.nikobus/pom.xml +++ b/bundles/org.openhab.binding.nikobus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nikohomecontrol/pom.xml b/bundles/org.openhab.binding.nikohomecontrol/pom.xml index 65ea2798043a2..6da6d245617be 100644 --- a/bundles/org.openhab.binding.nikohomecontrol/pom.xml +++ b/bundles/org.openhab.binding.nikohomecontrol/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.novafinedust/pom.xml b/bundles/org.openhab.binding.novafinedust/pom.xml index 3b51dbff945bc..ae43858fa21d6 100644 --- a/bundles/org.openhab.binding.novafinedust/pom.xml +++ b/bundles/org.openhab.binding.novafinedust/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.novafinedust/src/main/feature/feature.xml b/bundles/org.openhab.binding.novafinedust/src/main/feature/feature.xml index 0c485318fc7c4..2ae0bdb28a981 100644 --- a/bundles/org.openhab.binding.novafinedust/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.novafinedust/src/main/feature/feature.xml @@ -1,10 +1,10 @@ - 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.openhab.addons.bundles/org.openhab.binding.novafinedust/${project.version} - + + openhab-runtime-base + openhab-transport-serial + mvn:org.openhab.addons.bundles/org.openhab.binding.novafinedust/${project.version} + diff --git a/bundles/org.openhab.binding.novafinedust/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.novafinedust/src/main/resources/ESH-INF/thing/thing-types.xml index b44f880cf0483..8172d98642b0c 100644 --- a/bundles/org.openhab.binding.novafinedust/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.novafinedust/src/main/resources/ESH-INF/thing/thing-types.xml @@ -9,8 +9,8 @@ Nova SDS011 Fine Dust Sensor connected via USB - - + + @@ -32,7 +32,8 @@ 1 true - Device will report every x minutes and sleep for x*60 - 30 seconds afterwards, 0 = as fast as possible without sleep + Device will report every x minutes and sleep for x*60 - 30 seconds afterwards, 0 = as fast as possible + without sleep 10 diff --git a/bundles/org.openhab.binding.ntp/pom.xml b/bundles/org.openhab.binding.ntp/pom.xml index 331a66e81c73c..199d11ef91864 100644 --- a/bundles/org.openhab.binding.ntp/pom.xml +++ b/bundles/org.openhab.binding.ntp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.nuki/pom.xml b/bundles/org.openhab.binding.nuki/pom.xml index e176a0e0e6289..4615990fe0ad2 100644 --- a/bundles/org.openhab.binding.nuki/pom.xml +++ b/bundles/org.openhab.binding.nuki/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.oceanic/pom.xml b/bundles/org.openhab.binding.oceanic/pom.xml index 1d21ae62ddd97..7c1262890a2f7 100644 --- a/bundles/org.openhab.binding.oceanic/pom.xml +++ b/bundles/org.openhab.binding.oceanic/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.ojelectronics/pom.xml b/bundles/org.openhab.binding.ojelectronics/pom.xml index 22300864a3ae1..187cfe921b7ea 100644 --- a/bundles/org.openhab.binding.ojelectronics/pom.xml +++ b/bundles/org.openhab.binding.ojelectronics/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.omnikinverter/pom.xml b/bundles/org.openhab.binding.omnikinverter/pom.xml index a9a866e96c194..b4b44ce4a172e 100644 --- a/bundles/org.openhab.binding.omnikinverter/pom.xml +++ b/bundles/org.openhab.binding.omnikinverter/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.onebusaway/pom.xml b/bundles/org.openhab.binding.onebusaway/pom.xml index f41faba0bb189..0c2a0fac800ad 100644 --- a/bundles/org.openhab.binding.onebusaway/pom.xml +++ b/bundles/org.openhab.binding.onebusaway/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.onewire/pom.xml b/bundles/org.openhab.binding.onewire/pom.xml index 9900cc8febf41..6cb2e5323868c 100644 --- a/bundles/org.openhab.binding.onewire/pom.xml +++ b/bundles/org.openhab.binding.onewire/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.onewiregpio/pom.xml b/bundles/org.openhab.binding.onewiregpio/pom.xml index 2123128241883..ad4917dd8ab1a 100644 --- a/bundles/org.openhab.binding.onewiregpio/pom.xml +++ b/bundles/org.openhab.binding.onewiregpio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.onkyo/pom.xml b/bundles/org.openhab.binding.onkyo/pom.xml index ae09661ffe9f5..0b92a84ccd664 100644 --- a/bundles/org.openhab.binding.onkyo/pom.xml +++ b/bundles/org.openhab.binding.onkyo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.opengarage/pom.xml b/bundles/org.openhab.binding.opengarage/pom.xml index b5bf68df25ea9..314b4a145e5e3 100644 --- a/bundles/org.openhab.binding.opengarage/pom.xml +++ b/bundles/org.openhab.binding.opengarage/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.opensprinkler/pom.xml b/bundles/org.openhab.binding.opensprinkler/pom.xml index 9c5322531b4fa..97d01b02c08c3 100644 --- a/bundles/org.openhab.binding.opensprinkler/pom.xml +++ b/bundles/org.openhab.binding.opensprinkler/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.openthermgateway/pom.xml b/bundles/org.openhab.binding.openthermgateway/pom.xml index 349ef05b9f4e8..247328be432fc 100644 --- a/bundles/org.openhab.binding.openthermgateway/pom.xml +++ b/bundles/org.openhab.binding.openthermgateway/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.openuv/pom.xml b/bundles/org.openhab.binding.openuv/pom.xml index df4d0fb37f04f..6e4a081474a06 100644 --- a/bundles/org.openhab.binding.openuv/pom.xml +++ b/bundles/org.openhab.binding.openuv/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.openweathermap/pom.xml b/bundles/org.openhab.binding.openweathermap/pom.xml index 50b20c0c0a6b7..422516d414f5e 100644 --- a/bundles/org.openhab.binding.openweathermap/pom.xml +++ b/bundles/org.openhab.binding.openweathermap/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.openwebnet/pom.xml b/bundles/org.openhab.binding.openwebnet/pom.xml index c1b0eb23c6bdc..9a687222aa3cf 100644 --- a/bundles/org.openhab.binding.openwebnet/pom.xml +++ b/bundles/org.openhab.binding.openwebnet/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.orvibo/pom.xml b/bundles/org.openhab.binding.orvibo/pom.xml index 9bb06b4c84325..8ba6b81b3f816 100644 --- a/bundles/org.openhab.binding.orvibo/pom.xml +++ b/bundles/org.openhab.binding.orvibo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.paradoxalarm/pom.xml b/bundles/org.openhab.binding.paradoxalarm/pom.xml index 0befefb7edf76..d506ea4b2b1a3 100644 --- a/bundles/org.openhab.binding.paradoxalarm/pom.xml +++ b/bundles/org.openhab.binding.paradoxalarm/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/IResponseReceiver.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/IResponseReceiver.java index d773cfaf5ba91..eac78ff890d5f 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/IResponseReceiver.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/IResponseReceiver.java @@ -1,26 +1,26 @@ -/** - * Copyright (c) 2010-2020 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.paradoxalarm.internal.communication; - -import org.eclipse.jdt.annotation.NonNullByDefault; - -/** - * The {@link IResponseReceiver} Used to pass parsed responses from Paradox to original senders of the requests for - * further processing. - * - * @author Konstantin Polihronov - Initial contribution - */ -@NonNullByDefault -public interface IResponseReceiver { - void receiveResponse(IResponse response, IParadoxInitialLoginCommunicator communicator); -} +/** + * Copyright (c) 2010-2020 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.paradoxalarm.internal.communication; + +import org.eclipse.jdt.annotation.NonNullByDefault; + +/** + * The {@link IResponseReceiver} Used to pass parsed responses from Paradox to original senders of the requests for + * further processing. + * + * @author Konstantin Polihronov - Initial contribution + */ +@NonNullByDefault +public interface IResponseReceiver { + void receiveResponse(IResponse response, IParadoxInitialLoginCommunicator communicator); +} diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/crypto/EncryptionHandler.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/crypto/EncryptionHandler.java index 587cf5bbac11a..804fb09b265ca 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/crypto/EncryptionHandler.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/crypto/EncryptionHandler.java @@ -1,285 +1,285 @@ -/** - * Copyright (c) 2010-2020 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.paradoxalarm.internal.communication.crypto; - -import java.util.Arrays; - -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.paradoxalarm.internal.util.ParadoxUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This class is used to encrypt and decrypt communication from/to Paradox system. Singleton pattern. - * - * Paradox encryption is using Rijndael 256-key expansion alghoritm. - * When key is changed the updateKey(byte[]) method needs to be called in front. - * Encrypt and Decrypt methods use the expandedKey field to do their job. - * - * The first packet sent to Paradox is the IP150 password as bytes, extended to 32 bytes with 0xEE. - * The first response contains the key that will be used for the rest of communication. - * - * Most of the coding is copy from Python / rewrite in Java from second link of jpbaracca's PAI repository. Probably - * some of the variables can be named better but I don't understand this code in it's full scope so I preferred to keep - * it as it is. - * - * @author Konstantin Polihronov - Initial contribution - * - * @see Sam Trendholme's page about AES - * @see Github of jpbaracca's work - ParadoxAlarmInterface in - * python - */ -@NonNullByDefault -public class EncryptionHandler { - - private final Logger logger = LoggerFactory.getLogger(EncryptionHandler.class); - - private static final int KEY_ARRAY_LENGTH = 32; - private static final int TABLE_SIZE = 256; - private static final int KEY_LENGTH = 240; - private static final int PAYLOAD_RATE_LENGTH = 16; - private static final int ROUNDS = 14; - - private static final int[] lTable = new int[TABLE_SIZE]; - private static final int[] aTable = new int[TABLE_SIZE]; - - private static EncryptionHandler instance = new EncryptionHandler(new byte[] {}); - static { - generateTables(); - } - - private static void generateTables() { - int a = 1; - int d; - for (int index = 0; index < 255; index++) { - aTable[index] = a & 0xFF; - /* Multiply by three */ - d = (a & 0x80) & 0xFF; - a <<= 1; - if (d == 0x80) { - a ^= 0x1b; - a &= 0xFF; - } - a ^= aTable[index]; - a &= 0xFF; - /* Set the log table value */ - lTable[aTable[index]] = index & 0xFF; - } - aTable[255] = aTable[0]; - lTable[0] = 0; - } - - private final int[] expandedKey = new int[KEY_LENGTH]; - - private EncryptionHandler(byte[] newKey) { - if (newKey.length > 0) { - expandKey(newKey); - } - } - - public static EncryptionHandler getInstance() { - return instance; - } - - public synchronized EncryptionHandler updateKey(byte[] newKey) { - instance = new EncryptionHandler(newKey); - return instance; - } - - public byte[] encrypt(byte[] payload) { - if (payload.length % 16 != 0) { - payload = ParadoxUtil.extendArray(payload, PAYLOAD_RATE_LENGTH); - printArray("Array had to be extended:", payload); - logger.trace("New payload length={}", payload.length); - } - - int[] payloadAsIntArray = ParadoxUtil.toIntArray(payload); - - final int[] s = EncryptionHandlerConstants.S; - byte[] result = new byte[0]; - for (int i = 0; i < payloadAsIntArray.length / 16; i++) { - int[] tempArray = Arrays.copyOfRange(payloadAsIntArray, i * 16, (i + 1) * 16); - keyAddition(tempArray, 0); - - for (int r = 1; r <= ROUNDS; r++) { - sBox(tempArray, s); - shiftRow(tempArray, 0); - if (r != ROUNDS) { - mixColumn(tempArray); - } - keyAddition(tempArray, r * 16); - } - - result = ParadoxUtil.mergeByteArrays(result, ParadoxUtil.toByteArray(tempArray)); - } - - printArray("Encrypted array", result); - return result; - } - - public byte[] decrypt(byte[] payload) { - int[] payloadAsIntArray = ParadoxUtil.toIntArray(payload); - - final int[] si = EncryptionHandlerConstants.Si; - byte[] result = new byte[0]; - for (int i = 0; i < payloadAsIntArray.length / 16; i++) { - int[] tempArray = Arrays.copyOfRange(payloadAsIntArray, i * 16, (i + 1) * 16); - - for (int r = ROUNDS; r > 0; r--) { - keyAddition(tempArray, r * 16); - if (r != ROUNDS) { - invMixColumn(tempArray); - } - sBox(tempArray, si); - shiftRow(tempArray, 1); - } - - keyAddition(tempArray, 0); - - result = ParadoxUtil.mergeByteArrays(result, ParadoxUtil.toByteArray(tempArray)); - } - - printArray("Decrypted array", result); - return result; - } - - private void printArray(String description, byte[] array) { - ParadoxUtil.printByteArray(description, array, array.length); - } - - private byte[] fillArray(byte[] keyBytes) { - byte[] byteArray = new byte[keyBytes.length]; - for (int i = 0; i < keyBytes.length; i++) { - byteArray[i] = (byte) (keyBytes[i] & 0xFF); - } - - byte[] expandedArray = ParadoxUtil.extendArray(byteArray, KEY_ARRAY_LENGTH); - return expandedArray; - } - - private void expandKey(byte[] input) { - // fill array to 32th byte with 0xEE - byte[] filledArray = fillArray(input); - - int[] temp = { 0, 0, 0, 0 }; - for (int i = 0; i < 4; i++) { - for (int j = 0; j < 4; j++) { - expandedKey[j * 4 + i] = filledArray[i * 4 + j] & 0xFF; - } - for (int j = 0; j < 4; j++) { - expandedKey[j * 4 + i + 16] = filledArray[i * 4 + j + 16] & 0xFF; - } - } - - final int[] s = EncryptionHandlerConstants.S; - for (int i = 8; i < 60; i++) { - for (int j = 0; j < 4; j++) { - temp[j] = expandedKey[(((i - 1) & 0xfc) << 2) + ((i - 1) & 0x03) + j * 4]; - } - - if (i % 4 == 0) { - for (int j = 0; j < 4; j++) { - temp[j] = s[temp[j]]; - } - } - - if (i % 8 == 0) { - int tmp = temp[0]; - - for (int j = 1; j < 4; j++) { - temp[j - 1] = temp[j]; - } - - temp[3] = tmp; - temp[0] ^= EncryptionHandlerConstants.RCON[(i / 8 - 1)]; - } - - for (int j = 0; j < 4; j++) { - expandedKey[((i & 0xfc) << 2) + (i & 0x03) - + j * 4] = expandedKey[(((i - 8) & 0xfc) << 2) + ((i - 8) & 0x03) + j * 4] ^ temp[j]; - } - } - } - - private int gmul(int c, int b) { - int s = lTable[c] + lTable[b]; - s %= 255; - s = aTable[s]; - if (b == 0 || c == 0) { - s = 0; - } - return s; - } - - private void sBox(int[] a, int[] box) { - for (int i = 0; i < 16; i++) { - a[i] = box[a[i]]; - } - } - - private void mixColumn(int[] a) { - final int[] xtimetbl = EncryptionHandlerConstants.XTIMETABLE; - - int[] b = new int[] { 0, 0, 0, 0 }; - for (int j = 0; j < 4; j++) { - int tmp = a[j] ^ a[j + 4] ^ a[j + 8] ^ a[j + 12]; - for (int i = 0; i < 4; i++) { - b[i] = a[i * 4 + j]; - } - b[0] ^= xtimetbl[a[j] ^ a[j + 4]] ^ tmp; - b[1] ^= xtimetbl[a[j + 4] ^ a[j + 8]] ^ tmp; - b[2] ^= xtimetbl[a[j + 8] ^ a[j + 12]] ^ tmp; - b[3] ^= xtimetbl[a[j + 12] ^ a[j]] ^ tmp; - - for (int i = 0; i < 4; i++) { - a[i * 4 + j] = b[i]; - } - } - } - - private void invMixColumn(int[] a) { - int[][] b = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; - for (int j = 0; j < 4; j++) { - for (int i = 0; i < 4; i++) { - b[i][j] = gmul(0xe, a[i * 4 + j]) ^ gmul(0xb, a[((i + 1) % 4) * 4 + j]) - ^ gmul(0xd, a[((i + 2) % 4) * 4 + j]) ^ gmul(0x9, a[((i + 3) % 4) * 4 + j]); - } - } - - for (int j = 0; j < 4; j++) { - for (int i = 0; i < 4; i++) { - a[i * 4 + j] = b[i][j]; - } - } - } - - private void shiftRow(int[] a, int d) { - int[] tmpArray = new int[] { 0, 0, 0, 0 }; - for (int i = 1; i < 4; i++) { - for (int j = 0; j < 4; j++) { - int[][][] shifts = EncryptionHandlerConstants.SHIFTS; - int index = i * 4 + (j + shifts[0][i][d]) % 4; - tmpArray[j] = a[index]; - } - for (int j = 0; j < 4; j++) { - a[i * 4 + j] = tmpArray[j]; - } - } - } - - private void keyAddition(int[] result, int startIndex) { - for (int i = 0; i < 16; i++) { - result[i] ^= expandedKey[i + startIndex]; - } - } -} +/** + * Copyright (c) 2010-2020 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.paradoxalarm.internal.communication.crypto; + +import java.util.Arrays; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.openhab.binding.paradoxalarm.internal.util.ParadoxUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This class is used to encrypt and decrypt communication from/to Paradox system. Singleton pattern. + * + * Paradox encryption is using Rijndael 256-key expansion alghoritm. + * When key is changed the updateKey(byte[]) method needs to be called in front. + * Encrypt and Decrypt methods use the expandedKey field to do their job. + * + * The first packet sent to Paradox is the IP150 password as bytes, extended to 32 bytes with 0xEE. + * The first response contains the key that will be used for the rest of communication. + * + * Most of the coding is copy from Python / rewrite in Java from second link of jpbaracca's PAI repository. Probably + * some of the variables can be named better but I don't understand this code in it's full scope so I preferred to keep + * it as it is. + * + * @author Konstantin Polihronov - Initial contribution + * + * @see Sam Trendholme's page about AES + * @see Github of jpbaracca's work - ParadoxAlarmInterface in + * python + */ +@NonNullByDefault +public class EncryptionHandler { + + private final Logger logger = LoggerFactory.getLogger(EncryptionHandler.class); + + private static final int KEY_ARRAY_LENGTH = 32; + private static final int TABLE_SIZE = 256; + private static final int KEY_LENGTH = 240; + private static final int PAYLOAD_RATE_LENGTH = 16; + private static final int ROUNDS = 14; + + private static final int[] lTable = new int[TABLE_SIZE]; + private static final int[] aTable = new int[TABLE_SIZE]; + + private static EncryptionHandler instance = new EncryptionHandler(new byte[] {}); + static { + generateTables(); + } + + private static void generateTables() { + int a = 1; + int d; + for (int index = 0; index < 255; index++) { + aTable[index] = a & 0xFF; + /* Multiply by three */ + d = (a & 0x80) & 0xFF; + a <<= 1; + if (d == 0x80) { + a ^= 0x1b; + a &= 0xFF; + } + a ^= aTable[index]; + a &= 0xFF; + /* Set the log table value */ + lTable[aTable[index]] = index & 0xFF; + } + aTable[255] = aTable[0]; + lTable[0] = 0; + } + + private final int[] expandedKey = new int[KEY_LENGTH]; + + private EncryptionHandler(byte[] newKey) { + if (newKey.length > 0) { + expandKey(newKey); + } + } + + public static EncryptionHandler getInstance() { + return instance; + } + + public synchronized EncryptionHandler updateKey(byte[] newKey) { + instance = new EncryptionHandler(newKey); + return instance; + } + + public byte[] encrypt(byte[] payload) { + if (payload.length % 16 != 0) { + payload = ParadoxUtil.extendArray(payload, PAYLOAD_RATE_LENGTH); + printArray("Array had to be extended:", payload); + logger.trace("New payload length={}", payload.length); + } + + int[] payloadAsIntArray = ParadoxUtil.toIntArray(payload); + + final int[] s = EncryptionHandlerConstants.S; + byte[] result = new byte[0]; + for (int i = 0; i < payloadAsIntArray.length / 16; i++) { + int[] tempArray = Arrays.copyOfRange(payloadAsIntArray, i * 16, (i + 1) * 16); + keyAddition(tempArray, 0); + + for (int r = 1; r <= ROUNDS; r++) { + sBox(tempArray, s); + shiftRow(tempArray, 0); + if (r != ROUNDS) { + mixColumn(tempArray); + } + keyAddition(tempArray, r * 16); + } + + result = ParadoxUtil.mergeByteArrays(result, ParadoxUtil.toByteArray(tempArray)); + } + + printArray("Encrypted array", result); + return result; + } + + public byte[] decrypt(byte[] payload) { + int[] payloadAsIntArray = ParadoxUtil.toIntArray(payload); + + final int[] si = EncryptionHandlerConstants.Si; + byte[] result = new byte[0]; + for (int i = 0; i < payloadAsIntArray.length / 16; i++) { + int[] tempArray = Arrays.copyOfRange(payloadAsIntArray, i * 16, (i + 1) * 16); + + for (int r = ROUNDS; r > 0; r--) { + keyAddition(tempArray, r * 16); + if (r != ROUNDS) { + invMixColumn(tempArray); + } + sBox(tempArray, si); + shiftRow(tempArray, 1); + } + + keyAddition(tempArray, 0); + + result = ParadoxUtil.mergeByteArrays(result, ParadoxUtil.toByteArray(tempArray)); + } + + printArray("Decrypted array", result); + return result; + } + + private void printArray(String description, byte[] array) { + ParadoxUtil.printByteArray(description, array, array.length); + } + + private byte[] fillArray(byte[] keyBytes) { + byte[] byteArray = new byte[keyBytes.length]; + for (int i = 0; i < keyBytes.length; i++) { + byteArray[i] = (byte) (keyBytes[i] & 0xFF); + } + + byte[] expandedArray = ParadoxUtil.extendArray(byteArray, KEY_ARRAY_LENGTH); + return expandedArray; + } + + private void expandKey(byte[] input) { + // fill array to 32th byte with 0xEE + byte[] filledArray = fillArray(input); + + int[] temp = { 0, 0, 0, 0 }; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + expandedKey[j * 4 + i] = filledArray[i * 4 + j] & 0xFF; + } + for (int j = 0; j < 4; j++) { + expandedKey[j * 4 + i + 16] = filledArray[i * 4 + j + 16] & 0xFF; + } + } + + final int[] s = EncryptionHandlerConstants.S; + for (int i = 8; i < 60; i++) { + for (int j = 0; j < 4; j++) { + temp[j] = expandedKey[(((i - 1) & 0xfc) << 2) + ((i - 1) & 0x03) + j * 4]; + } + + if (i % 4 == 0) { + for (int j = 0; j < 4; j++) { + temp[j] = s[temp[j]]; + } + } + + if (i % 8 == 0) { + int tmp = temp[0]; + + for (int j = 1; j < 4; j++) { + temp[j - 1] = temp[j]; + } + + temp[3] = tmp; + temp[0] ^= EncryptionHandlerConstants.RCON[(i / 8 - 1)]; + } + + for (int j = 0; j < 4; j++) { + expandedKey[((i & 0xfc) << 2) + (i & 0x03) + + j * 4] = expandedKey[(((i - 8) & 0xfc) << 2) + ((i - 8) & 0x03) + j * 4] ^ temp[j]; + } + } + } + + private int gmul(int c, int b) { + int s = lTable[c] + lTable[b]; + s %= 255; + s = aTable[s]; + if (b == 0 || c == 0) { + s = 0; + } + return s; + } + + private void sBox(int[] a, int[] box) { + for (int i = 0; i < 16; i++) { + a[i] = box[a[i]]; + } + } + + private void mixColumn(int[] a) { + final int[] xtimetbl = EncryptionHandlerConstants.XTIMETABLE; + + int[] b = new int[] { 0, 0, 0, 0 }; + for (int j = 0; j < 4; j++) { + int tmp = a[j] ^ a[j + 4] ^ a[j + 8] ^ a[j + 12]; + for (int i = 0; i < 4; i++) { + b[i] = a[i * 4 + j]; + } + b[0] ^= xtimetbl[a[j] ^ a[j + 4]] ^ tmp; + b[1] ^= xtimetbl[a[j + 4] ^ a[j + 8]] ^ tmp; + b[2] ^= xtimetbl[a[j + 8] ^ a[j + 12]] ^ tmp; + b[3] ^= xtimetbl[a[j + 12] ^ a[j]] ^ tmp; + + for (int i = 0; i < 4; i++) { + a[i * 4 + j] = b[i]; + } + } + } + + private void invMixColumn(int[] a) { + int[][] b = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; + for (int j = 0; j < 4; j++) { + for (int i = 0; i < 4; i++) { + b[i][j] = gmul(0xe, a[i * 4 + j]) ^ gmul(0xb, a[((i + 1) % 4) * 4 + j]) + ^ gmul(0xd, a[((i + 2) % 4) * 4 + j]) ^ gmul(0x9, a[((i + 3) % 4) * 4 + j]); + } + } + + for (int j = 0; j < 4; j++) { + for (int i = 0; i < 4; i++) { + a[i * 4 + j] = b[i][j]; + } + } + } + + private void shiftRow(int[] a, int d) { + int[] tmpArray = new int[] { 0, 0, 0, 0 }; + for (int i = 1; i < 4; i++) { + for (int j = 0; j < 4; j++) { + int[][][] shifts = EncryptionHandlerConstants.SHIFTS; + int index = i * 4 + (j + shifts[0][i][d]) % 4; + tmpArray[j] = a[index]; + } + for (int j = 0; j < 4; j++) { + a[i * 4 + j] = tmpArray[j]; + } + } + } + + private void keyAddition(int[] result, int startIndex) { + for (int i = 0; i < 16; i++) { + result[i] ^= expandedKey[i + startIndex]; + } + } +} diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/MemoryRequestPayload.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/MemoryRequestPayload.java index 9e636135959db..3dcee93819707 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/MemoryRequestPayload.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/MemoryRequestPayload.java @@ -1,79 +1,79 @@ -/** - * Copyright (c) 2010-2020 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.paradoxalarm.internal.communication.messages; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.paradoxalarm.internal.exceptions.ParadoxException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The {@link MemoryRequestPayload} Abstract class which contains common logic used in RAM and EPROM payload generation - * classes. - * - * @author Konstantin Polihronov - Initial contribution - */ -@NonNullByDefault -public abstract class MemoryRequestPayload implements IPayload { - - private static final int BUFFER_LENGTH = 8; - private static final short MESSAGE_START = (short) ((0x50 << 8) | 0x08); - - private final Logger logger = LoggerFactory.getLogger(MemoryRequestPayload.class); - - private final int address; - private final byte bytesToRead; - - public MemoryRequestPayload(int address, byte bytesToRead) throws ParadoxException { - if (bytesToRead < 1 || bytesToRead > 64) { - throw new ParadoxException("Invalid bytes to read. Valid values are 1 to 64."); - } - - this.address = address; - this.bytesToRead = bytesToRead; - - logTraceHexFormatted("MessageStart: {}", MESSAGE_START); - } - - protected abstract byte calculateControlByte(); - - @Override - public byte[] getBytes() { - byte[] bufferArray = new byte[BUFFER_LENGTH]; - ByteBuffer buffer = ByteBuffer.wrap(bufferArray); - buffer.order(ByteOrder.BIG_ENDIAN).putShort(MESSAGE_START); - buffer.put(calculateControlByte()); - buffer.put((byte) 0x00); - buffer.order(ByteOrder.BIG_ENDIAN).putShort((short) address); - buffer.put(bytesToRead); - buffer.put((byte) 0x00); - return bufferArray; - } - - protected int getAddress() { - return address; - } - - protected void logTraceHexFormatted(String text, int address) { - logTraceOptional(text, "0x%02X,\t", address); - } - - private void logTraceOptional(String text, String format, int address) { - if (logger.isTraceEnabled()) { - logger.trace("Address: {}", String.format(format, address)); - } - } -} +/** + * Copyright (c) 2010-2020 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.paradoxalarm.internal.communication.messages; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.openhab.binding.paradoxalarm.internal.exceptions.ParadoxException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The {@link MemoryRequestPayload} Abstract class which contains common logic used in RAM and EPROM payload generation + * classes. + * + * @author Konstantin Polihronov - Initial contribution + */ +@NonNullByDefault +public abstract class MemoryRequestPayload implements IPayload { + + private static final int BUFFER_LENGTH = 8; + private static final short MESSAGE_START = (short) ((0x50 << 8) | 0x08); + + private final Logger logger = LoggerFactory.getLogger(MemoryRequestPayload.class); + + private final int address; + private final byte bytesToRead; + + public MemoryRequestPayload(int address, byte bytesToRead) throws ParadoxException { + if (bytesToRead < 1 || bytesToRead > 64) { + throw new ParadoxException("Invalid bytes to read. Valid values are 1 to 64."); + } + + this.address = address; + this.bytesToRead = bytesToRead; + + logTraceHexFormatted("MessageStart: {}", MESSAGE_START); + } + + protected abstract byte calculateControlByte(); + + @Override + public byte[] getBytes() { + byte[] bufferArray = new byte[BUFFER_LENGTH]; + ByteBuffer buffer = ByteBuffer.wrap(bufferArray); + buffer.order(ByteOrder.BIG_ENDIAN).putShort(MESSAGE_START); + buffer.put(calculateControlByte()); + buffer.put((byte) 0x00); + buffer.order(ByteOrder.BIG_ENDIAN).putShort((short) address); + buffer.put(bytesToRead); + buffer.put((byte) 0x00); + return bufferArray; + } + + protected int getAddress() { + return address; + } + + protected void logTraceHexFormatted(String text, int address) { + logTraceOptional(text, "0x%02X,\t", address); + } + + private void logTraceOptional(String text, String format, int address) { + if (logger.isTraceEnabled()) { + logger.trace("Address: {}", String.format(format, address)); + } + } +} diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/PartitionCommand.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/PartitionCommand.java index bdc01246b55f7..31e894608a20e 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/PartitionCommand.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/PartitionCommand.java @@ -1,55 +1,55 @@ -/** - * Copyright (c) 2010-2020 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.paradoxalarm.internal.communication.messages; - -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The {@link PartitionCommand} Enum representing the possible commands for a partition with the respective integer - * values that are sent as nibbles in the packet. - * - * @author Konstantin Polihronov - Initial contribution - */ -@NonNullByDefault -public enum PartitionCommand { - UNKNOWN(0), - ARM(2), - STAY_ARM(3), - INSTANT_ARM(4), - FORCE_ARM(5), - DISARM(6), - BEEP(8); - - private final static Logger logger = LoggerFactory.getLogger(PartitionCommand.class); - - private int command; - - PartitionCommand(int command) { - this.command = command; - } - - public int getCommand() { - return command; - } - - public static PartitionCommand parse(String command) { - try { - return PartitionCommand.valueOf(command); - } catch (IllegalArgumentException e) { - logger.debug("Unable to parse command={}. Fallback to UNKNOWN.", command); - return PartitionCommand.UNKNOWN; - } - } -} +/** + * Copyright (c) 2010-2020 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.paradoxalarm.internal.communication.messages; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The {@link PartitionCommand} Enum representing the possible commands for a partition with the respective integer + * values that are sent as nibbles in the packet. + * + * @author Konstantin Polihronov - Initial contribution + */ +@NonNullByDefault +public enum PartitionCommand { + UNKNOWN(0), + ARM(2), + STAY_ARM(3), + INSTANT_ARM(4), + FORCE_ARM(5), + DISARM(6), + BEEP(8); + + private final static Logger logger = LoggerFactory.getLogger(PartitionCommand.class); + + private int command; + + PartitionCommand(int command) { + this.command = command; + } + + public int getCommand() { + return command; + } + + public static PartitionCommand parse(String command) { + try { + return PartitionCommand.valueOf(command); + } catch (IllegalArgumentException e) { + logger.debug("Unable to parse command={}. Fallback to UNKNOWN.", command); + return PartitionCommand.UNKNOWN; + } + } +} diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/util/ParadoxUtil.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/util/ParadoxUtil.java index 5a3d18f9cb16d..a5a0b0431f116 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/util/ParadoxUtil.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/util/ParadoxUtil.java @@ -1,229 +1,229 @@ -/** - * Copyright (c) 2010-2020 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.paradoxalarm.internal.util; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.charset.StandardCharsets; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The {@link ParadoxUtil} Utility class for different calculations / manipulations of data in the model and - * communicators. - * - * @author Konstantin Polihronov - Initial contribution - */ -public class ParadoxUtil { - - private static final String SPACE_DELIMITER = " "; - private final static Logger logger = LoggerFactory.getLogger(ParadoxUtil.class); - - public static byte calculateChecksum(byte[] payload) { - int result = 0; - for (byte everyByte : payload) { - result += everyByte; - } - - return (byte) (result % 256); - } - - public static byte getBit(int value, int bitNumber) { - return (byte) ((value >> bitNumber) & 1); - } - - public static boolean isBitSet(int value, int bitNumber) { - return ((value >> bitNumber) & 1) == 1; - } - - public static void printPacket(String description, byte[] array) { - if (logger.isTraceEnabled()) { - logger.trace("Packet payload size: {}", array[1]); - printByteArray(description, array, array[1] + 16); - } - } - - public static void printByteArray(String description, byte[] array) { - if (array == null) { - logger.trace("Array is null"); - return; - } - printByteArray(description, array, array.length); - } - - public static void printByteArray(String description, byte[] array, int length) { - if (!logger.isTraceEnabled()) { - return; - } - - String result = byteArrayToString(array, length); - if (!result.isEmpty()) { - logger.trace("{}", description + SPACE_DELIMITER + result); - } - } - - public static String byteArrayToString(byte[] array) { - return byteArrayToString(array, array.length); - } - - /** - * - * Returns passed array as HEX string. On every 8 bytes we put space for better readability. Example 16 - * bytes array output: AA47000263000000 03EE00EEEEEEB727 - * - * @param array - * @param length - * @return String - */ - public static String byteArrayToString(byte[] array, int length) { - if (array == null) { - throw new IllegalArgumentException("Array must not be null."); - } - if (length > array.length) { - throw new IllegalArgumentException("Length should be lower than or equal to array length. Length=" + length - + ". Array length=" + array.length); - } - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < length; i++) { - if (i != 0 && i % 8 == 0) { - sb.append(SPACE_DELIMITER); - } - sb.append(String.format("%02X", array[i])); - } - return sb.toString(); - } - - public static byte setBit(byte byteValue, int i, int j) { - if (j == 1) { - return (byte) (byteValue | (1 << i)); - } else { - return (byte) (byteValue & ~(1 << i)); - } - } - - public static byte getHighNibble(byte value) { - return (byte) ((value & 0xF0) >> 4); - } - - public static byte getLowNibble(byte value) { - return (byte) (value & 0x0F); - } - - public static byte[] mergeByteArrays(byte[]... arrays) { - try { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - for (byte[] array : arrays) { - outputStream.write(array); - } - byte[] byteArray = outputStream.toByteArray(); - return byteArray; - } catch (IOException e) { - logger.warn("Exception merging arrays:", e); - return new byte[0]; - } - } - - public static byte[] intToByteArray(int value) { - return ByteBuffer.allocate(Integer.SIZE / Byte.SIZE).order(ByteOrder.BIG_ENDIAN).putInt(value).array(); - } - - public static byte[] shortToByteArray(short value) { - return ByteBuffer.allocate(Short.SIZE / Byte.SIZE).order(ByteOrder.BIG_ENDIAN).putShort(value).array(); - } - - public static byte[] stringToBCD(String pcPassword) { - return stringToBCD(pcPassword, 4); - } - - public static byte[] stringToBCD(String pcPassword, int numberOfDigits) { - byte[] result = new byte[numberOfDigits / 2]; - for (int i = 0, j = 0; i < 2; i++, j += 2) { - String substring = pcPassword.substring(j, j + 1); - int parseInt = Integer.parseInt(substring); - result[i] = (byte) ((parseInt & 0x0F) << 4); - - substring = pcPassword.substring(j + 1, j + 2); - parseInt = Integer.parseInt(substring); - result[i] |= (byte) (parseInt & 0x0F); - } - return result; - } - - /** - * This method fills array with 0xEE based on rate. - * Example: If input array length is 5 and rate is 8 the array will be extended with 3 more bytes filled with 0xEE - * - * @param inputArray - * @param rate - * @return byte[] - */ - public static byte[] extendArray(byte[] inputArray, int rate) { - if (inputArray == null || inputArray.length % rate == 0) { - return inputArray; - } - - final int newLength = inputArray.length + (rate - inputArray.length % rate); - byte[] result = new byte[newLength]; - for (int i = 0; i < result.length; i++) { - if (i < inputArray.length) { - result[i] = inputArray[i]; - } else { - result[i] = (byte) 0xEE; - } - } - return result; - } - - /** - * Returns bytes from string with standard US_ASCII standard charset to ensure everywhere in the binding we use same - * charset. - * - * @param str - * @return byte[] - * - */ - public static byte[] getBytesFromString(String str) { - if (str == null) { - throw new IllegalArgumentException("String must not be null !"); - } - - return str.getBytes(StandardCharsets.US_ASCII); - } - - public static int[] toIntArray(byte[] input) { - if (input == null) { - throw new IllegalArgumentException("Input array must not be null"); - } - int[] result = new int[input.length]; - for (int i = 0; i < input.length; i++) { - result[i] = input[i] & 0xFF; - } - - return result; - } - - public static byte[] toByteArray(int[] input) { - if (input == null) { - throw new IllegalArgumentException("Input array must not be null"); - } - byte[] result = new byte[input.length]; - for (int i = 0; i < input.length; i++) { - result[i] = (byte) (input[i]); - } - - return result; - } -} +/** + * Copyright (c) 2010-2020 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.paradoxalarm.internal.util; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The {@link ParadoxUtil} Utility class for different calculations / manipulations of data in the model and + * communicators. + * + * @author Konstantin Polihronov - Initial contribution + */ +public class ParadoxUtil { + + private static final String SPACE_DELIMITER = " "; + private final static Logger logger = LoggerFactory.getLogger(ParadoxUtil.class); + + public static byte calculateChecksum(byte[] payload) { + int result = 0; + for (byte everyByte : payload) { + result += everyByte; + } + + return (byte) (result % 256); + } + + public static byte getBit(int value, int bitNumber) { + return (byte) ((value >> bitNumber) & 1); + } + + public static boolean isBitSet(int value, int bitNumber) { + return ((value >> bitNumber) & 1) == 1; + } + + public static void printPacket(String description, byte[] array) { + if (logger.isTraceEnabled()) { + logger.trace("Packet payload size: {}", array[1]); + printByteArray(description, array, array[1] + 16); + } + } + + public static void printByteArray(String description, byte[] array) { + if (array == null) { + logger.trace("Array is null"); + return; + } + printByteArray(description, array, array.length); + } + + public static void printByteArray(String description, byte[] array, int length) { + if (!logger.isTraceEnabled()) { + return; + } + + String result = byteArrayToString(array, length); + if (!result.isEmpty()) { + logger.trace("{}", description + SPACE_DELIMITER + result); + } + } + + public static String byteArrayToString(byte[] array) { + return byteArrayToString(array, array.length); + } + + /** + * + * Returns passed array as HEX string. On every 8 bytes we put space for better readability. Example 16 + * bytes array output: AA47000263000000 03EE00EEEEEEB727 + * + * @param array + * @param length + * @return String + */ + public static String byteArrayToString(byte[] array, int length) { + if (array == null) { + throw new IllegalArgumentException("Array must not be null."); + } + if (length > array.length) { + throw new IllegalArgumentException("Length should be lower than or equal to array length. Length=" + length + + ". Array length=" + array.length); + } + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < length; i++) { + if (i != 0 && i % 8 == 0) { + sb.append(SPACE_DELIMITER); + } + sb.append(String.format("%02X", array[i])); + } + return sb.toString(); + } + + public static byte setBit(byte byteValue, int i, int j) { + if (j == 1) { + return (byte) (byteValue | (1 << i)); + } else { + return (byte) (byteValue & ~(1 << i)); + } + } + + public static byte getHighNibble(byte value) { + return (byte) ((value & 0xF0) >> 4); + } + + public static byte getLowNibble(byte value) { + return (byte) (value & 0x0F); + } + + public static byte[] mergeByteArrays(byte[]... arrays) { + try { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + for (byte[] array : arrays) { + outputStream.write(array); + } + byte[] byteArray = outputStream.toByteArray(); + return byteArray; + } catch (IOException e) { + logger.warn("Exception merging arrays:", e); + return new byte[0]; + } + } + + public static byte[] intToByteArray(int value) { + return ByteBuffer.allocate(Integer.SIZE / Byte.SIZE).order(ByteOrder.BIG_ENDIAN).putInt(value).array(); + } + + public static byte[] shortToByteArray(short value) { + return ByteBuffer.allocate(Short.SIZE / Byte.SIZE).order(ByteOrder.BIG_ENDIAN).putShort(value).array(); + } + + public static byte[] stringToBCD(String pcPassword) { + return stringToBCD(pcPassword, 4); + } + + public static byte[] stringToBCD(String pcPassword, int numberOfDigits) { + byte[] result = new byte[numberOfDigits / 2]; + for (int i = 0, j = 0; i < 2; i++, j += 2) { + String substring = pcPassword.substring(j, j + 1); + int parseInt = Integer.parseInt(substring); + result[i] = (byte) ((parseInt & 0x0F) << 4); + + substring = pcPassword.substring(j + 1, j + 2); + parseInt = Integer.parseInt(substring); + result[i] |= (byte) (parseInt & 0x0F); + } + return result; + } + + /** + * This method fills array with 0xEE based on rate. + * Example: If input array length is 5 and rate is 8 the array will be extended with 3 more bytes filled with 0xEE + * + * @param inputArray + * @param rate + * @return byte[] + */ + public static byte[] extendArray(byte[] inputArray, int rate) { + if (inputArray == null || inputArray.length % rate == 0) { + return inputArray; + } + + final int newLength = inputArray.length + (rate - inputArray.length % rate); + byte[] result = new byte[newLength]; + for (int i = 0; i < result.length; i++) { + if (i < inputArray.length) { + result[i] = inputArray[i]; + } else { + result[i] = (byte) 0xEE; + } + } + return result; + } + + /** + * Returns bytes from string with standard US_ASCII standard charset to ensure everywhere in the binding we use same + * charset. + * + * @param str + * @return byte[] + * + */ + public static byte[] getBytesFromString(String str) { + if (str == null) { + throw new IllegalArgumentException("String must not be null !"); + } + + return str.getBytes(StandardCharsets.US_ASCII); + } + + public static int[] toIntArray(byte[] input) { + if (input == null) { + throw new IllegalArgumentException("Input array must not be null"); + } + int[] result = new int[input.length]; + for (int i = 0; i < input.length; i++) { + result[i] = input[i] & 0xFF; + } + + return result; + } + + public static byte[] toByteArray(int[] input) { + if (input == null) { + throw new IllegalArgumentException("Input array must not be null"); + } + byte[] result = new byte[input.length]; + for (int i = 0; i < input.length; i++) { + result[i] = (byte) (input[i]); + } + + return result; + } +} diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/ESH-INF/thing/panel.xml b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/ESH-INF/thing/panel.xml index f22e801ffc3e0..4133ffb101fd8 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/ESH-INF/thing/panel.xml +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/ESH-INF/thing/panel.xml @@ -1,80 +1,80 @@ - - - - - - - - - - Paradox panel various information - - - - - - - - - - - - - - - - - - - String - - Shows the state of the communication to panel (online/offline) - - - - String - - Panel serial number - - - - String - - Panel type (Evo, SP, etc) - - - - String - - Panel hardware version - - - - String - - Panel application version - - - - String - - Boot loader version - - - - Number:ElectricPotential - - Voltage - - - - DateTime - - The current date and time on the panel - - - - + + + + + + + + + + Paradox panel various information + + + + + + + + + + + + + + + + + + + String + + Shows the state of the communication to panel (online/offline) + + + + String + + Panel serial number + + + + String + + Panel type (Evo, SP, etc) + + + + String + + Panel hardware version + + + + String + + Panel application version + + + + String + + Boot loader version + + + + Number:ElectricPotential + + Voltage + + + + DateTime + + The current date and time on the panel + + + + diff --git a/bundles/org.openhab.binding.pentair/pom.xml b/bundles/org.openhab.binding.pentair/pom.xml index 63aa2534db623..30b456fdc166e 100644 --- a/bundles/org.openhab.binding.pentair/pom.xml +++ b/bundles/org.openhab.binding.pentair/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.phc/pom.xml b/bundles/org.openhab.binding.phc/pom.xml index cce37bca061ee..d74b6ec934aec 100644 --- a/bundles/org.openhab.binding.phc/pom.xml +++ b/bundles/org.openhab.binding.phc/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.pioneeravr/pom.xml b/bundles/org.openhab.binding.pioneeravr/pom.xml index 1357cbc770522..a10e0b30e064d 100644 --- a/bundles/org.openhab.binding.pioneeravr/pom.xml +++ b/bundles/org.openhab.binding.pioneeravr/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.pixometer/pom.xml b/bundles/org.openhab.binding.pixometer/pom.xml index 4e6f29467593b..6a5a6245eaa53 100644 --- a/bundles/org.openhab.binding.pixometer/pom.xml +++ b/bundles/org.openhab.binding.pixometer/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.pjlinkdevice/pom.xml b/bundles/org.openhab.binding.pjlinkdevice/pom.xml index 8236487892df8..a077163cdb352 100644 --- a/bundles/org.openhab.binding.pjlinkdevice/pom.xml +++ b/bundles/org.openhab.binding.pjlinkdevice/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.plclogo/pom.xml b/bundles/org.openhab.binding.plclogo/pom.xml index 639a94470c4db..29b70dde5c215 100644 --- a/bundles/org.openhab.binding.plclogo/pom.xml +++ b/bundles/org.openhab.binding.plclogo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.plugwise/pom.xml b/bundles/org.openhab.binding.plugwise/pom.xml index ee236f0cf31d0..ff86a34f5b218 100644 --- a/bundles/org.openhab.binding.plugwise/pom.xml +++ b/bundles/org.openhab.binding.plugwise/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.powermax/pom.xml b/bundles/org.openhab.binding.powermax/pom.xml index d3eec177246fa..b9dd43b451438 100644 --- a/bundles/org.openhab.binding.powermax/pom.xml +++ b/bundles/org.openhab.binding.powermax/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.pulseaudio/pom.xml b/bundles/org.openhab.binding.pulseaudio/pom.xml index 0fe945ec66d00..2a0e099e9a3e4 100644 --- a/bundles/org.openhab.binding.pulseaudio/pom.xml +++ b/bundles/org.openhab.binding.pulseaudio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.pushbullet/pom.xml b/bundles/org.openhab.binding.pushbullet/pom.xml index 9a3255d31ec3a..def52d36d979e 100644 --- a/bundles/org.openhab.binding.pushbullet/pom.xml +++ b/bundles/org.openhab.binding.pushbullet/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.radiothermostat/pom.xml b/bundles/org.openhab.binding.radiothermostat/pom.xml index 833d85e83ae4c..bf8c8dd692c72 100644 --- a/bundles/org.openhab.binding.radiothermostat/pom.xml +++ b/bundles/org.openhab.binding.radiothermostat/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.regoheatpump/pom.xml b/bundles/org.openhab.binding.regoheatpump/pom.xml index 463af4adc1d5b..964eb9987ed92 100644 --- a/bundles/org.openhab.binding.regoheatpump/pom.xml +++ b/bundles/org.openhab.binding.regoheatpump/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.rfxcom/pom.xml b/bundles/org.openhab.binding.rfxcom/pom.xml index 551c9b0a7a834..996158d1e3bce 100644 --- a/bundles/org.openhab.binding.rfxcom/pom.xml +++ b/bundles/org.openhab.binding.rfxcom/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.rme/pom.xml b/bundles/org.openhab.binding.rme/pom.xml index f6b3f36ee3168..28ef42b909318 100644 --- a/bundles/org.openhab.binding.rme/pom.xml +++ b/bundles/org.openhab.binding.rme/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.robonect/pom.xml b/bundles/org.openhab.binding.robonect/pom.xml index 860e0a987c711..d1cbe71687780 100644 --- a/bundles/org.openhab.binding.robonect/pom.xml +++ b/bundles/org.openhab.binding.robonect/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.rotel/pom.xml b/bundles/org.openhab.binding.rotel/pom.xml index 942baa63b6f93..8b9a660ddf165 100644 --- a/bundles/org.openhab.binding.rotel/pom.xml +++ b/bundles/org.openhab.binding.rotel/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.rotelra1x/pom.xml b/bundles/org.openhab.binding.rotelra1x/pom.xml index 09f61c3361b80..0a9c2a6526953 100644 --- a/bundles/org.openhab.binding.rotelra1x/pom.xml +++ b/bundles/org.openhab.binding.rotelra1x/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.russound/pom.xml b/bundles/org.openhab.binding.russound/pom.xml index cf78baebb257a..ba096324cb4aa 100644 --- a/bundles/org.openhab.binding.russound/pom.xml +++ b/bundles/org.openhab.binding.russound/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sagercaster/pom.xml b/bundles/org.openhab.binding.sagercaster/pom.xml index a3c50601ce76b..3d16f43e7c5f7 100644 --- a/bundles/org.openhab.binding.sagercaster/pom.xml +++ b/bundles/org.openhab.binding.sagercaster/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.samsungtv/pom.xml b/bundles/org.openhab.binding.samsungtv/pom.xml index a790d395efb9b..1b8f343f3ce1d 100644 --- a/bundles/org.openhab.binding.samsungtv/pom.xml +++ b/bundles/org.openhab.binding.samsungtv/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.satel/pom.xml b/bundles/org.openhab.binding.satel/pom.xml index bcebdb0712a27..a13e81817abfb 100644 --- a/bundles/org.openhab.binding.satel/pom.xml +++ b/bundles/org.openhab.binding.satel/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.seneye/pom.xml b/bundles/org.openhab.binding.seneye/pom.xml index 7183b28043da3..c05614ea880e6 100644 --- a/bundles/org.openhab.binding.seneye/pom.xml +++ b/bundles/org.openhab.binding.seneye/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.seneye/src/main/java/org/openhab/binding/seneye/internal/handler/SeneyeHandler.java b/bundles/org.openhab.binding.seneye/src/main/java/org/openhab/binding/seneye/internal/handler/SeneyeHandler.java index 3be2de5b6238d..e96ec5666d253 100644 --- a/bundles/org.openhab.binding.seneye/src/main/java/org/openhab/binding/seneye/internal/handler/SeneyeHandler.java +++ b/bundles/org.openhab.binding.seneye/src/main/java/org/openhab/binding/seneye/internal/handler/SeneyeHandler.java @@ -71,7 +71,7 @@ public void newState(SeneyeDeviceReading readings) { if (readings != null) { logger.debug("Updating readings for sensor type {}", seneyeService.seneyeType); switch (seneyeService.seneyeType) { - case 3: + case 3: updateState(CHANNEL_NH4, new DecimalType(readings.nh4.curr)); updateState(CHANNEL_PAR, new DecimalType(readings.par.curr)); updateState(CHANNEL_LUX, new DecimalType(readings.lux.curr)); @@ -90,7 +90,6 @@ public void newState(SeneyeDeviceReading readings) { updateState(CHANNEL_DISCONNECTED, new StringType(readings.status.getDisconnectedString())); } } - } @Override diff --git a/bundles/org.openhab.binding.sensebox/pom.xml b/bundles/org.openhab.binding.sensebox/pom.xml index 5b9d7b8fc41f6..3b84e6d0e4c6b 100644 --- a/bundles/org.openhab.binding.sensebox/pom.xml +++ b/bundles/org.openhab.binding.sensebox/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/box.xml b/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/box.xml index f1ba9d12535ea..749873fe8410e 100644 --- a/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/box.xml +++ b/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/box.xml @@ -10,14 +10,14 @@ This is a senseBox sensor. - - - + + + senseBoxId - + diff --git a/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/channels.xml b/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/channels.xml index 6bc6f5fe9b64a..302d919ea7254 100644 --- a/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.sensebox/src/main/resources/ESH-INF/thing/channels.xml @@ -9,7 +9,7 @@ Box descriptors like Location, description, etc. - + @@ -17,13 +17,13 @@ Measurements as fetched from the API. - - - - - - - + + + + + + + @@ -31,13 +31,13 @@ Timestamps when a measurement was last reported. - - - - - - - + + + + + + + @@ -58,7 +58,7 @@ DateTime Timestamp when data was measured. - + @@ -60,11 +60,11 @@ - - + + - + @@ -78,23 +78,23 @@ - - + + - + Shelly2 in Roller Mode - - - + + + - + @@ -113,22 +113,22 @@ - + - + Shelly2 in Roller Mode - - - + + + - + @@ -160,22 +160,22 @@ - + - + Shelly Plug device with relay and power meter - - - + + + - + @@ -183,12 +183,12 @@ Shelly Plug-S with relay, meter and LED control - - - + + + - + @@ -196,12 +196,12 @@ Shelly Dimmer DimmableLight - - - + + + - + @@ -209,82 +209,82 @@ Shelly Dimmer 2 DimmableLight - - - + + + - + Shelly i3 Device with 3 inputs - - - - + + + + - + A Shelly relay channel - - - - - - + + + + + + A Shelly relay channel - - - - + + + + A Shelly Dimmer channel - - - - - - + + + + + + Input Status - - - - + + + + Controlling the roller mode - - - - - - - + + + + + + + @@ -324,7 +324,7 @@ Dimmer Position the roller (100..0 in %, where 100%=open, 0%=closed) - + String diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/ESH-INF/thing/sensor.xml b/bundles/org.openhab.binding.shelly/src/main/resources/ESH-INF/thing/sensor.xml index 025d30d05b5ab..3131955efc76e 100644 --- a/bundles/org.openhab.binding.shelly/src/main/resources/ESH-INF/thing/sensor.xml +++ b/bundles/org.openhab.binding.shelly/src/main/resources/ESH-INF/thing/sensor.xml @@ -9,12 +9,12 @@ Shelly H&T Sensor - - - + + + - + @@ -22,12 +22,12 @@ Shelly Smoke Sensor (battery powered) - - - + + + - + @@ -35,23 +35,23 @@ Shelly Gas Sensor - - + + - + Shelly Flood Sensor (battery powered) - - - + + + - + @@ -59,12 +59,12 @@ Shelly Door/Window Sensor (battery powered) - - - + + + - + @@ -72,25 +72,25 @@ Shelly Door/Window 2 Sensor (battery powered) - - - + + + - + Shelly Sense Remote IR Controller - - - - + + + + - + @@ -98,12 +98,12 @@ Shelly Button 1 (battery powered) - - - + + + - + @@ -140,17 +140,17 @@ Sense Settings - + Status of the Button - - - - + + + + @@ -257,7 +257,7 @@ CurrentHumidity - + Switch diff --git a/bundles/org.openhab.binding.siemensrds/pom.xml b/bundles/org.openhab.binding.siemensrds/pom.xml index 0db6bdbb58316..f4062b36c90b5 100644 --- a/bundles/org.openhab.binding.siemensrds/pom.xml +++ b/bundles/org.openhab.binding.siemensrds/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.silvercrestwifisocket/pom.xml b/bundles/org.openhab.binding.silvercrestwifisocket/pom.xml index 85d077b5b486a..4ea82323c3222 100644 --- a/bundles/org.openhab.binding.silvercrestwifisocket/pom.xml +++ b/bundles/org.openhab.binding.silvercrestwifisocket/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sinope/pom.xml b/bundles/org.openhab.binding.sinope/pom.xml index 959b160a7f044..44ddf8a8340c7 100644 --- a/bundles/org.openhab.binding.sinope/pom.xml +++ b/bundles/org.openhab.binding.sinope/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sleepiq/pom.xml b/bundles/org.openhab.binding.sleepiq/pom.xml index 51af3f499ba5c..46fb4c4bad9c2 100644 --- a/bundles/org.openhab.binding.sleepiq/pom.xml +++ b/bundles/org.openhab.binding.sleepiq/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.smaenergymeter/pom.xml b/bundles/org.openhab.binding.smaenergymeter/pom.xml index 193409a82e41b..4c3a9c4fb09bd 100644 --- a/bundles/org.openhab.binding.smaenergymeter/pom.xml +++ b/bundles/org.openhab.binding.smaenergymeter/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.smartmeter/pom.xml b/bundles/org.openhab.binding.smartmeter/pom.xml index 7ffdda2ca3642..478fa592b13f8 100644 --- a/bundles/org.openhab.binding.smartmeter/pom.xml +++ b/bundles/org.openhab.binding.smartmeter/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.smhi/pom.xml b/bundles/org.openhab.binding.smhi/pom.xml index 5465b6049b07b..2f1a98856fa14 100644 --- a/bundles/org.openhab.binding.smhi/pom.xml +++ b/bundles/org.openhab.binding.smhi/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/Parser.java b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/Parser.java index c8baa5b61466d..2500933f03f0d 100644 --- a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/Parser.java +++ b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/Parser.java @@ -23,11 +23,12 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.Nullable; + import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.jdt.annotation.Nullable; /** * Class with static methods for parsing json strings returned from Smhi @@ -53,9 +54,8 @@ public static TimeSeries parseTimeSeries(String json) { JsonArray timeSeries = object.get("timeSeries").getAsJsonArray(); List forecasts = StreamSupport.stream(timeSeries.spliterator(), false) - .map(element -> parseForecast(element.getAsJsonObject())) - .sorted(Comparator.naturalOrder()) - .collect(Collectors.toList()); + .map(element -> parseForecast(element.getAsJsonObject())).sorted(Comparator.naturalOrder()) + .collect(Collectors.toList()); return new TimeSeries(referenceTime, forecasts); } diff --git a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/PointOutOfBoundsException.java b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/PointOutOfBoundsException.java index 3a1a85018896b..9ead87c2c084b 100644 --- a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/PointOutOfBoundsException.java +++ b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/PointOutOfBoundsException.java @@ -22,5 +22,4 @@ public class PointOutOfBoundsException extends Exception { private static final long serialVersionUID = 546566512L; - } diff --git a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiBindingConstants.java b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiBindingConstants.java index 4da68906d874d..281b6494f8e27 100644 --- a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiBindingConstants.java +++ b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiBindingConstants.java @@ -66,8 +66,7 @@ public class SmhiBindingConstants { public static final String BASE_URL = "https://opendata-download-metfcst.smhi.se/api/category/pmp3g/version/2/"; public static final String APPROVED_TIME_URL = BASE_URL + "approvedtime.json"; - public static final String POINT_FORECAST_URL = BASE_URL - + "geotype/point/lon/%.6f/lat/%.6f/data.json"; + public static final String POINT_FORECAST_URL = BASE_URL + "geotype/point/lon/%.6f/lat/%.6f/data.json"; public static final BigDecimal OCTAS_TO_PERCENT = BigDecimal.valueOf(12.5); } diff --git a/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/channel-types.xml index 214b4c3bb5497..f49099754fc38 100644 --- a/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/channel-types.xml +++ b/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/channel-types.xml @@ -8,97 +8,97 @@ Number:Pressure Air pressure in hPa - + Number:Temperature Temperature - + Number:Length Horizontal visibility - + Number:Angle Wind direction - + Number:Speed Wind speed - + Number:Dimensionless Relative humidity in percent - + Number:Dimensionless Probability of thunder in percent - + Number:Dimensionless Mean value of total cloud cover in percent - + Number:Dimensionless Mean value of low level cloud cover (0-2500 m) in percent - + Number:Dimensionless Mean value of medium level cloud cover (2500-6000 m) in percent - + Number:Dimensionless Mean value of high level cloud cover (> 6000 m) in percent - + Number:Speed Wind gust speed - + Number:Speed Minimum precipitation intensity - + Number:Speed Maximum precipitation intensity - + Number:Speed Mean precipitation intensity - + Number:Speed Median precipitation intensity - + Number @@ -120,7 +120,7 @@ Number:Dimensionless Percent of precipitation in frozen form - + Number @@ -163,25 +163,25 @@ Hourly forecast for the specified offset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -189,25 +189,25 @@ Forecast at noon for the specified offset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/thing-types.xml index 71ddcc65f5f93..a81b44068b4a5 100644 --- a/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.smhi/src/main/resources/ESH-INF/thing/thing-types.xml @@ -152,6 +152,6 @@ - + diff --git a/bundles/org.openhab.binding.snmp/pom.xml b/bundles/org.openhab.binding.snmp/pom.xml index 50be3aa604c0c..ed92918fb5380 100644 --- a/bundles/org.openhab.binding.snmp/pom.xml +++ b/bundles/org.openhab.binding.snmp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.solaredge/pom.xml b/bundles/org.openhab.binding.solaredge/pom.xml index 4c50b322293a0..f21fd0f50d0f7 100644 --- a/bundles/org.openhab.binding.solaredge/pom.xml +++ b/bundles/org.openhab.binding.solaredge/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/GenericSolarEdgeHandler.java b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/GenericSolarEdgeHandler.java index bcb0605c8b99d..8f9d183d7e846 100644 --- a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/GenericSolarEdgeHandler.java +++ b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/GenericSolarEdgeHandler.java @@ -47,5 +47,4 @@ public List getChannels() { Channel channel = getThing().getChannel(new ChannelUID(channelGroupUID, channelId)); return channel; } - } diff --git a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeBaseHandler.java b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeBaseHandler.java index 585a5ac62da1f..bf4bd3cd0d4ed 100644 --- a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeBaseHandler.java +++ b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeBaseHandler.java @@ -153,5 +153,4 @@ public void setStatusInfo(ThingStatus status, ThingStatusDetail statusDetail, St public SolarEdgeConfiguration getConfiguration() { return this.getConfigAs(SolarEdgeConfiguration.class); } - } diff --git a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeHandler.java b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeHandler.java index 59b68dc2bc360..1a0ae91423bc8 100644 --- a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeHandler.java +++ b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/handler/SolarEdgeHandler.java @@ -60,5 +60,4 @@ public interface SolarEdgeHandler extends ThingHandler, ChannelProvider { * @return */ SolarEdgeConfiguration getConfiguration(); - } diff --git a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPrivateApi.java b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPrivateApi.java index c238cf79b612c..52439b1a21e5d 100644 --- a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPrivateApi.java +++ b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPrivateApi.java @@ -81,5 +81,4 @@ public Map transform(AggregateDataResponsePrivateApi response, A } return result; } - } diff --git a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPublicApi.java b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPublicApi.java index eac8d51fd91f1..5c1beb7997383 100644 --- a/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPublicApi.java +++ b/bundles/org.openhab.binding.solaredge/src/main/java/org/openhab/binding/solaredge/internal/model/AggregateDataResponseTransformerPublicApi.java @@ -130,5 +130,4 @@ private final void fillSelfConsumptionCoverage(AggregatePeriod period, Map + + 4.0.0 diff --git a/bundles/org.openhab.binding.somfymylink/pom.xml b/bundles/org.openhab.binding.somfymylink/pom.xml index 39896bbcf49e7..18f72ae6c381d 100644 --- a/bundles/org.openhab.binding.somfymylink/pom.xml +++ b/bundles/org.openhab.binding.somfymylink/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.somfytahoma/pom.xml b/bundles/org.openhab.binding.somfytahoma/pom.xml index 711185fa58b40..b8c8177d6ddb2 100644 --- a/bundles/org.openhab.binding.somfytahoma/pom.xml +++ b/bundles/org.openhab.binding.somfytahoma/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sonos/pom.xml b/bundles/org.openhab.binding.sonos/pom.xml index f76973fd81e85..a1b385a9f701f 100644 --- a/bundles/org.openhab.binding.sonos/pom.xml +++ b/bundles/org.openhab.binding.sonos/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sonyaudio/pom.xml b/bundles/org.openhab.binding.sonyaudio/pom.xml index 13c96d0a1040a..5cb234013bf4d 100644 --- a/bundles/org.openhab.binding.sonyaudio/pom.xml +++ b/bundles/org.openhab.binding.sonyaudio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.sonyprojector/pom.xml b/bundles/org.openhab.binding.sonyprojector/pom.xml index 336f4f0b10301..dca3824a29d47 100644 --- a/bundles/org.openhab.binding.sonyprojector/pom.xml +++ b/bundles/org.openhab.binding.sonyprojector/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.spotify/pom.xml b/bundles/org.openhab.binding.spotify/pom.xml index 8a6c900c7da29..e46944320444e 100644 --- a/bundles/org.openhab.binding.spotify/pom.xml +++ b/bundles/org.openhab.binding.spotify/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.squeezebox/pom.xml b/bundles/org.openhab.binding.squeezebox/pom.xml index 3069d946c089b..2f5b53caed132 100644 --- a/bundles/org.openhab.binding.squeezebox/pom.xml +++ b/bundles/org.openhab.binding.squeezebox/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.synopanalyzer/pom.xml b/bundles/org.openhab.binding.synopanalyzer/pom.xml index 03bd46f9211fd..6d2d646234db2 100644 --- a/bundles/org.openhab.binding.synopanalyzer/pom.xml +++ b/bundles/org.openhab.binding.synopanalyzer/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.systeminfo/pom.xml b/bundles/org.openhab.binding.systeminfo/pom.xml index 5984836c936c1..c541b71894bf4 100644 --- a/bundles/org.openhab.binding.systeminfo/pom.xml +++ b/bundles/org.openhab.binding.systeminfo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tado/pom.xml b/bundles/org.openhab.binding.tado/pom.xml index 052772a5ea622..fcd3dcb41dd2b 100644 --- a/bundles/org.openhab.binding.tado/pom.xml +++ b/bundles/org.openhab.binding.tado/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tankerkoenig/pom.xml b/bundles/org.openhab.binding.tankerkoenig/pom.xml index 285af6bd5481f..a824fb443b2f8 100644 --- a/bundles/org.openhab.binding.tankerkoenig/pom.xml +++ b/bundles/org.openhab.binding.tankerkoenig/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.telegram/pom.xml b/bundles/org.openhab.binding.telegram/pom.xml index c37c025397a51..d17a63c203687 100644 --- a/bundles/org.openhab.binding.telegram/pom.xml +++ b/bundles/org.openhab.binding.telegram/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tellstick/pom.xml b/bundles/org.openhab.binding.tellstick/pom.xml index 6a81ec86ee597..83bc8102b9dd6 100644 --- a/bundles/org.openhab.binding.tellstick/pom.xml +++ b/bundles/org.openhab.binding.tellstick/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tesla/pom.xml b/bundles/org.openhab.binding.tesla/pom.xml index 6fc283e1e33aa..5d0aa8ec26625 100644 --- a/bundles/org.openhab.binding.tesla/pom.xml +++ b/bundles/org.openhab.binding.tesla/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java b/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java index 7d7dd20288369..36863a55b6600 100644 --- a/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java +++ b/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java @@ -175,5 +175,4 @@ private synchronized WebTarget getTokenTarget() { return target; } } - } diff --git a/bundles/org.openhab.binding.tibber/pom.xml b/bundles/org.openhab.binding.tibber/pom.xml index bbeb6d2d8b0dc..5172c48e960eb 100644 --- a/bundles/org.openhab.binding.tibber/pom.xml +++ b/bundles/org.openhab.binding.tibber/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tplinksmarthome/pom.xml b/bundles/org.openhab.binding.tplinksmarthome/pom.xml index d097b10e33a5e..3aaa75d24dad3 100644 --- a/bundles/org.openhab.binding.tplinksmarthome/pom.xml +++ b/bundles/org.openhab.binding.tplinksmarthome/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.tradfri/pom.xml b/bundles/org.openhab.binding.tradfri/pom.xml index c1f6f6772a726..325e14cdd2eb8 100644 --- a/bundles/org.openhab.binding.tradfri/pom.xml +++ b/bundles/org.openhab.binding.tradfri/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.unifi/pom.xml b/bundles/org.openhab.binding.unifi/pom.xml index a577dbfd1563c..1ee47ca7aeabe 100644 --- a/bundles/org.openhab.binding.unifi/pom.xml +++ b/bundles/org.openhab.binding.unifi/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.upnpcontrol/pom.xml b/bundles/org.openhab.binding.upnpcontrol/pom.xml index ddf72152cacf2..dbf0631dbf61d 100644 --- a/bundles/org.openhab.binding.upnpcontrol/pom.xml +++ b/bundles/org.openhab.binding.upnpcontrol/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.urtsi/pom.xml b/bundles/org.openhab.binding.urtsi/pom.xml index b7d2b731c758c..07c6e2cb6c4eb 100644 --- a/bundles/org.openhab.binding.urtsi/pom.xml +++ b/bundles/org.openhab.binding.urtsi/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.valloxmv/pom.xml b/bundles/org.openhab.binding.valloxmv/pom.xml index a310bc06a8b34..896644c9a3747 100644 --- a/bundles/org.openhab.binding.valloxmv/pom.xml +++ b/bundles/org.openhab.binding.valloxmv/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.vektiva/pom.xml b/bundles/org.openhab.binding.vektiva/pom.xml index eeaf0bb81d772..9884f71802ced 100644 --- a/bundles/org.openhab.binding.vektiva/pom.xml +++ b/bundles/org.openhab.binding.vektiva/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.velbus/pom.xml b/bundles/org.openhab.binding.velbus/pom.xml index 84f41d944714b..9030f2dab381f 100644 --- a/bundles/org.openhab.binding.velbus/pom.xml +++ b/bundles/org.openhab.binding.velbus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.velux/pom.xml b/bundles/org.openhab.binding.velux/pom.xml index 52ed361ff1bc0..3f267ee5c65da 100644 --- a/bundles/org.openhab.binding.velux/pom.xml +++ b/bundles/org.openhab.binding.velux/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.verisure/pom.xml b/bundles/org.openhab.binding.verisure/pom.xml index 08eb059d3d284..fe4c04b2f640d 100644 --- a/bundles/org.openhab.binding.verisure/pom.xml +++ b/bundles/org.openhab.binding.verisure/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.vigicrues/pom.xml b/bundles/org.openhab.binding.vigicrues/pom.xml index 81865605f2c47..62f178d9f28cf 100644 --- a/bundles/org.openhab.binding.vigicrues/pom.xml +++ b/bundles/org.openhab.binding.vigicrues/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.vigicrues/src/main/feature/feature.xml b/bundles/org.openhab.binding.vigicrues/src/main/feature/feature.xml index fb033bfbf39a5..c31917cc75fa0 100644 --- a/bundles/org.openhab.binding.vigicrues/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.vigicrues/src/main/feature/feature.xml @@ -1,9 +1,9 @@ - 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.vigicrues/${project.version} - + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.vigicrues/${project.version} + diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/VigiCruesHandlerFactory.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/VigiCruesHandlerFactory.java index 5718e57b83451..321c125963473 100644 --- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/VigiCruesHandlerFactory.java +++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/VigiCruesHandlerFactory.java @@ -70,5 +70,4 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) { return null; } - } diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java index 0ea2806c587bd..bee56d95abd7d 100644 --- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java +++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java @@ -137,5 +137,4 @@ public void updateDate(String channelId, ZonedDateTime zonedDateTime) { updateState(channelId, new DateTimeType(localDateTime)); } } - } diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/json/VigiCruesFields.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/json/VigiCruesFields.java index 35e6964224738..ec378dbb94dbe 100644 --- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/json/VigiCruesFields.java +++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/json/VigiCruesFields.java @@ -57,5 +57,4 @@ public Optional getHeight() { } return Optional.empty(); } - } diff --git a/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/binding/binding.xml b/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/binding/binding.xml index 243daabd637b9..5fcf8fe503dbd 100644 --- a/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/binding/binding.xml @@ -1,8 +1,7 @@ - + VigiCrues Binding Retrieves VigiCrues levels in France diff --git a/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/thing/thing-types.xml index 74e91612560f1..2e7a1335142f6 100644 --- a/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.vigicrues/src/main/resources/ESH-INF/thing/thing-types.xml @@ -1,5 +1,6 @@ - @@ -10,9 +11,9 @@ - - - + + + @@ -40,7 +41,7 @@ Observation date and time - + Number:Length diff --git a/bundles/org.openhab.binding.vitotronic/pom.xml b/bundles/org.openhab.binding.vitotronic/pom.xml index be590726d5dc9..cb1a18b4f1909 100644 --- a/bundles/org.openhab.binding.vitotronic/pom.xml +++ b/bundles/org.openhab.binding.vitotronic/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.volvooncall/pom.xml b/bundles/org.openhab.binding.volvooncall/pom.xml index b0f7d22b22cbf..2ac678217ef0f 100644 --- a/bundles/org.openhab.binding.volvooncall/pom.xml +++ b/bundles/org.openhab.binding.volvooncall/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/action/IVolvoOnCallActions.java b/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/action/IVolvoOnCallActions.java index 17dd16784942d..a8f4f71c9aafb 100644 --- a/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/action/IVolvoOnCallActions.java +++ b/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/action/IVolvoOnCallActions.java @@ -37,5 +37,4 @@ public interface IVolvoOnCallActions { public void openCarCommand(); public void closeCarCommand(); - } diff --git a/bundles/org.openhab.binding.weathercompany/pom.xml b/bundles/org.openhab.binding.weathercompany/pom.xml index 0a3328ba0caad..2c9b84f7f251e 100644 --- a/bundles/org.openhab.binding.weathercompany/pom.xml +++ b/bundles/org.openhab.binding.weathercompany/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.weatherunderground/pom.xml b/bundles/org.openhab.binding.weatherunderground/pom.xml index 5e39e8c763c73..9bc2ff58a960d 100644 --- a/bundles/org.openhab.binding.weatherunderground/pom.xml +++ b/bundles/org.openhab.binding.weatherunderground/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.wemo/pom.xml b/bundles/org.openhab.binding.wemo/pom.xml index 6778763ab9f5d..f2dc8ea618396 100644 --- a/bundles/org.openhab.binding.wemo/pom.xml +++ b/bundles/org.openhab.binding.wemo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.wifiled/pom.xml b/bundles/org.openhab.binding.wifiled/pom.xml index 94f41b3c2ebce..58ef72fe5fdcf 100644 --- a/bundles/org.openhab.binding.wifiled/pom.xml +++ b/bundles/org.openhab.binding.wifiled/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.windcentrale/pom.xml b/bundles/org.openhab.binding.windcentrale/pom.xml index f9d60b58e67d4..fe299096c582a 100644 --- a/bundles/org.openhab.binding.windcentrale/pom.xml +++ b/bundles/org.openhab.binding.windcentrale/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.xmltv/pom.xml b/bundles/org.openhab.binding.xmltv/pom.xml index f5f468f6fb183..984da4669be78 100644 --- a/bundles/org.openhab.binding.xmltv/pom.xml +++ b/bundles/org.openhab.binding.xmltv/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.xmppclient/pom.xml b/bundles/org.openhab.binding.xmppclient/pom.xml index 5bb8b5c9accf2..c216feba53374 100644 --- a/bundles/org.openhab.binding.xmppclient/pom.xml +++ b/bundles/org.openhab.binding.xmppclient/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.yamahareceiver/pom.xml b/bundles/org.openhab.binding.yamahareceiver/pom.xml index dfa8e434d96df..fc944a16dbf2e 100644 --- a/bundles/org.openhab.binding.yamahareceiver/pom.xml +++ b/bundles/org.openhab.binding.yamahareceiver/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.yeelight/pom.xml b/bundles/org.openhab.binding.yeelight/pom.xml index e7693af038c76..d3726ecfd1789 100644 --- a/bundles/org.openhab.binding.yeelight/pom.xml +++ b/bundles/org.openhab.binding.yeelight/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.zoneminder/pom.xml b/bundles/org.openhab.binding.zoneminder/pom.xml index 804ebae5ab170..18a0df52b49c4 100644 --- a/bundles/org.openhab.binding.zoneminder/pom.xml +++ b/bundles/org.openhab.binding.zoneminder/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.binding.zway/pom.xml b/bundles/org.openhab.binding.zway/pom.xml index 110390c78cbf4..5a084bacafc4d 100644 --- a/bundles/org.openhab.binding.zway/pom.xml +++ b/bundles/org.openhab.binding.zway/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.extensionservice.marketplace.automation/pom.xml b/bundles/org.openhab.extensionservice.marketplace.automation/pom.xml index efae43352e1dd..0ec8360d7ce1b 100644 --- a/bundles/org.openhab.extensionservice.marketplace.automation/pom.xml +++ b/bundles/org.openhab.extensionservice.marketplace.automation/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.extensionservice.marketplace/pom.xml b/bundles/org.openhab.extensionservice.marketplace/pom.xml index 914e85dec5411..de46837cb7f8a 100644 --- a/bundles/org.openhab.extensionservice.marketplace/pom.xml +++ b/bundles/org.openhab.extensionservice.marketplace/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.homekit/pom.xml b/bundles/org.openhab.io.homekit/pom.xml index 353ca43b15237..ac9aa126a23a9 100644 --- a/bundles/org.openhab.io.homekit/pom.xml +++ b/bundles/org.openhab.io.homekit/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.hueemulation/pom.xml b/bundles/org.openhab.io.hueemulation/pom.xml index f142d95c9d668..b10601aa27720 100644 --- a/bundles/org.openhab.io.hueemulation/pom.xml +++ b/bundles/org.openhab.io.hueemulation/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.imperihome/pom.xml b/bundles/org.openhab.io.imperihome/pom.xml index 519ba35a454ca..d17a3dc11fa32 100644 --- a/bundles/org.openhab.io.imperihome/pom.xml +++ b/bundles/org.openhab.io.imperihome/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.javasound/pom.xml b/bundles/org.openhab.io.javasound/pom.xml index 3ef09bac04830..69717e35ab722 100644 --- a/bundles/org.openhab.io.javasound/pom.xml +++ b/bundles/org.openhab.io.javasound/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.mqttembeddedbroker/pom.xml b/bundles/org.openhab.io.mqttembeddedbroker/pom.xml index 1b7ca122e2be7..dbb7fa65e547e 100644 --- a/bundles/org.openhab.io.mqttembeddedbroker/pom.xml +++ b/bundles/org.openhab.io.mqttembeddedbroker/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.neeo/pom.xml b/bundles/org.openhab.io.neeo/pom.xml index 036562d2f2940..7fb8cd8c079b1 100644 --- a/bundles/org.openhab.io.neeo/pom.xml +++ b/bundles/org.openhab.io.neeo/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.openhabcloud/pom.xml b/bundles/org.openhab.io.openhabcloud/pom.xml index 2ce19c9492e5c..b72eea3613a60 100644 --- a/bundles/org.openhab.io.openhabcloud/pom.xml +++ b/bundles/org.openhab.io.openhabcloud/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.transport.modbus/pom.xml b/bundles/org.openhab.io.transport.modbus/pom.xml index c270d3b823a31..e6640a92be917 100644 --- a/bundles/org.openhab.io.transport.modbus/pom.xml +++ b/bundles/org.openhab.io.transport.modbus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.io.webaudio/pom.xml b/bundles/org.openhab.io.webaudio/pom.xml index 61699be870f9d..d7e27ac0f81ee 100644 --- a/bundles/org.openhab.io.webaudio/pom.xml +++ b/bundles/org.openhab.io.webaudio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.bin2json/pom.xml b/bundles/org.openhab.transform.bin2json/pom.xml index 778105efdb183..9dde33dccf865 100644 --- a/bundles/org.openhab.transform.bin2json/pom.xml +++ b/bundles/org.openhab.transform.bin2json/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.exec/pom.xml b/bundles/org.openhab.transform.exec/pom.xml index bbb311697c94e..7d2ef3b271e4d 100644 --- a/bundles/org.openhab.transform.exec/pom.xml +++ b/bundles/org.openhab.transform.exec/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.javascript/pom.xml b/bundles/org.openhab.transform.javascript/pom.xml index 27aec22930b56..9e763e60bebe0 100644 --- a/bundles/org.openhab.transform.javascript/pom.xml +++ b/bundles/org.openhab.transform.javascript/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml index 917450a6b4db7..41b8b2f01194f 100644 --- a/bundles/org.openhab.transform.jinja/pom.xml +++ b/bundles/org.openhab.transform.jinja/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.jsonpath/pom.xml b/bundles/org.openhab.transform.jsonpath/pom.xml index 551333411ecb6..b07a2d3d827c8 100644 --- a/bundles/org.openhab.transform.jsonpath/pom.xml +++ b/bundles/org.openhab.transform.jsonpath/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.map/pom.xml b/bundles/org.openhab.transform.map/pom.xml index 8a09cafa5bd70..e7c16536344ca 100644 --- a/bundles/org.openhab.transform.map/pom.xml +++ b/bundles/org.openhab.transform.map/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.regex/pom.xml b/bundles/org.openhab.transform.regex/pom.xml index 761154c9450fe..2d6138f7f4b63 100644 --- a/bundles/org.openhab.transform.regex/pom.xml +++ b/bundles/org.openhab.transform.regex/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.scale/pom.xml b/bundles/org.openhab.transform.scale/pom.xml index 9e0d5bd2d362f..f9397fdf2be6e 100644 --- a/bundles/org.openhab.transform.scale/pom.xml +++ b/bundles/org.openhab.transform.scale/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java b/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java index 8538657348ea2..e4b3919bd2457 100644 --- a/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java +++ b/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java @@ -129,8 +129,8 @@ private String formatResult(Map data, String source, final BigDec private String getScaleResult(Map data, String source, final BigDecimal value) throws TransformationException { - return data.entrySet().stream().filter(entry -> entry.getKey() != null && entry.getKey().contains(value)).findFirst() - .map(Map.Entry::getValue) + return data.entrySet().stream().filter(entry -> entry.getKey() != null && entry.getKey().contains(value)) + .findFirst().map(Map.Entry::getValue) .orElseThrow(() -> new TransformationException("No matching range for '" + source + "'")); } diff --git a/bundles/org.openhab.transform.xpath/pom.xml b/bundles/org.openhab.transform.xpath/pom.xml index b0306ea7dc8ce..c48257832c4a1 100644 --- a/bundles/org.openhab.transform.xpath/pom.xml +++ b/bundles/org.openhab.transform.xpath/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.transform.xslt/pom.xml b/bundles/org.openhab.transform.xslt/pom.xml index ab39f0cb66365..d2cb999b62fe4 100644 --- a/bundles/org.openhab.transform.xslt/pom.xml +++ b/bundles/org.openhab.transform.xslt/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.voice.googletts/pom.xml b/bundles/org.openhab.voice.googletts/pom.xml index 8e007be97317c..1b666490c937e 100644 --- a/bundles/org.openhab.voice.googletts/pom.xml +++ b/bundles/org.openhab.voice.googletts/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.voice.mactts/pom.xml b/bundles/org.openhab.voice.mactts/pom.xml index 0062386227477..5be01064e292e 100644 --- a/bundles/org.openhab.voice.mactts/pom.xml +++ b/bundles/org.openhab.voice.mactts/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.voice.marytts/pom.xml b/bundles/org.openhab.voice.marytts/pom.xml index 1b015e0f8262e..46a860fd04169 100644 --- a/bundles/org.openhab.voice.marytts/pom.xml +++ b/bundles/org.openhab.voice.marytts/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.voice.picotts/pom.xml b/bundles/org.openhab.voice.picotts/pom.xml index 61f7f0a449858..f8bbc09b2a9ac 100644 --- a/bundles/org.openhab.voice.picotts/pom.xml +++ b/bundles/org.openhab.voice.picotts/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.voice.pollytts/pom.xml b/bundles/org.openhab.voice.pollytts/pom.xml index 98935a8930f94..1973ddd312f93 100644 --- a/bundles/org.openhab.voice.pollytts/pom.xml +++ b/bundles/org.openhab.voice.pollytts/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.voice.voicerss/pom.xml b/bundles/org.openhab.voice.voicerss/pom.xml index 83117382c7438..0b37e96c059f0 100644 --- a/bundles/org.openhab.voice.voicerss/pom.xml +++ b/bundles/org.openhab.voice.voicerss/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/pom.xml b/bundles/pom.xml index 44620655708d0..a4d7eb67f560f 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 @@ -239,7 +241,7 @@ org.openhab.binding.snmp org.openhab.binding.solaredge org.openhab.binding.solarlog - org.openhab.binding.somfymylink + org.openhab.binding.somfymylink org.openhab.binding.somfytahoma org.openhab.binding.sonos org.openhab.binding.sonyaudio diff --git a/features/openhab-addons-external/pom.xml b/features/openhab-addons-external/pom.xml index d2e46a7b70cae..7469fa5b0086e 100644 --- a/features/openhab-addons-external/pom.xml +++ b/features/openhab-addons-external/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/features/openhab-addons/pom.xml b/features/openhab-addons/pom.xml index 443664d7b56c3..875c1abd7a778 100644 --- a/features/openhab-addons/pom.xml +++ b/features/openhab-addons/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 @@ -52,7 +54,8 @@ - +