From eb39cc5e2a83e0211b00be52c1c00693b34ffdcb Mon Sep 17 00:00:00 2001
From: MMaiero <matteo.maiero@eurotech.com>
Date: Wed, 15 Nov 2023 09:29:25 +0100
Subject: [PATCH 1/2] fix: WireRecordQuery unbind error on deactivate

Signed-off-by: MMaiero <matteo.maiero@eurotech.com>
---
 .../OSGI-INF/WireRecordQueryComponent.xml                      | 3 +--
 .../OSGI-INF/WireRecordStoreComponent.xml                      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordQueryComponent.xml b/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordQueryComponent.xml
index 15c307c6975..28663b85517 100644
--- a/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordQueryComponent.xml
+++ b/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordQueryComponent.xml
@@ -35,8 +35,7 @@
               cardinality="1..1"
               interface="org.eclipse.kura.wire.WireHelperService"
               name="WireHelperService"
-              policy="static"
-              unbind="unbindWireHelperService"/>
+              policy="static"/>
    <reference name="QueryableWireRecordStoreProvider"
            policy="dynamic"
            bind="bindQueryableWireRecordStoreProvider"
diff --git a/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordStoreComponent.xml b/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordStoreComponent.xml
index 3c0d6958f93..2a5bbd5453f 100644
--- a/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordStoreComponent.xml
+++ b/kura/org.eclipse.kura.wire.db.component.provider/OSGI-INF/WireRecordStoreComponent.xml
@@ -35,8 +35,7 @@
    	          cardinality="1..1"
    	          interface="org.eclipse.kura.wire.WireHelperService"
    	          name="WireHelperService"
-   	          policy="static"
-   	          unbind="unbindWireHelperService"/>
+   	          policy="static"/>
    <reference name="WireRecordStoreProvider"
            policy="dynamic"
            bind="bindWireRecordStoreProvider"

From 875f24442df7f3a962d92aed9b492f467410abb1 Mon Sep 17 00:00:00 2001
From: MMaiero <matteo.maiero@eurotech.com>
Date: Wed, 15 Nov 2023 10:30:24 +0100
Subject: [PATCH 2/2] fix: added missing deactivate in store query

Signed-off-by: MMaiero <matteo.maiero@eurotech.com>
---
 .../kura/internal/wire/query/WireRecordQueryComponent.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kura/org.eclipse.kura.wire.db.component.provider/src/main/java/org/eclipse/kura/internal/wire/query/WireRecordQueryComponent.java b/kura/org.eclipse.kura.wire.db.component.provider/src/main/java/org/eclipse/kura/internal/wire/query/WireRecordQueryComponent.java
index ba5b14494d0..474b8ae6396 100644
--- a/kura/org.eclipse.kura.wire.db.component.provider/src/main/java/org/eclipse/kura/internal/wire/query/WireRecordQueryComponent.java
+++ b/kura/org.eclipse.kura.wire.db.component.provider/src/main/java/org/eclipse/kura/internal/wire/query/WireRecordQueryComponent.java
@@ -74,6 +74,12 @@ public void updated(final Map<String, Object> properties) {
 
         logger.debug("Updating Wire Record Query component... Done");
     }
+    
+    protected void deactivate() {
+        logger.debug("Deactivating Wire Record Query Component...");
+
+        logger.debug("Deactivating Wire Record Query Component... Done");
+    }
 
     @Override
     public void consumersConnected(final Wire[] wires) {