Added expire functionality as core framework feature (openhab#1803)

* Added expire functionality as core framework feature Closes openhab#1620 Signed-off-by: Kai Kreuzer <kai@openhab.org>
ConnectorIO · Nov 19, 2020 · 63ec434 · 63ec434
1 parent 70ca765
commit 63ec434
Show file tree

Hide file tree

Showing 4 changed files with 656 additions and 1 deletion.
diff --git a/...openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java b/...openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
@@ -36,6 +36,7 @@
 import org.openhab.core.items.Item;
 import org.openhab.core.items.ItemFactory;
 import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemUtil;
 import org.openhab.core.items.dto.GroupFunctionDTO;
 import org.openhab.core.items.dto.ItemDTOMapper;
 import org.openhab.core.model.core.EventType;
@@ -299,7 +300,7 @@ private void dispatchBindingsPerItemType(@Nullable BindingConfigReader reader, S
             if (model != null) {
                 for (ModelItem modelItem : model.getItems()) {
                     for (String itemType : itemTypes) {
-                        if (itemType.equals(modelItem.getType())) {
+                        if (itemType.equals(ItemUtil.getMainItemType(modelItem.getType()))) {
                             Item item = createItemFromModelItem(modelItem);
                             if (item != null) {
                                 internalDispatchBindings(reader, modelName, item, modelItem.getBindings());

diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java
@@ -56,4 +56,50 @@ public String getPayload() {
     public @Nullable String getSource() {
         return source;
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((payload == null) ? 0 : payload.hashCode());
+        result = prime * result + ((source == null) ? 0 : source.hashCode());
+        result = prime * result + ((topic == null) ? 0 : topic.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        AbstractEvent other = (AbstractEvent) obj;
+        if (payload == null) {
+            if (other.payload != null) {
+                return false;
+            }
+        } else if (!payload.equals(other.payload)) {
+            return false;
+        }
+        if (source == null) {
+            if (other.source != null) {
+                return false;
+            }
+        } else if (!source.equals(other.source)) {
+            return false;
+        }
+        if (topic == null) {
+            if (other.topic != null) {
+                return false;
+            }
+        } else if (!topic.equals(other.topic)) {
+            return false;
+        }
+        return true;
+    }
 }