From d249146d8e3d664102a9ac7f29a6ee78c7e41081 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 5 Dec 2023 15:25:00 +0000
Subject: [PATCH] [addonInfo extensions] adopt reviewer suggestions

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../java/org/openhab/core/addon/AddonInfoRegistry.java     | 2 +-
 .../core/addon/{test => }/AddonInfoListReaderTest.java     | 6 +-----
 .../core/addon/{test => }/AddonInfoRegistryMergeTest.java  | 7 +------
 3 files changed, 3 insertions(+), 12 deletions(-)
 rename bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/{test => }/AddonInfoListReaderTest.java (95%)
 rename bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/{test => }/AddonInfoRegistryMergeTest.java (97%)

diff --git a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java
index 7b4c1e21df0..338a3cbfad6 100644
--- a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java
+++ b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java
@@ -43,7 +43,7 @@ public class AddonInfoRegistry {
     private final Collection<AddonInfoProvider> addonInfoProviders = new CopyOnWriteArrayList<>();
 
     @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
-    public void addAddonInfoProvider(AddonInfoProvider addonInfoProvider) {
+    protected void addAddonInfoProvider(AddonInfoProvider addonInfoProvider) {
         addonInfoProviders.add(addonInfoProvider);
     }
 
diff --git a/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/test/AddonInfoListReaderTest.java b/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoListReaderTest.java
similarity index 95%
rename from bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/test/AddonInfoListReaderTest.java
rename to bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoListReaderTest.java
index 2f0f9407015..66c8485230f 100644
--- a/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/test/AddonInfoListReaderTest.java
+++ b/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoListReaderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.core.addon.test;
+package org.openhab.core.addon;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -21,10 +21,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;
-import org.openhab.core.addon.AddonDiscoveryMethod;
-import org.openhab.core.addon.AddonInfo;
-import org.openhab.core.addon.AddonInfoList;
-import org.openhab.core.addon.AddonMatchProperty;
 import org.openhab.core.addon.internal.xml.AddonInfoListReader;
 
 /**
diff --git a/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/test/AddonInfoRegistryMergeTest.java b/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoRegistryMergeTest.java
similarity index 97%
rename from bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/test/AddonInfoRegistryMergeTest.java
rename to bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoRegistryMergeTest.java
index e7cb73cd6dd..335dc1012ec 100644
--- a/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/test/AddonInfoRegistryMergeTest.java
+++ b/bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoRegistryMergeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.core.addon.test;
+package org.openhab.core.addon;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -33,11 +33,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
-import org.openhab.core.addon.AddonDiscoveryMethod;
-import org.openhab.core.addon.AddonInfo;
-import org.openhab.core.addon.AddonInfoProvider;
-import org.openhab.core.addon.AddonInfoRegistry;
-import org.openhab.core.addon.AddonMatchProperty;
 
 /**
  * JUnit test for the {@link AddonInfoRegistry} merge function.