From 0aa9dece2b9337b48eba30082de3e2987942477b Mon Sep 17 00:00:00 2001
From: seaside1 <joseph@zoidberg.se>
Date: Fri, 9 Feb 2024 13:52:55 +0100
Subject: [PATCH] Added more methods

---
 .../internal/handler/JRuleItemHandler.java    | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/openhab/automation/jrule/internal/handler/JRuleItemHandler.java b/src/main/java/org/openhab/automation/jrule/internal/handler/JRuleItemHandler.java
index fe9174dc..df8cbda3 100644
--- a/src/main/java/org/openhab/automation/jrule/internal/handler/JRuleItemHandler.java
+++ b/src/main/java/org/openhab/automation/jrule/internal/handler/JRuleItemHandler.java
@@ -12,6 +12,8 @@
  */
 package org.openhab.automation.jrule.internal.handler;
 
+import java.util.Arrays;
+
 import org.openhab.core.items.Item;
 import org.openhab.core.items.ItemRegistry;
 import org.openhab.core.library.items.NumberItem;
@@ -56,15 +58,55 @@ public boolean itemRegistryContainsItem(String itemName) {
         return itemRegistry.get(itemName) != null;
     }
 
-    public Item addNumberItem(String name, int value) {
+    public Item addNumberItem(String name) {
+        return addNumberItem(name, null, null, null);
+    }
+
+    public Item addNumberItem(String name, Double value) {
+        return addNumberItem(name, value, null, null);
+    }
+
+    public Item addNumberItem(String name, Double value, String label) {
+        return addNumberItem(name, value, label, null);
+    }
+
+    public Item addNumberItem(String name, Double value, String label, String[] groupNames) {
         final NumberItem numberItem = new NumberItem(name);
-        numberItem.setState(new DecimalType(value));
+        if (value != null) {
+            numberItem.setState(new DecimalType(value));
+        }
+        if (label != null) {
+            numberItem.setLabel(label);
+        }
+        if (groupNames != null && groupNames.length > 0) {
+            Arrays.stream(groupNames).forEach(g -> numberItem.addGroupName(g));
+        }
         return itemRegistry.add(numberItem);
     }
 
+    public Item addStringItem(String name) {
+        return addStringItem(name, null, null, null);
+    }
+
     public Item addStringItem(String name, String value) {
+        return addStringItem(name, value, null, null);
+    }
+
+    public Item addStringItem(String name, String value, String label) {
+        return addStringItem(name, value, label, null);
+    }
+
+    public Item addStringItem(String name, String value, String label, String[] groupNames) {
         final StringItem stringItem = new StringItem(name);
-        stringItem.setState(new StringType(value));
+        if (value != null) {
+            stringItem.setState(new StringType(value));
+        }
+        if (label != null) {
+            stringItem.setLabel(label);
+        }
+        if (groupNames != null && groupNames.length > 0) {
+            Arrays.stream(groupNames).forEach(g -> stringItem.addGroupName(g));
+        }
         return itemRegistry.add(stringItem);
     }
 }