Ensure metadata available at startlevel 20 (openhab#3273)

* Ensure metadata available at start-level 20 This makes the `MetadataRegistry` report when the elements of the `ManagedMetadataProvider` is available via a ready marker (like other registries). Signed-off-by: Jan N. Klug <github@klug.nrw>
ConnectorIO · Jan 10, 2023 · a09ad3d · a09ad3d
1 parent fd5b451
commit a09ad3d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.../org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java b/.../org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java
@@ -43,8 +43,10 @@
 public class MetadataRegistryImpl extends AbstractRegistry<Metadata, MetadataKey, MetadataProvider>
         implements MetadataRegistry {
 
-    public MetadataRegistryImpl() {
+    @Activate
+    public MetadataRegistryImpl(final @Reference ReadyService readyService) {
         super(MetadataProvider.class);
+        super.setReadyService(readyService);
     }
 
     @Override

diff --git a/...src/test/java/org/openhab/core/internal/items/MetadataCommandDescriptionProviderTest.java b/...src/test/java/org/openhab/core/internal/items/MetadataCommandDescriptionProviderTest.java
@@ -30,6 +30,7 @@
 import org.openhab.core.items.ManagedMetadataProvider;
 import org.openhab.core.items.Metadata;
 import org.openhab.core.items.MetadataKey;
+import org.openhab.core.service.ReadyService;
 import org.openhab.core.types.CommandDescription;
 import org.openhab.core.types.CommandOption;
 import org.osgi.framework.BundleContext;
@@ -52,6 +53,7 @@ public class MetadataCommandDescriptionProviderTest {
     private @Mock @NonNullByDefault({}) ManagedMetadataProvider managedProviderMock;
 
     private @Mock @NonNullByDefault({}) MetadataRegistryImpl metadataRegistryMock;
+    private @Mock @NonNullByDefault({}) ReadyService readyServiceMock;
     private @NonNullByDefault({}) MetadataCommandDescriptionProvider commandDescriptionProvider;
 
     private @NonNullByDefault({}) ServiceListener providerTracker;
@@ -61,7 +63,7 @@ public class MetadataCommandDescriptionProviderTest {
     public void setup() throws Exception {
         when(bundleContextMock.getService(same(managedProviderRefMock))).thenReturn(managedProviderMock);
 
-        metadataRegistryMock = new MetadataRegistryImpl();
+        metadataRegistryMock = new MetadataRegistryImpl(readyServiceMock);
         metadataRegistryMock.setManagedProvider(managedProviderMock);
         metadataRegistryMock.activate(bundleContextMock);
         metadataRegistryMock.waitForCompletedAsyncActivationTasks();

diff --git a/....openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java b/....openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java
@@ -28,6 +28,7 @@
 import org.openhab.core.items.ManagedMetadataProvider;
 import org.openhab.core.items.Metadata;
 import org.openhab.core.items.MetadataKey;
+import org.openhab.core.service.ReadyService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
@@ -44,6 +45,7 @@ public class MetadataRegistryImplTest {
     private @Mock @NonNullByDefault({}) ServiceReference managedProviderRefMock;
     private @Mock @NonNullByDefault({}) BundleContext bundleContextMock;
     private @Mock @NonNullByDefault({}) ManagedMetadataProvider managedProviderMock;
+    private @Mock @NonNullByDefault({}) ReadyService readyServiceMock;
 
     private @NonNullByDefault({}) MetadataRegistryImpl registry;
     private @NonNullByDefault({}) ServiceListener providerTracker;
@@ -53,7 +55,7 @@ public class MetadataRegistryImplTest {
     public void setup() throws Exception {
         when(bundleContextMock.getService(same(managedProviderRefMock))).thenReturn(managedProviderMock);
 
-        registry = new MetadataRegistryImpl();
+        registry = new MetadataRegistryImpl(readyServiceMock);
         registry.setManagedProvider(managedProviderMock);
         registry.activate(bundleContextMock);
         registry.waitForCompletedAsyncActivationTasks();

diff --git a/...st/java/org/openhab/core/internal/items/MetadataStateDescriptionFragmentProviderTest.java b/...st/java/org/openhab/core/internal/items/MetadataStateDescriptionFragmentProviderTest.java
@@ -31,6 +31,7 @@
 import org.openhab.core.items.ManagedMetadataProvider;
 import org.openhab.core.items.Metadata;
 import org.openhab.core.items.MetadataKey;
+import org.openhab.core.service.ReadyService;
 import org.openhab.core.types.StateDescriptionFragment;
 import org.openhab.core.types.StateOption;
 import org.osgi.framework.BundleContext;
@@ -53,6 +54,8 @@ public class MetadataStateDescriptionFragmentProviderTest {
     private @Mock @NonNullByDefault({}) ManagedMetadataProvider managedProviderMock;
 
     private @Mock @NonNullByDefault({}) MetadataRegistryImpl metadataRegistryMock;
+    private @Mock @NonNullByDefault({}) ReadyService readyServiceMock;
+
     private @NonNullByDefault({}) MetadataStateDescriptionFragmentProvider stateDescriptionFragmentProvider;
 
     private @NonNullByDefault({}) ServiceListener providerTracker;
@@ -62,7 +65,7 @@ public class MetadataStateDescriptionFragmentProviderTest {
     public void setup() throws Exception {
         when(bundleContextMock.getService(same(managedProviderRefMock))).thenReturn(managedProviderMock);
 
-        metadataRegistryMock = new MetadataRegistryImpl();
+        metadataRegistryMock = new MetadataRegistryImpl(readyServiceMock);
         metadataRegistryMock.setManagedProvider(managedProviderMock);
         metadataRegistryMock.activate(bundleContextMock);
         metadataRegistryMock.waitForCompletedAsyncActivationTasks();