fix action generator

seaside1 · Dec 20, 2023 · cba9890 · cba9890
1 parent a07c951
commit cba9890
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/org/openhab/automation/jrule/actions/JRuleActionClassGenerator.java b/src/main/java/org/openhab/automation/jrule/actions/JRuleActionClassGenerator.java
@@ -25,7 +25,6 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.openhab.automation.jrule.internal.JRuleConfig;
@@ -180,8 +179,8 @@ private Map<String, Object> createActionModel(Thing thing) {
                                 Map<Object, Object> arg = new HashMap<>();
                                 Class<?> parameterType = replaceTypeIfNecessary(parameter.getType());
                                 arg.put("type", parameterType.getTypeName());
-                                arg.put("reflectionType", ClassUtils.primitiveToWrapper(parameter.getType())
-                                        .getTypeName().replaceFirst("java.lang.", ""));
+                                arg.put("reflectionType",
+                                        parameter.getType().getTypeName().replaceFirst("java.lang.", ""));
                                 arg.put("name", parameter.getAnnotation(ActionInput.class).name());
                                 args.add(arg);
                             }

diff --git a/...va/org/openhab/automation/jrule/internal/codegenerator/JRuleActionClassGeneratorTest.java b/...va/org/openhab/automation/jrule/internal/codegenerator/JRuleActionClassGeneratorTest.java
@@ -152,6 +152,10 @@ public Collection<Class<? extends ThingHandlerService>> getServices() {
         Object res = doSomethingAbstract.invoke(action, new StringType("blub"));
         assertEquals(10, res);
 
+        Method doSomething = action.getClass().getDeclaredMethod("doSomething", String.class, int.class, Float.class);
+        doSomething.invoke(action, "hi", (int) 5, 3.7f);
+        assertEquals(10, res);
+
         // Verify method with unsupported types are mapped to Object
         Method returnObjectOnUnsupportedClass = action.getClass().getDeclaredMethod("returnObjectOnUnsupportedClass",
                 Object.class);