[onkyo] Workaround for thing actions bug (openhab#8134)

Related to openhab#8116 Signed-off-by: Laurent Garnier <[email protected]> Signed-off-by: MPH80 <[email protected]>
MPH80 · Aug 3, 2020 · afdfbdc · afdfbdc
1 parent 5c4a97a
commit afdfbdc
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 5 deletions.
diff --git a/...rc/main/java/org/openhab/binding/onkyo/internal/automation/modules/OnkyoThingActions.java b/...rc/main/java/org/openhab/binding/onkyo/internal/automation/modules/OnkyoThingActions.java
@@ -0,0 +1,27 @@
+/**
+ * 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.onkyo.internal.automation.modules;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+/**
+ * The {@link OnkyoThingActions} defines the interface for all thing actions supported by the binding.
+ *
+ * @author Laurent Garnier - initial contribution
+ */
+@NonNullByDefault
+public interface OnkyoThingActions {
+
+    public void sendRawCommand(@Nullable String command, @Nullable String value);
+}
diff --git a/.../java/org/openhab/binding/onkyo/internal/automation/modules/OnkyoThingActionsService.java b/.../java/org/openhab/binding/onkyo/internal/automation/modules/OnkyoThingActionsService.java
@@ -12,6 +12,9 @@
  */
 package org.openhab.binding.onkyo.internal.automation.modules;
 
+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;
@@ -25,18 +28,24 @@
 
 /**
  * Some automation actions to be used with a {@link OnkyoThingActionsService}
+ * <p>
+ * <b>Note:</b>The static method <b>invokeMethodOf</b> handles the case where
+ * the test <i>actions instanceof OnkyoThingActionsService</i> fails. This test can fail
+ * due to an issue in openHAB core v2.5.0 where the {@link OnkyoThingActionsService} class
+ * can be loaded by a different classloader than the <i>actions</i> instance.
  *
  * @author David Masshardt - initial contribution
  *
  */
 @ThingActionsScope(name = "onkyo")
 @NonNullByDefault
-public class OnkyoThingActionsService implements ThingActions {
+public class OnkyoThingActionsService implements ThingActions, OnkyoThingActions {
 
     private final Logger logger = LoggerFactory.getLogger(OnkyoThingActionsService.class);
 
     private @Nullable OnkyoHandler handler;
 
+    @Override
     @SuppressWarnings("null")
     @RuleAction(label = "Onkyo sendRawCommand", description = "Action that sends raw command to the receiver")
     public void sendRawCommand(@ActionInput(name = "command") @Nullable String command,
@@ -51,11 +60,26 @@ public void sendRawCommand(@ActionInput(name = "command") @Nullable String comma
 
     public static void sendRawCommand(@Nullable ThingActions actions, @Nullable String command,
             @Nullable String value) {
-        if (actions instanceof OnkyoThingActionsService) {
-            ((OnkyoThingActionsService) actions).sendRawCommand(command, value);
-        } else {
-            throw new IllegalArgumentException("Instance is not an OnkyoThingActionsService class.");
+        invokeMethodOf(actions).sendRawCommand(command, value);
+    }
+
+    private static OnkyoThingActions invokeMethodOf(@Nullable ThingActions actions) {
+        if (actions == null) {
+            throw new IllegalArgumentException("actions cannot be null");
+        }
+        if (actions.getClass().getName().equals(OnkyoThingActionsService.class.getName())) {
+            if (actions instanceof OnkyoThingActions) {
+                return (OnkyoThingActions) actions;
+            } else {
+                return (OnkyoThingActions) Proxy.newProxyInstance(OnkyoThingActions.class.getClassLoader(),
+                        new Class[] { OnkyoThingActions.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 OnkyoThingActionsService");
     }
 
     @Override