From bd2e8f0791b6eab2ccf0f7665793af2aec622df2 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Thu, 21 Dec 2023 15:34:08 +0000 Subject: [PATCH] Adopt reviewer suggestions Signed-off-by: Andrew Fiddian-Green --- .../discovery/addon/usb/UsbAddonFinder.java | 21 ------------------- .../addon/usb/UsbAddonFinderTests.java | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.addon.usb/src/main/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinder.java b/bundles/org.openhab.core.config.discovery.addon.usb/src/main/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinder.java index 41859dd3ae0..cc48446b573 100644 --- a/bundles/org.openhab.core.config.discovery.addon.usb/src/main/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinder.java +++ b/bundles/org.openhab.core.config.discovery.addon.usb/src/main/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinder.java @@ -16,7 +16,6 @@ import static org.openhab.core.config.discovery.addon.AddonFinderConstants.SERVICE_TYPE_USB; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -32,9 +31,7 @@ import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery; import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener; -import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferencePolicy; @@ -66,14 +63,6 @@ public class UsbAddonFinder extends BaseAddonFinder implements UsbSerialDiscover private final Set usbSerialDiscoveries = new CopyOnWriteArraySet<>(); private final Map usbDeviceInformations = new ConcurrentHashMap<>(); - @Activate - public UsbAddonFinder() { - } - - @Deactivate - public void deactivate() { - } - @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC) protected void addUsbSerialDiscovery(UsbSerialDiscovery usbSerialDiscovery) { usbSerialDiscoveries.add(usbSerialDiscovery); @@ -86,16 +75,6 @@ protected synchronized void removeUsbSerialDiscovery(UsbSerialDiscovery usbSeria usbSerialDiscoveries.remove(usbSerialDiscovery); } - @Override - public void setAddonCandidates(List candidates) { - super.setAddonCandidates(candidates); - } - - @Override - public void unsetAddonCandidates() { - super.unsetAddonCandidates(); - } - @Override public Set getSuggestedAddons() { Set result = new HashSet<>(); diff --git a/bundles/org.openhab.core.config.discovery.addon.usb/src/test/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinderTests.java b/bundles/org.openhab.core.config.discovery.addon.usb/src/test/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinderTests.java index de84dad9d5e..ad8a305786c 100644 --- a/bundles/org.openhab.core.config.discovery.addon.usb/src/test/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinderTests.java +++ b/bundles/org.openhab.core.config.discovery.addon.usb/src/test/java/org/openhab/core/config/discovery/addon/usb/UsbAddonFinderTests.java @@ -34,7 +34,7 @@ import ch.qos.logback.classic.Level; /** - * This contains Junit tests for the {@link UsbAddonFinder} class. + * This contains tests for the {@link UsbAddonFinder} class. * * @author Andrew Fiddian-Green - Initial contribution */