Merge pull request #6 from openhab/2.5.x

update fork
mlobstein · Jul 16, 2020 · b3285d6 · b3285d6
2 parents 41709ef + 23f60ce
commit b3285d6
Show file tree

Hide file tree

Showing 618 changed files with 41,205 additions and 6,696 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -24,10 +24,12 @@
 /bundles/org.openhab.binding.bluetooth.bluegiga/ @cdjackson @kaikreuzer
 /bundles/org.openhab.binding.bluetooth.bluez/ @cdjackson @kaikreuzer
 /bundles/org.openhab.binding.bluetooth.blukii/ @kaikreuzer
+/bundles/org.openhab.binding.bluetooth.daikinmadoka/ @blafois
 /bundles/org.openhab.binding.bluetooth.ruuvitag/ @ssalonen
 /bundles/org.openhab.binding.boschindego/ @jofleck
 /bundles/org.openhab.binding.bosesoundtouch/ @marvkis @tratho
 /bundles/org.openhab.binding.bsblan/ @hypetsch
+/bundles/org.openhab.binding.bticinosmarther/ @MrRonfo
 /bundles/org.openhab.binding.buienradar/ @gedejong
 /bundles/org.openhab.binding.chromecast/ @kaikreuzer
 /bundles/org.openhab.binding.cm11a/ @BobRak
@@ -68,11 +70,13 @@
 /bundles/org.openhab.binding.gardena/ @gerrieg
 /bundles/org.openhab.binding.globalcache/ @mhilbush
 /bundles/org.openhab.binding.gpstracker/ @gbicskei
+/bundles/org.openhab.binding.gree/ @markus7017
 /bundles/org.openhab.binding.groheondus/ @FlorianSW
 /bundles/org.openhab.binding.harmonyhub/ @digitaldan
 /bundles/org.openhab.binding.hdanywhere/ @kgoderis
 /bundles/org.openhab.binding.hdpowerview/ @beowulfe
 /bundles/org.openhab.binding.helios/ @kgoderis
+/bundles/org.openhab.binding.heliosventilation/ @ramack
 /bundles/org.openhab.binding.heos/ @Wire82
 /bundles/org.openhab.binding.homematic/ @FStolte @gerrieg @mdicke2s
 /bundles/org.openhab.binding.hpprinter/ @cossey
@@ -142,6 +146,7 @@
 /bundles/org.openhab.binding.ntp/ @marcelrv
 /bundles/org.openhab.binding.nuki/ @mkatter
 /bundles/org.openhab.binding.oceanic/ @kgoderis
+/bundles/org.openhab.binding.ojelectronics/ @EvilPingu
 /bundles/org.openhab.binding.omnikinverter/ @hansbogert
 /bundles/org.openhab.binding.onebusaway/ @sdwilsh
 /bundles/org.openhab.binding.onewiregpio/ @aogorek
@@ -164,6 +169,7 @@
 /bundles/org.openhab.binding.powermax/ @lolodomo
 /bundles/org.openhab.binding.pulseaudio/ @peuter
 /bundles/org.openhab.binding.pushbullet/ @hakan42
+/bundles/org.openhab.binding.radiothermostat/ @mlobstein
 /bundles/org.openhab.binding.regoheatpump/ @crnjan
 /bundles/org.openhab.binding.rfxcom/ @martinvw @paulianttila
 /bundles/org.openhab.binding.rme/ @kgoderis
@@ -212,6 +218,7 @@
 /bundles/org.openhab.binding.vektiva/ @octa22
 /bundles/org.openhab.binding.velbus/ @cedricboon
 /bundles/org.openhab.binding.velux/ @gs4711
+/bundles/org.openhab.binding.verisure/ @jannegpriv
 /bundles/org.openhab.binding.vigicrues/ @clinique
 /bundles/org.openhab.binding.vitotronic/ @steand
 /bundles/org.openhab.binding.volvooncall/ @clinique

diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
@@ -109,6 +109,11 @@
       <artifactId>org.openhab.binding.bluetooth.blukii</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.bluetooth.daikinmadoka</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.bluetooth.ruuvitag</artifactId>
@@ -129,6 +134,11 @@
       <artifactId>org.openhab.binding.bsblan</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.bticinosmarther</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.buienradar</artifactId>
@@ -334,6 +344,11 @@
       <artifactId>org.openhab.binding.gpstracker</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.gree</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.groheondus</artifactId>
@@ -359,6 +374,11 @@
       <artifactId>org.openhab.binding.helios</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.heliosventilation</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.heos</artifactId>
@@ -699,6 +719,11 @@
       <artifactId>org.openhab.binding.oceanic</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.ojelectronics</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.omnikinverter</artifactId>
@@ -809,6 +834,11 @@
       <artifactId>org.openhab.binding.pushbullet</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.radiothermostat</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.regoheatpump</artifactId>
@@ -939,6 +969,11 @@
       <artifactId>org.openhab.binding.somfytahoma</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.somfymylink</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.sonos</artifactId>
@@ -1054,6 +1089,11 @@
       <artifactId>org.openhab.binding.velux</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.verisure</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.vigicrues</artifactId>

diff --git a/bundles/org.openhab.binding.adorne/README.md b/bundles/org.openhab.binding.adorne/README.md
@@ -1,6 +1,6 @@
 # Adorne Binding 
 
-The Adorne Binding integrates [Adorne Wi-Fi ready devices](https://www.legrand.us/adorne/products/wireless-whole-house-lighting-controls.aspx) (switches, dimmers, outlets) from [Legrand](legrand.com).
+The Adorne Binding integrates [Adorne Wi-Fi ready devices](https://www.legrand.us/adorne/products/wireless-whole-house-lighting-controls.aspx) (switches, dimmers, outlets) from [Legrand](https://legrand.com/).
 
 Legrand attempted to provide a public API based on Samsung's ARTIK Cloud and the initial version of this binding was based on that API.
 However, Samsung shut down ARTIK Cloud shortly after the release and Legrand has not offered a public API replacement since.

diff --git a/bundles/org.openhab.binding.alarmdecoder/README.md b/bundles/org.openhab.binding.alarmdecoder/README.md
@@ -39,7 +39,7 @@ Before working on the main panel, it is advisable to put the alarm system in tes
 Don't forget to plug it back in when you are finished!
 
 Understanding exactly what expansion boards are connected to the main panel is crucial for a successful setup of the AlarmDecoder and also helpful in interpreting the messages from the alarmdecoder.
-While many of the expansion devices don't have labels on the outside, inserting a flat screwdriver into the right slot and prying gently will usually uncover a circuit board with numbers on it that can be web searched.
+While many of the expansion devices don't have labels on the outside, inserting a flat screwdriver into the right slot and prying gently will usually uncover a circuit board with numbers on it that can be looked up via web search.
 
 Although not mentioned in the Quick Start guide, configuring virtual relay boards is absolutely necessary on panels like the Honeywell Vista 20p and similar, or else all of the eight on-board zones will not be visible!
 

diff --git a/...ecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/BridgeActions.java b/...ecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/BridgeActions.java
@@ -12,6 +12,9 @@
  */
 package org.openhab.binding.alarmdecoder.internal.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;
@@ -30,7 +33,7 @@
  */
 @ThingActionsScope(name = "alarmdecoder")
 @NonNullByDefault
-public class BridgeActions implements ThingActions {
+public class BridgeActions implements ThingActions, IBridgeActions {
 
     private final Logger logger = LoggerFactory.getLogger(BridgeActions.class);
 
@@ -55,6 +58,7 @@ public void setThingHandler(@Nullable ThingHandler handler) {
     /**
      * Reboot thing action
      */
+    @Override
     @RuleAction(label = "Reboot", description = "Reboot the Alarm Decoder device")
     public void reboot() {
         ADBridgeHandler bridge = this.bridge;
@@ -68,10 +72,34 @@ public void reboot() {
 
     // Static method for Rules DSL backward compatibility
     public static void reboot(@Nullable ThingActions actions) {
-        if (actions instanceof BridgeActions) {
-            ((BridgeActions) actions).reboot();
-        } else {
-            throw new IllegalArgumentException("Instance is not a BridgeActions class.");
+        // if (actions instanceof BridgeActions) {
+        // ((BridgeActions) actions).reboot();
+        // } else {
+        // throw new IllegalArgumentException("Instance is not a BridgeActions class.");
+        // }
+        invokeMethodOf(actions).reboot(); // Remove and uncomment above when core issue #1536 is fixed
+    }
+
+    /**
+     * This is only necessary to work around a bug in openhab-core (issue #1536). It should be removed once that is
+     * resolved.
+     */
+    private static IBridgeActions invokeMethodOf(@Nullable ThingActions actions) {
+        if (actions == null) {
+            throw new IllegalArgumentException("actions cannot be null");
+        }
+        if (actions.getClass().getName().equals(BridgeActions.class.getName())) {
+            if (actions instanceof IBridgeActions) {
+                return (IBridgeActions) actions;
+            } else {
+                return (IBridgeActions) Proxy.newProxyInstance(IBridgeActions.class.getClassLoader(),
+                        new Class[] { IBridgeActions.class }, (Object proxy, Method method, Object[] args) -> {
+                            Method m = actions.getClass().getDeclaredMethod(method.getName(),
+                                    method.getParameterTypes());
+                            return m.invoke(actions, args);
+                        });
+            }
         }
+        throw new IllegalArgumentException("Actions is not an instance of BridgeActions");
     }
 }
diff --git a/...coder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/IBridgeActions.java b/...coder/src/main/java/org/openhab/binding/alarmdecoder/internal/actions/IBridgeActions.java
@@ -0,0 +1,30 @@
+/**
+ * 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.alarmdecoder.internal.actions;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link IBridgeActions} defines the interface for all thing actions supported by the bridges.
+ * This is only necessary to work around a bug in openhab-core (issue #1536). It should be removed once that is
+ * resolved.
+ *
+ * @author Bob Adair - Initial contribution
+ *
+ */
+@NonNullByDefault
+public interface IBridgeActions {
+
+    public void reboot();
+
+}
diff --git a/...penhab/binding/amazondashbutton/internal/config/AmazonDashButtonConfigOptionProvider.java b/...penhab/binding/amazondashbutton/internal/config/AmazonDashButtonConfigOptionProvider.java
@@ -17,13 +17,14 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.config.core.ConfigOptionProvider;
 import org.eclipse.smarthome.config.core.ParameterOption;
 import org.eclipse.smarthome.core.thing.ThingTypeUID;
@@ -40,18 +41,25 @@
  * @author Oliver Libutzki - Initial contribution
  *
  */
-@Component(service = ConfigOptionProvider.class, immediate = true)
+@Component(service = ConfigOptionProvider.class)
+@NonNullByDefault
 public class AmazonDashButtonConfigOptionProvider implements ConfigOptionProvider {
 
     @Override
-    public Collection<ParameterOption> getParameterOptions(URI uri, String param, Locale locale) {
+    public @Nullable Collection<ParameterOption> getParameterOptions(URI uri, String param, @Nullable Locale locale) {
+        return getParameterOptions(uri, param, null, locale);
+    }
+
+    @Override
+    public @Nullable Collection<ParameterOption> getParameterOptions(URI uri, String param, @Nullable String context,
+            @Nullable Locale locale) {
         if ("thing-type".equals(uri.getScheme())) {
             ThingTypeUID thingtypeUID = new ThingTypeUID(uri.getSchemeSpecificPart());
             if (thingtypeUID.equals(DASH_BUTTON_THING_TYPE) && PROPERTY_NETWORK_INTERFACE_NAME.equals(param)) {
                 return getPcapNetworkInterfacesOptions();
             }
         }
-        return Collections.emptyList();
+        return null;
     }
 
     private Collection<ParameterOption> getPcapNetworkInterfacesOptions() {