diff --git a/bundles/org.openhab.binding.adorne/src/main/java/org/openhab/binding/adorne/internal/discovery/AdorneDiscoveryService.java b/bundles/org.openhab.binding.adorne/src/main/java/org/openhab/binding/adorne/internal/discovery/AdorneDiscoveryService.java index 454d9d58361..9e2668a01f7 100644 --- a/bundles/org.openhab.binding.adorne/src/main/java/org/openhab/binding/adorne/internal/discovery/AdorneDiscoveryService.java +++ b/bundles/org.openhab.binding.adorne/src/main/java/org/openhab/binding/adorne/internal/discovery/AdorneDiscoveryService.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * @author Mark Theiding - Initial Contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.adorne") +@Component(service = DiscoveryService.class, configurationPid = "discovery.adorne") public class AdorneDiscoveryService extends AbstractDiscoveryService implements AdorneHubChangeNotify { private final Logger logger = LoggerFactory.getLogger(AdorneDiscoveryService.class); diff --git a/bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/discovery/AirVisualNodeDiscoveryService.java b/bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/discovery/AirVisualNodeDiscoveryService.java index 0e5e341f6af..a05665754fb 100644 --- a/bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/discovery/AirVisualNodeDiscoveryService.java +++ b/bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/discovery/AirVisualNodeDiscoveryService.java @@ -39,7 +39,7 @@ import jcifs.smb.SmbFile; * * @author Victor Antonovich - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true) +@Component(service = DiscoveryService.class) public class AirVisualNodeDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(AirVisualNodeDiscoveryService.class); diff --git a/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/discovery/AllPlaySpeakerDiscoveryService.java b/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/discovery/AllPlaySpeakerDiscoveryService.java index 5cf3694fd3e..74be5f4c0c8 100644 --- a/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/discovery/AllPlaySpeakerDiscoveryService.java +++ b/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/discovery/AllPlaySpeakerDiscoveryService.java @@ -40,7 +40,7 @@ import de.kaizencode.tchaikovsky.speaker.Speaker; * * @author Dominic Lerbs - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.allplay") +@Component(service = DiscoveryService.class, configurationPid = "discovery.allplay") public class AllPlaySpeakerDiscoveryService extends AbstractDiscoveryService implements SpeakerAnnouncedListener { private final Logger logger = LoggerFactory.getLogger(AllPlaySpeakerDiscoveryService.class); diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/discovery/AmazonDashButtonDiscoveryService.java b/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/discovery/AmazonDashButtonDiscoveryService.java index 9b95930540f..312edd25b69 100644 --- a/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/discovery/AmazonDashButtonDiscoveryService.java +++ b/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/discovery/AmazonDashButtonDiscoveryService.java @@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory; * @author Oliver Libutzki - Initial contribution * */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.amazondashbutton") +@Component(service = DiscoveryService.class, configurationPid = "discovery.amazondashbutton") public class AmazonDashButtonDiscoveryService extends AbstractDiscoveryService implements PcapNetworkInterfaceListener { private static final int DISCOVER_TIMEOUT_SECONDS = 30; diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/discovery/AstroDiscoveryService.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/discovery/AstroDiscoveryService.java index 7e3561a297c..1dc040e7066 100644 --- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/discovery/AstroDiscoveryService.java +++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/discovery/AstroDiscoveryService.java @@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory; * @author Stefan Triller - Use configured location */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.astro") +@Component(service = DiscoveryService.class, configurationPid = "discovery.astro") public class AstroDiscoveryService extends AbstractDiscoveryService { private static final int DISCOVER_TIMEOUT_SECONDS = 2; private static final int LOCATION_CHANGED_CHECK_INTERVAL = 60; diff --git a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/discovery/AtlonaDiscovery.java b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/discovery/AtlonaDiscovery.java index 465258e27ce..d490ac9d204 100644 --- a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/discovery/AtlonaDiscovery.java +++ b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/discovery/AtlonaDiscovery.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * * @author Tim Roberts - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.atlona") +@Component(service = DiscoveryService.class, configurationPid = "discovery.atlona") public class AtlonaDiscovery extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(AtlonaDiscovery.class); diff --git a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java index 1d75767829b..174998980d1 100644 --- a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * */ @NonNullByDefault -@Component(immediate = true) +@Component public class AutelisDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(AutelisDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java index e1ebff87f8e..8c958ebb97d 100644 --- a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * @author Christoph Weitkamp - Added support for groups * @author Christoph Weitkamp - Use "discovery.avmfritz:background=false" to disable discovery service */ -@Component(immediate = true, configurationPid = "discovery.avmfritz") +@Component(configurationPid = "discovery.avmfritz") @NonNullByDefault public class AVMFritzUpnpDiscoveryParticipant implements UpnpDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/discovery/BigAssFanDiscoveryService.java b/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/discovery/BigAssFanDiscoveryService.java index 4c21d958ec2..23ed912e7b0 100644 --- a/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/discovery/BigAssFanDiscoveryService.java +++ b/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/discovery/BigAssFanDiscoveryService.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * * @author Mark Hilbush - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.bigassfan") +@Component(service = DiscoveryService.class, configurationPid = "discovery.bigassfan") public class BigAssFanDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(BigAssFanDiscoveryService.class); diff --git a/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsDiscoveryParticipant.java b/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsDiscoveryParticipant.java index a5f0533ab18..1060566c969 100644 --- a/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsDiscoveryParticipant.java @@ -36,7 +36,7 @@ import org.osgi.service.component.annotations.Component; * */ @NonNullByDefault -@Component(immediate = true) +@Component public class AirthingsDiscoveryParticipant implements BluetoothDiscoveryParticipant { private static final int AIRTHINGS_COMPANY_ID = 820; // Formerly Corentium AS diff --git a/bundles/org.openhab.binding.bluetooth.am43/src/main/java/org/openhab/binding/bluetooth/am43/internal/AM43DiscoveryParticipant.java b/bundles/org.openhab.binding.bluetooth.am43/src/main/java/org/openhab/binding/bluetooth/am43/internal/AM43DiscoveryParticipant.java index 95391d86324..33cb14ed530 100644 --- a/bundles/org.openhab.binding.bluetooth.am43/src/main/java/org/openhab/binding/bluetooth/am43/internal/AM43DiscoveryParticipant.java +++ b/bundles/org.openhab.binding.bluetooth.am43/src/main/java/org/openhab/binding/bluetooth/am43/internal/AM43DiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.Component; * */ @NonNullByDefault -@Component(immediate = true) +@Component public class AM43DiscoveryParticipant implements BluetoothDiscoveryParticipant { @Override diff --git a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/discovery/BlueZDiscoveryService.java b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/discovery/BlueZDiscoveryService.java index a0e895940b0..0ad4de71b4e 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/discovery/BlueZDiscoveryService.java +++ b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/discovery/BlueZDiscoveryService.java @@ -35,7 +35,7 @@ import tinyb.BluetoothManager; * @author Hilbrand Bouwkamp - Moved background scan to actual background method * */ -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.bluetooth.bluez") +@Component(service = DiscoveryService.class, configurationPid = "discovery.bluetooth.bluez") public class BlueZDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(BlueZDiscoveryService.class); diff --git a/bundles/org.openhab.binding.bluetooth.blukii/src/main/java/org/openhab/binding/bluetooth/blukii/internal/BlukiiDiscoveryParticipant.java b/bundles/org.openhab.binding.bluetooth.blukii/src/main/java/org/openhab/binding/bluetooth/blukii/internal/BlukiiDiscoveryParticipant.java index 1a33344b55e..ae71bef686d 100644 --- a/bundles/org.openhab.binding.bluetooth.blukii/src/main/java/org/openhab/binding/bluetooth/blukii/internal/BlukiiDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.bluetooth.blukii/src/main/java/org/openhab/binding/bluetooth/blukii/internal/BlukiiDiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.Component; * */ @NonNullByDefault -@Component(immediate = true) +@Component public class BlukiiDiscoveryParticipant implements BluetoothDiscoveryParticipant { @Override diff --git a/bundles/org.openhab.binding.bluetooth.roaming/src/main/java/org/openhab/binding/bluetooth/roaming/internal/RoamingBluetoothDiscoveryParticipant.java b/bundles/org.openhab.binding.bluetooth.roaming/src/main/java/org/openhab/binding/bluetooth/roaming/internal/RoamingBluetoothDiscoveryParticipant.java index f73fcfa17be..426edc69e76 100644 --- a/bundles/org.openhab.binding.bluetooth.roaming/src/main/java/org/openhab/binding/bluetooth/roaming/internal/RoamingBluetoothDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.bluetooth.roaming/src/main/java/org/openhab/binding/bluetooth/roaming/internal/RoamingBluetoothDiscoveryParticipant.java @@ -38,7 +38,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Connor Petty - Initial contribution */ @NonNullByDefault -@Component(immediate = true, service = { BluetoothDiscoveryParticipant.class }) +@Component(service = { BluetoothDiscoveryParticipant.class }) public class RoamingBluetoothDiscoveryParticipant implements BluetoothDiscoveryParticipant { private final Set adapters = new CopyOnWriteArraySet<>(); diff --git a/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/java/org/openhab/binding/bluetooth/ruuvitag/internal/RuuviTagDiscoveryParticipant.java b/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/java/org/openhab/binding/bluetooth/ruuvitag/internal/RuuviTagDiscoveryParticipant.java index 7835522661a..1390b9c3720 100644 --- a/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/java/org/openhab/binding/bluetooth/ruuvitag/internal/RuuviTagDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/java/org/openhab/binding/bluetooth/ruuvitag/internal/RuuviTagDiscoveryParticipant.java @@ -36,7 +36,7 @@ import org.osgi.service.component.annotations.Component; * */ @NonNullByDefault -@Component(immediate = true) +@Component public class RuuviTagDiscoveryParticipant implements BluetoothDiscoveryParticipant { private static final int RUUVITAG_COMPANY_ID = 1177; diff --git a/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryService.java b/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryService.java index da64eb3c471..3574ff14862 100644 --- a/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryService.java +++ b/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryService.java @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; * @author Connor Petty - Introduced connection based discovery and added roaming support */ @NonNullByDefault -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.bluetooth") +@Component(service = DiscoveryService.class, configurationPid = "discovery.bluetooth") public class BluetoothDiscoveryService extends AbstractDiscoveryService implements BluetoothDiscoveryListener { private final Logger logger = LoggerFactory.getLogger(BluetoothDiscoveryService.class); diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java index 368d8141947..63bda68ef58 100644 --- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * @author Christian Niessner - Initial contribution * @author Thomas Traunbauer - Initial contribution */ -@Component(immediate = true, configurationPid = "discovery.bosesoundtouch") +@Component(configurationPid = "discovery.bosesoundtouch") public class SoundTouchDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(SoundTouchDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java index 82784e5e169..fd9142ad691 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java @@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory; * * @author Fabio Possieri - Initial contribution */ -@Component(service = SmartherAccountService.class, immediate = true, configurationPid = "binding.bticinosmarther.accountService") +@Component(service = SmartherAccountService.class, configurationPid = "binding.bticinosmarther.accountService") @NonNullByDefault public class SmartherAccountService { diff --git a/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/discovery/ChromecastDiscoveryParticipant.java b/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/discovery/ChromecastDiscoveryParticipant.java index a4891c62bf8..0661219a3b5 100644 --- a/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/discovery/ChromecastDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/discovery/ChromecastDiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - Initial contribution * @author Daniel Walters - Change discovery protocol to mDNS */ -@Component(immediate = true) +@Component @NonNullByDefault public class ChromecastDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(ChromecastDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/discovery/CoronaStatsDiscoveryService.java b/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/discovery/CoronaStatsDiscoveryService.java index 501f5fb1140..e595f4de648 100644 --- a/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/discovery/CoronaStatsDiscoveryService.java +++ b/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/discovery/CoronaStatsDiscoveryService.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * @author Johannes Ott - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.coronastats") +@Component(service = DiscoveryService.class, configurationPid = "discovery.coronastats") public class CoronaStatsDiscoveryService extends AbstractDiscoveryService { private static final ThingUID WORLD_THING_UID = new ThingUID(THING_TYPE_WORLD, STATS); private static final int DISCOVER_TIMEOUT_SECONDS = 2; diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java index dd58c6ed511..e67f8588503 100644 --- a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java +++ b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * @author Ralf Duckstein - Initial contribution * @author Robert Bach - heavy refactorings */ -@Component(service = DiscoveryService.class, immediate = true) +@Component(service = DiscoveryService.class) @NonNullByDefault public class DanfossAirUnitDiscoveryService extends AbstractDiscoveryService { diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/StateDescriptionProvider.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/StateDescriptionProvider.java index b2c8f95771e..5bed4cbb16f 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/StateDescriptionProvider.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/StateDescriptionProvider.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * @author Jan N. Klug - Initial contribution */ @NonNullByDefault -@Component(service = { DynamicStateDescriptionProvider.class, StateDescriptionProvider.class }, immediate = true) +@Component(service = { DynamicStateDescriptionProvider.class, StateDescriptionProvider.class }) public class StateDescriptionProvider implements DynamicStateDescriptionProvider { private final Map descriptions = new ConcurrentHashMap<>(); diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java index b1b718b0709..dc946a268a6 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java @@ -41,7 +41,7 @@ import org.osgi.service.component.annotations.Component; * @author David Graeff - Initial contribution */ @NonNullByDefault -@Component(service = UpnpDiscoveryParticipant.class, immediate = true) +@Component(service = UpnpDiscoveryParticipant.class) public class BridgeDiscoveryParticipant implements UpnpDiscoveryParticipant { @Override diff --git a/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/discovery/DenonMarantzDiscoveryParticipant.java b/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/discovery/DenonMarantzDiscoveryParticipant.java index 44967ab6966..331d4e61af0 100644 --- a/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/discovery/DenonMarantzDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/discovery/DenonMarantzDiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * @author Jan-Willem Veldhuis - Initial contribution * */ -@Component(immediate = true) +@Component public class DenonMarantzDiscoveryParticipant implements MDNSDiscoveryParticipant { private Logger logger = LoggerFactory.getLogger(DenonMarantzDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeDiscoveryService.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeDiscoveryService.java index 81f41b883b8..66f87f94d85 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeDiscoveryService.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * @author Michael Ochel - Initial contribution * @author Matthias Siegele - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.digitalstrom") +@Component(service = DiscoveryService.class, configurationPid = "discovery.digitalstrom") public class BridgeDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(BridgeDiscoveryService.class); diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeMDNSDiscoveryParticipant.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeMDNSDiscoveryParticipant.java index d25db10a1d1..a54cd9b9ec5 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeMDNSDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/BridgeMDNSDiscoveryParticipant.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * @author Matthias Siegele - Initial contribution * */ -@Component(service = MDNSDiscoveryParticipant.class, immediate = true) +@Component(service = MDNSDiscoveryParticipant.class) public class BridgeMDNSDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(BridgeMDNSDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsChannelTypeProvider.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsChannelTypeProvider.java index e8be98fdc8b..b57157b1f69 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsChannelTypeProvider.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsChannelTypeProvider.java @@ -53,7 +53,7 @@ import org.osgi.service.component.annotations.Reference; * @author Matthias Siegele - Initial contribution * */ -@Component(service = ChannelTypeProvider.class, immediate = true) +@Component(service = ChannelTypeProvider.class) public class DsChannelTypeProvider extends BaseDsI18n implements ChannelTypeProvider { // channelID building (effect group type + (nothing || SEPERATOR + item type || SEPERATOR + extended item type) e.g. diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java index 03fba9c42c6..88542d53ab2 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; * @author Michael Ochel - initial contributer * @author Matthias Siegele - initial contributer */ -@Component(service = ThingTypeProvider.class, immediate = true) +@Component(service = ThingTypeProvider.class) public class DsDeviceThingTypeProvider extends BaseDsI18n implements ThingTypeProvider { /** diff --git a/bundles/org.openhab.binding.dlinksmarthome/src/main/java/org/openhab/binding/dlinksmarthome/internal/DLinkSmartHomeDiscoveryParticipant.java b/bundles/org.openhab.binding.dlinksmarthome/src/main/java/org/openhab/binding/dlinksmarthome/internal/DLinkSmartHomeDiscoveryParticipant.java index 4a1d7d4761c..2f0eb64c3f6 100644 --- a/bundles/org.openhab.binding.dlinksmarthome/src/main/java/org/openhab/binding/dlinksmarthome/internal/DLinkSmartHomeDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.dlinksmarthome/src/main/java/org/openhab/binding/dlinksmarthome/internal/DLinkSmartHomeDiscoveryParticipant.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * @author Mike Major - Initial contribution * */ -@Component(immediate = true) +@Component public class DLinkSmartHomeDiscoveryParticipant implements MDNSDiscoveryParticipant { private static final String SERVICE_TYPE = "_dhnap._tcp.local."; diff --git a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/discovery/DSCAlarmBridgeDiscovery.java b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/discovery/DSCAlarmBridgeDiscovery.java index 38ed048d129..7090a925990 100644 --- a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/discovery/DSCAlarmBridgeDiscovery.java +++ b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/discovery/DSCAlarmBridgeDiscovery.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * @author Russell Stephens - Initial Contribution * */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.dscalarm") +@Component(service = DiscoveryService.class, configurationPid = "discovery.dscalarm") public class DSCAlarmBridgeDiscovery extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(DSCAlarmBridgeDiscovery.class); diff --git a/bundles/org.openhab.binding.dwdpollenflug/src/main/java/org/openhab/binding/dwdpollenflug/internal/discovery/DWDPollenflugDiscoveryService.java b/bundles/org.openhab.binding.dwdpollenflug/src/main/java/org/openhab/binding/dwdpollenflug/internal/discovery/DWDPollenflugDiscoveryService.java index 53e5ba0e198..df8bec57af3 100644 --- a/bundles/org.openhab.binding.dwdpollenflug/src/main/java/org/openhab/binding/dwdpollenflug/internal/discovery/DWDPollenflugDiscoveryService.java +++ b/bundles/org.openhab.binding.dwdpollenflug/src/main/java/org/openhab/binding/dwdpollenflug/internal/discovery/DWDPollenflugDiscoveryService.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * @author Johannes Ott - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.dwdpollenflug") +@Component(service = DiscoveryService.class, configurationPid = "discovery.dwdpollenflug") public class DWDPollenflugDiscoveryService extends AbstractDiscoveryService { private static final ThingUID BRIDGE_THING_UID = new ThingUID(THING_TYPE_BRIDGE, DWD); private static final int DISCOVER_TIMEOUT_SECONDS = 2; diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java index 8c9053ea1cf..b25e025d209 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/discovery/Enigma2DiscoveryParticipant.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * @author Guido Dolfen - Initial contribution */ @NonNullByDefault -@Component(service = MDNSDiscoveryParticipant.class, immediate = true) +@Component(service = MDNSDiscoveryParticipant.class) public class Enigma2DiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(Enigma2DiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/EtherRainHandlerFactory.java b/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/EtherRainHandlerFactory.java index 338b3eacf59..1866c9186d0 100644 --- a/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/EtherRainHandlerFactory.java +++ b/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/EtherRainHandlerFactory.java @@ -32,7 +32,7 @@ import org.osgi.service.component.annotations.Reference; * * @author Joe Inkenbrandt - Initial contribution */ -@Component(service = ThingHandlerFactory.class, immediate = true, configurationPid = "binding.etherrain") +@Component(service = ThingHandlerFactory.class, configurationPid = "binding.etherrain") @NonNullByDefault public class EtherRainHandlerFactory extends BaseThingHandlerFactory { diff --git a/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/discovery/EtherrainDiscoveryService.java b/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/discovery/EtherrainDiscoveryService.java index 0c8bdbbc6a2..8222207e5b1 100644 --- a/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/discovery/EtherrainDiscoveryService.java +++ b/bundles/org.openhab.binding.etherrain/src/main/java/org/openhab/binding/etherrain/internal/discovery/EtherrainDiscoveryService.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * @author Joe Inkenbrandt - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.etherrain") +@Component(service = DiscoveryService.class, configurationPid = "discovery.etherrain") public class EtherrainDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(EtherrainDiscoveryService.class); diff --git a/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/FeicanDiscoveryService.java b/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/FeicanDiscoveryService.java index 4b2bc766076..bbea2a14177 100644 --- a/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/FeicanDiscoveryService.java +++ b/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/FeicanDiscoveryService.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * @author Hilbrand Bouwkamp - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.feican") +@Component(service = DiscoveryService.class, configurationPid = "discovery.feican") public class FeicanDiscoveryService extends AbstractDiscoveryService { private static final int DISCOVERY_TIMEOUT_SECONDS = 5; diff --git a/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/discovery/FMIWeatherDiscoveryService.java b/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/discovery/FMIWeatherDiscoveryService.java index ee93f357b89..984c5d69876 100644 --- a/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/discovery/FMIWeatherDiscoveryService.java +++ b/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/discovery/FMIWeatherDiscoveryService.java @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; * @author Sami Salonen - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.fmiweather") +@Component(service = DiscoveryService.class, configurationPid = "discovery.fmiweather") public class FMIWeatherDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(FMIWeatherDiscoveryService.class); diff --git a/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/discovery/FoldingSlotDiscoveryService.java b/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/discovery/FoldingSlotDiscoveryService.java index 64e955e893a..f8a93be165f 100644 --- a/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/discovery/FoldingSlotDiscoveryService.java +++ b/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/discovery/FoldingSlotDiscoveryService.java @@ -33,7 +33,7 @@ import org.osgi.service.component.annotations.Component; * * @author Marius Bjoernstad - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.folding") +@Component(service = DiscoveryService.class, configurationPid = "discovery.folding") public class FoldingSlotDiscoveryService extends AbstractDiscoveryService { public FoldingSlotDiscoveryService() { diff --git a/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/discovery/FreeboxServerDiscoveryParticipant.java b/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/discovery/FreeboxServerDiscoveryParticipant.java index 7d38c5e593d..b4859c1f769 100644 --- a/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/discovery/FreeboxServerDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/discovery/FreeboxServerDiscoveryParticipant.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * * @author Laurent Garnier - Initial contribution */ -@Component(immediate = true) +@Component public class FreeboxServerDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(FreeboxServerDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/FSInternetRadioDiscoveryParticipant.java b/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/FSInternetRadioDiscoveryParticipant.java index 4201bf219ec..e6a06f6c0d9 100644 --- a/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/FSInternetRadioDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/FSInternetRadioDiscoveryParticipant.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * @author Mihaela Memova - removed the getLabel(RemoteDevice device) method due to its unreachable code lines * @author Markus Michels - support for Teufel 3sixty discovery */ -@Component(immediate = true) +@Component public class FSInternetRadioDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(FSInternetRadioDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/discovery/GlobalCacheDiscoveryService.java b/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/discovery/GlobalCacheDiscoveryService.java index 1185747b245..49bb8f4e31e 100644 --- a/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/discovery/GlobalCacheDiscoveryService.java +++ b/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/discovery/GlobalCacheDiscoveryService.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * * @author Mark Hilbush - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.globalcache") +@Component(service = DiscoveryService.class, configurationPid = "discovery.globalcache") public class GlobalCacheDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(GlobalCacheDiscoveryService.class); diff --git a/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/discovery/TrackerDiscoveryService.java b/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/discovery/TrackerDiscoveryService.java index 784f7e8e078..a431a614ac3 100644 --- a/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/discovery/TrackerDiscoveryService.java +++ b/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/discovery/TrackerDiscoveryService.java @@ -40,7 +40,7 @@ import org.osgi.service.component.annotations.Modified; */ @NonNullByDefault @Component(service = { DiscoveryService.class, - TrackerDiscoveryService.class }, immediate = true, configurationPid = "discovery.gpstracker") + TrackerDiscoveryService.class }, configurationPid = "discovery.gpstracker") public class TrackerDiscoveryService extends AbstractDiscoveryService { /** * Discovery timeout diff --git a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeTranslationProvider.java b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeTranslationProvider.java index a912a448391..bfdf92cf253 100644 --- a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeTranslationProvider.java +++ b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeTranslationProvider.java @@ -30,7 +30,7 @@ import org.osgi.service.component.annotations.Reference; * @author Markus Michels - Initial contribution */ @NonNullByDefault -@Component(service = GreeTranslationProvider.class, immediate = true, configurationPid = "localization.gree") +@Component(service = GreeTranslationProvider.class, configurationPid = "localization.gree") public class GreeTranslationProvider { private final Bundle bundle; diff --git a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java index 26071e395b3..f72e12473e7 100644 --- a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java +++ b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java @@ -49,7 +49,7 @@ import com.google.gson.JsonSyntaxException; * @author Markus Michels - Refactoring, adapted to OH 2.5x */ @NonNullByDefault -@Component(service = GreeDeviceFinder.class, immediate = true, configurationPid = "devicefinder.gree") +@Component(service = GreeDeviceFinder.class, configurationPid = "devicefinder.gree") public class GreeDeviceFinder { private final Logger logger = LoggerFactory.getLogger(GreeDeviceFinder.class); private static final Gson gson = (new GsonBuilder()).create(); diff --git a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDiscoveryService.java b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDiscoveryService.java index 657c54d8c4e..48370155c89 100644 --- a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDiscoveryService.java +++ b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDiscoveryService.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.gree") +@Component(service = DiscoveryService.class, configurationPid = "discovery.gree") public class GreeDiscoveryService extends AbstractDiscoveryService { private static final int TIMEOUT_SEC = 10; private final Logger logger = LoggerFactory.getLogger(GreeDiscoveryService.class); diff --git a/bundles/org.openhab.binding.harmonyhub/src/main/java/org/openhab/binding/harmonyhub/internal/discovery/HarmonyHubDiscoveryService.java b/bundles/org.openhab.binding.harmonyhub/src/main/java/org/openhab/binding/harmonyhub/internal/discovery/HarmonyHubDiscoveryService.java index aeef34c97f4..214c5a5abab 100644 --- a/bundles/org.openhab.binding.harmonyhub/src/main/java/org/openhab/binding/harmonyhub/internal/discovery/HarmonyHubDiscoveryService.java +++ b/bundles/org.openhab.binding.harmonyhub/src/main/java/org/openhab/binding/harmonyhub/internal/discovery/HarmonyHubDiscoveryService.java @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; * @author Wouter Born - Add null annotations */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.harmonyhub") +@Component(service = DiscoveryService.class, configurationPid = "discovery.harmonyhub") public class HarmonyHubDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(HarmonyHubDiscoveryService.class); diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryParticipant.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryParticipant.java index 79d16ca7e3e..eb057832703 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryParticipant.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * @author Andrew Fiddian-Green - Initial contribution */ @NonNullByDefault -@Component(immediate = true) +@Component public class HDPowerViewHubDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(HDPowerViewHubDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryService.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryService.java index eb147688b96..742fbfb7978 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryService.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/discovery/HDPowerViewHubDiscoveryService.java @@ -39,7 +39,7 @@ import jcifs.netbios.NbtAddress; * @author Andy Lintner - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.hdpowerview") +@Component(service = DiscoveryService.class, configurationPid = "discovery.hdpowerview") public class HDPowerViewHubDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(HDPowerViewHubDiscoveryService.class); diff --git a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/discovery/HeosDiscoveryParticipant.java b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/discovery/HeosDiscoveryParticipant.java index ff1112cceef..d1a398a9439 100644 --- a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/discovery/HeosDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/discovery/HeosDiscoveryParticipant.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * @author Johannes Einig - Initial contribution */ @NonNullByDefault -@Component(service = UpnpDiscoveryParticipant.class, immediate = true, configurationPid = "discovery.heos") +@Component(service = UpnpDiscoveryParticipant.class, configurationPid = "discovery.heos") public class HeosDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(HeosDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/CcuDiscoveryService.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/CcuDiscoveryService.java index 68a53d66b8f..590edd2aeb3 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/CcuDiscoveryService.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/CcuDiscoveryService.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * * @author Gerhard Riegler - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.homematic") +@Component(service = DiscoveryService.class, configurationPid = "discovery.homematic") public class CcuDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(CcuDiscoveryService.class); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/HomegearDiscoveryParticipant.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/HomegearDiscoveryParticipant.java index e2887858508..1b871672170 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/HomegearDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/HomegearDiscoveryParticipant.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * * @author Gerhard Riegler - Initial contribution */ -@Component(immediate = true) +@Component public class HomegearDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(HomegearDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelGroupTypeProviderImpl.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelGroupTypeProviderImpl.java index a4a6d0f240d..e03e47aa9ee 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelGroupTypeProviderImpl.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelGroupTypeProviderImpl.java @@ -34,7 +34,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * * @author Michael Reitler - Initial contribution */ -@Component(service = { HomematicChannelGroupTypeProvider.class, ChannelGroupTypeProvider.class }, immediate = true) +@Component(service = { HomematicChannelGroupTypeProvider.class, ChannelGroupTypeProvider.class }) public class HomematicChannelGroupTypeProviderImpl implements HomematicChannelGroupTypeProvider { private final Map channelGroupTypesByUID = new HashMap<>(); protected List homematicThingTypeExcluders = new CopyOnWriteArrayList<>(); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelTypeProviderImpl.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelTypeProviderImpl.java index a8e2cf07aee..cdcb428afb0 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelTypeProviderImpl.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicChannelTypeProviderImpl.java @@ -35,7 +35,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Gerhard Riegler - Initial contribution * @author Michael Reitler - Added HomematicThingTypeExcluder */ -@Component(service = { HomematicChannelTypeProvider.class, ChannelTypeProvider.class }, immediate = true) +@Component(service = { HomematicChannelTypeProvider.class, ChannelTypeProvider.class }) public class HomematicChannelTypeProviderImpl implements HomematicChannelTypeProvider { private final Map channelTypesByUID = new HashMap<>(); protected List homematicThingTypeExcluders = new CopyOnWriteArrayList<>(); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicConfigDescriptionProviderImpl.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicConfigDescriptionProviderImpl.java index b213e82888d..a0246ff3d8c 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicConfigDescriptionProviderImpl.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicConfigDescriptionProviderImpl.java @@ -35,7 +35,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Gerhard Riegler - Initial contribution * @author Michael Reitler - Added HomematicThingTypeExcluder */ -@Component(service = { HomematicConfigDescriptionProvider.class, ConfigDescriptionProvider.class }, immediate = true) +@Component(service = { HomematicConfigDescriptionProvider.class, ConfigDescriptionProvider.class }) public class HomematicConfigDescriptionProviderImpl implements HomematicConfigDescriptionProvider { private Map configDescriptionsByURI = new HashMap<>(); protected List homematicThingTypeExcluders = new CopyOnWriteArrayList<>(); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicThingTypeProviderImpl.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicThingTypeProviderImpl.java index a94b9b15253..6a2054f5cf7 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicThingTypeProviderImpl.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicThingTypeProviderImpl.java @@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Gerhard Riegler - Initial contribution * @author Michael Reitler - Added HomematicThingTypeExcluder */ -@Component(service = { HomematicThingTypeProvider.class, ThingTypeProvider.class }, immediate = true) +@Component(service = { HomematicThingTypeProvider.class, ThingTypeProvider.class }) public class HomematicThingTypeProviderImpl implements HomematicThingTypeProvider { private Map thingTypesByUID = new HashMap<>(); protected List homematicThingTypeExcluders = new CopyOnWriteArrayList<>(); diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicTypeGeneratorImpl.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicTypeGeneratorImpl.java index aef06ffe96e..948ca9179f7 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicTypeGeneratorImpl.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicTypeGeneratorImpl.java @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * * @author Gerhard Riegler - Initial contribution */ -@Component(immediate = true) +@Component public class HomematicTypeGeneratorImpl implements HomematicTypeGenerator { private final Logger logger = LoggerFactory.getLogger(HomematicTypeGeneratorImpl.class); private static URI configDescriptionUriChannel; diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterDiscoveryParticipant.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterDiscoveryParticipant.java index 1ce78bac263..7d13afe2886 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterDiscoveryParticipant.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * @author Stewart Cossey - Initial contribution */ @NonNullByDefault -@Component(immediate = true) +@Component public class HPPrinterDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(HPPrinterDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java index 4f3a13a9d53..1c47be34b60 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java @@ -41,7 +41,7 @@ import org.osgi.service.component.annotations.Component; * @author Thomas Höfer - Added representation */ @NonNullByDefault -@Component(service = UpnpDiscoveryParticipant.class, immediate = true) +@Component(service = UpnpDiscoveryParticipant.class) public class HueBridgeDiscoveryParticipant implements UpnpDiscoveryParticipant { @Override diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java index 860e732b000..9f0f8fcfa28 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java @@ -49,7 +49,7 @@ import com.google.gson.reflect.TypeToken; * @author Andre Fuechsel - make {@link #startScan()} asynchronous */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.hue") +@Component(service = DiscoveryService.class, configurationPid = "discovery.hue") public class HueBridgeNupnpDiscovery extends AbstractDiscoveryService { private static final String MODEL_NAME_PHILIPS_HUE = "Philips hue"; diff --git a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/HyperionDiscoveryParticipant.java b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/HyperionDiscoveryParticipant.java index 7e88d4cf42c..c61fe7f1d34 100644 --- a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/HyperionDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/HyperionDiscoveryParticipant.java @@ -34,7 +34,7 @@ import org.osgi.service.component.annotations.Component; * @author Daniel Walters - Initial contribution */ -@Component(immediate = true) +@Component public class HyperionDiscoveryParticipant implements MDNSDiscoveryParticipant { @Override diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraDiscoveryService.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraDiscoveryService.java index c4b4533def1..0578ff7ae32 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraDiscoveryService.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraDiscoveryService.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "binding.ipcamera") +@Component(service = DiscoveryService.class, configurationPid = "binding.ipcamera") public class IpCameraDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(IpCameraDiscoveryService.class); diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraHandlerFactory.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraHandlerFactory.java index 0f14591f43e..73f7378e4aa 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraHandlerFactory.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraHandlerFactory.java @@ -35,7 +35,7 @@ import org.osgi.service.component.annotations.Reference; * * @author Matthew Skinner - Initial contribution */ -@Component(service = ThingHandlerFactory.class, immediate = true, configurationPid = "binding.ipcamera") +@Component(service = ThingHandlerFactory.class, configurationPid = "binding.ipcamera") @NonNullByDefault public class IpCameraHandlerFactory extends BaseThingHandlerFactory { private final @Nullable String openhabIpAddress; diff --git a/bundles/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/IppPrinterDiscoveryParticipant.java b/bundles/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/IppPrinterDiscoveryParticipant.java index e4f7a4dfc8d..8dc571d70e1 100644 --- a/bundles/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/IppPrinterDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/IppPrinterDiscoveryParticipant.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * * @author Tobias Bräutigam - Initial contribution */ -@Component(immediate = true) +@Component public class IppPrinterDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(IppPrinterDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/KM200ChannelTypeProvider.java b/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/KM200ChannelTypeProvider.java index bb3740d3e90..e96a027827d 100644 --- a/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/KM200ChannelTypeProvider.java +++ b/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/KM200ChannelTypeProvider.java @@ -34,8 +34,7 @@ import org.osgi.service.component.annotations.Component; * * @author Markus Eckhardt - Initial contribution */ -@Component(service = { ChannelTypeProvider.class, ChannelGroupTypeProvider.class, - KM200ChannelTypeProvider.class }, immediate = true) +@Component(service = { ChannelTypeProvider.class, ChannelGroupTypeProvider.class, KM200ChannelTypeProvider.class }) @NonNullByDefault public class KM200ChannelTypeProvider implements ChannelTypeProvider, ChannelGroupTypeProvider { private final List channelTypes = new CopyOnWriteArrayList<>(); diff --git a/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/discovery/KM200GatewayDiscoveryParticipant.java b/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/discovery/KM200GatewayDiscoveryParticipant.java index 720ff892898..f7c45b6956d 100644 --- a/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/discovery/KM200GatewayDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/discovery/KM200GatewayDiscoveryParticipant.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * @author Markus Eckhardt - Initial contribution */ @NonNullByDefault -@Component(immediate = true, configurationPid = "binding.km200") +@Component(configurationPid = "binding.km200") public class KM200GatewayDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(KM200GatewayDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/discovery/KodiUpnpDiscoveryParticipant.java b/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/discovery/KodiUpnpDiscoveryParticipant.java index 84e5feb864c..9842b619ba0 100644 --- a/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/discovery/KodiUpnpDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/discovery/KodiUpnpDiscoveryParticipant.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * @author Paul Frank - Initial contribution * @author Christoph Weitkamp - Use "discovery.kodi:background=false" to disable discovery service */ -@Component(immediate = true, configurationPid = "discovery.kodi") +@Component(configurationPid = "discovery.kodi") @NonNullByDefault public class KodiUpnpDiscoveryParticipant implements UpnpDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/discovery/KonnectedUPnPServer.java b/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/discovery/KonnectedUPnPServer.java index bfff2cba374..32bce2528aa 100644 --- a/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/discovery/KonnectedUPnPServer.java +++ b/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/discovery/KonnectedUPnPServer.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * */ @NonNullByDefault -@Component(service = UpnpDiscoveryParticipant.class, immediate = true) +@Component(service = UpnpDiscoveryParticipant.class) public class KonnectedUPnPServer implements UpnpDiscoveryParticipant { private Logger logger = LoggerFactory.getLogger(KonnectedUPnPServer.class); diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/GsonProvider.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/GsonProvider.java index 1196adfc0c8..4ecc58a9678 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/GsonProvider.java +++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/GsonProvider.java @@ -44,7 +44,7 @@ import com.google.gson.Gson; @Provider @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) -@Component(immediate = true) +@Component public class GsonProvider implements MessageBodyReader, MessageBodyWriter { private final Gson gson; diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/discovery/LaMetricTimeDiscoveryParticipant.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/discovery/LaMetricTimeDiscoveryParticipant.java index 7f5cb63e020..7f45f428311 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/discovery/LaMetricTimeDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/discovery/LaMetricTimeDiscoveryParticipant.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * * @author Gregory Moyer - Initial contribution */ -@Component(immediate = true) +@Component public class LaMetricTimeDiscoveryParticipant implements UpnpDiscoveryParticipant { private Logger logger = LoggerFactory.getLogger(LaMetricTimeDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java index 0247de7ea26..34c9d15ff92 100644 --- a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java +++ b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java @@ -54,7 +54,7 @@ import com.thoughtworks.xstream.io.xml.StaxDriver; * @author Fabian Wolter - Initial Contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.lcn") +@Component(service = DiscoveryService.class, configurationPid = "discovery.lcn") public class LcnPchkDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(LcnPchkDiscoveryService.class); private static final String HOSTNAME = "hostname"; diff --git a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/discovery/LeapMotionDiscoveryService.java b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/discovery/LeapMotionDiscoveryService.java index 9aa542f9756..434056109ec 100644 --- a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/discovery/LeapMotionDiscoveryService.java +++ b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/discovery/LeapMotionDiscoveryService.java @@ -35,7 +35,7 @@ import com.leapmotion.leap.Listener; * */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.leapmotion") +@Component(service = DiscoveryService.class, configurationPid = "discovery.leapmotion") public class LeapMotionDiscoveryService extends AbstractDiscoveryService { private @NonNullByDefault({}) Controller leapController; diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/discovery/LGWebOSUpnpDiscoveryParticipant.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/discovery/LGWebOSUpnpDiscoveryParticipant.java index ca4ddcd295a..01ed058aa89 100644 --- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/discovery/LGWebOSUpnpDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/discovery/LGWebOSUpnpDiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * @author Sebastian Prehn - Initial contribution */ @NonNullByDefault -@Component(service = UpnpDiscoveryParticipant.class, immediate = true, configurationPid = "discovery.lgwebos.upnp") +@Component(service = UpnpDiscoveryParticipant.class, configurationPid = "discovery.lgwebos.upnp") public class LGWebOSUpnpDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(LGWebOSUpnpDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxChannelFactoryImpl.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxChannelFactoryImpl.java index dbda90c06ad..208f49a3f61 100644 --- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxChannelFactoryImpl.java +++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxChannelFactoryImpl.java @@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.Reference; * @author Wouter Born - Add i18n support */ @NonNullByDefault -@Component(service = LifxChannelFactory.class, immediate = true) +@Component(service = LifxChannelFactory.class) public class LifxChannelFactoryImpl implements LifxChannelFactory { private static final String COLOR_ZONE_LABEL_KEY = "channel-type.lifx.colorzone.label"; diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxLightDiscovery.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxLightDiscovery.java index fef74d8af49..8676b5f49dc 100644 --- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxLightDiscovery.java +++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/LifxLightDiscovery.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; * @author Karel Goderis - Rewrite for Firmware V2, and remove dependency on external libraries * @author Wouter Born - Discover light labels, improve locking, optimize packet handling */ -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.lifx") +@Component(service = DiscoveryService.class, configurationPid = "discovery.lifx") @NonNullByDefault public class LifxLightDiscovery extends AbstractDiscoveryService { diff --git a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java index ca66390fa60..6aedf78c8fa 100644 --- a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java +++ b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * * @author Thomas Weißschuh - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.linuxinput") +@Component(service = DiscoveryService.class, configurationPid = "discovery.linuxinput") @NonNullByDefault public class LinuxInputDiscoveryService extends AbstractDiscoveryService { diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxDiscoveryParticipant.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxDiscoveryParticipant.java index c3f656526fd..5db6c4e0351 100644 --- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxDiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * @author Pawel Pieczul - Initial contribution * */ -@Component(immediate = true) +@Component public class LxDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(LxDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMcastBridgeDiscoveryService.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMcastBridgeDiscoveryService.java index da917df3913..8e3797f8340 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMcastBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMcastBridgeDiscoveryService.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * @author Bob Adair - Renamed and added bridge properties */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.lutron") +@Component(service = DiscoveryService.class, configurationPid = "discovery.lutron") public class LutronMcastBridgeDiscoveryService extends AbstractDiscoveryService { private static final int SCAN_INTERVAL_MINUTES = 30; diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMdnsBridgeDiscoveryService.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMdnsBridgeDiscoveryService.java index 0372df794db..c2001d87f37 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMdnsBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LutronMdnsBridgeDiscoveryService.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * * @author Bob Adair - Initial contribution */ -@Component(immediate = true) +@Component @NonNullByDefault public class LutronMdnsBridgeDiscoveryService implements MDNSDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscovery.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscovery.java index b3c244312bc..7fb9f534869 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscovery.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscovery.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * * @author Marcel Verpaalen - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.max") +@Component(service = DiscoveryService.class, configurationPid = "discovery.max") public class MaxCubeBridgeDiscovery extends AbstractDiscoveryService { private static final String MAXCUBE_DISCOVER_STRING = "eQ3Max*\0**********I"; diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleMDNSDiscoveryParticipant.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleMDNSDiscoveryParticipant.java index 252cb5460bc..8879a83aa47 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleMDNSDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleMDNSDiscoveryParticipant.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * @author Martin Lepsy - Added check for Miele gateway for cleaner discovery * */ -@Component(immediate = true) +@Component public class MieleMDNSDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(MieleMDNSDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/discovery/XiaomiBridgeDiscoveryService.java b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/discovery/XiaomiBridgeDiscoveryService.java index acd083754c4..d918b401bbe 100644 --- a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/discovery/XiaomiBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/discovery/XiaomiBridgeDiscoveryService.java @@ -40,7 +40,7 @@ import com.google.gson.JsonObject; * @author Kuba Wolanin - logger fixes */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.mihome") +@Component(service = DiscoveryService.class, configurationPid = "discovery.mihome") public class XiaomiBridgeDiscoveryService extends AbstractDiscoveryService implements XiaomiSocketListener { private static final Set SUPPORTED_THING_TYPES = Collections.singleton(THING_TYPE_BRIDGE); diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java index e017a4036ad..4b279c21495 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; * */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.miio") +@Component(service = DiscoveryService.class, configurationPid = "discovery.miio") public class MiIoDiscovery extends AbstractDiscoveryService { /** The refresh interval for background discovery */ diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscoveryParticipant.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscoveryParticipant.java index fd9489a7d44..dad0bac7e80 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscoveryParticipant.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * */ @NonNullByDefault -@Component(service = MDNSDiscoveryParticipant.class, immediate = true) +@Component(service = MDNSDiscoveryParticipant.class) public class MiIoDiscoveryParticipant implements MDNSDiscoveryParticipant { private final CloudConnector cloudConnector; diff --git a/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/discovery/MilightBridgeDiscovery.java b/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/discovery/MilightBridgeDiscovery.java index f282f7c39f9..3f8933ea200 100644 --- a/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/discovery/MilightBridgeDiscovery.java +++ b/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/discovery/MilightBridgeDiscovery.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.milight") +@Component(service = DiscoveryService.class, configurationPid = "discovery.milight") public class MilightBridgeDiscovery extends AbstractDiscoveryService implements Runnable { private final Logger logger = LoggerFactory.getLogger(MilightBridgeDiscovery.class); diff --git a/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/test/TestDiscovery.java b/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/test/TestDiscovery.java index 38a47200af0..99159f30cde 100644 --- a/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/test/TestDiscovery.java +++ b/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/test/TestDiscovery.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; * * @author David Graeff - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, enabled = false) +@Component(service = DiscoveryService.class, enabled = false) public class TestDiscovery extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(TestDiscovery.class); diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftDiscoveryService.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftDiscoveryService.java index 5f2318fb5b3..5e791925b23 100644 --- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftDiscoveryService.java +++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftDiscoveryService.java @@ -43,7 +43,7 @@ import rx.subscriptions.CompositeSubscription; * * @author Mattias Markehed - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.minecraft") +@Component(service = DiscoveryService.class, configurationPid = "discovery.minecraft") public class MinecraftDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(MinecraftDiscoveryService.class); diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftMDNSDiscoveryParticipant.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftMDNSDiscoveryParticipant.java index 83585ed0e63..73b05ffabb9 100644 --- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftMDNSDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftMDNSDiscoveryParticipant.java @@ -33,7 +33,7 @@ import org.osgi.service.component.annotations.Component; * * @author Mattias Markehed - Initial contribution */ -@Component(immediate = true) +@Component public class MinecraftMDNSDiscoveryParticipant implements MDNSDiscoveryParticipant { @Override diff --git a/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java b/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java index 708f395ec9f..3fc3a57eb5b 100644 --- a/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * @author Nagy Attila Gabor - initial contribution * */ -@Component(immediate = true) +@Component @NonNullByDefault public class SunspecDiscoveryParticipant implements ModbusDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.modbus/DEVELOPERS.md b/bundles/org.openhab.binding.modbus/DEVELOPERS.md index 482f93e2569..bb47b999e33 100644 --- a/bundles/org.openhab.binding.modbus/DEVELOPERS.md +++ b/bundles/org.openhab.binding.modbus/DEVELOPERS.md @@ -97,7 +97,7 @@ You will have to write a discovery participant class which implements the `Modbu ```java -@Component(immediate = true) +@Component @NonNullByDefault public class SunspecDiscoveryParticipant implements ModbusDiscoveryParticipant { ... diff --git a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/discovery/internal/ModbusDiscoveryService.java b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/discovery/internal/ModbusDiscoveryService.java index 628e17f9057..73fed96e318 100644 --- a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/discovery/internal/ModbusDiscoveryService.java +++ b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/discovery/internal/ModbusDiscoveryService.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * @author Nagy Attila Gabor - initial contribution * */ -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.modbus") +@Component(service = DiscoveryService.class, configurationPid = "discovery.modbus") @NonNullByDefault public class ModbusDiscoveryService extends AbstractDiscoveryService { diff --git a/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/discovery/MPDDiscoveryParticipant.java b/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/discovery/MPDDiscoveryParticipant.java index ec70c9090d7..41390d58a10 100644 --- a/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/discovery/MPDDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/discovery/MPDDiscoveryParticipant.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * */ @NonNullByDefault -@Component(immediate = true) +@Component public class MPDDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(MPDDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/discovery/HomeAssistantDiscovery.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/discovery/HomeAssistantDiscovery.java index c764a6230a6..56319555d60 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/discovery/HomeAssistantDiscovery.java +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/discovery/HomeAssistantDiscovery.java @@ -58,7 +58,7 @@ import com.google.gson.GsonBuilder; * * @author David Graeff - Initial contribution */ -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.mqttha") +@Component(service = DiscoveryService.class, configurationPid = "discovery.mqttha") @NonNullByDefault public class HomeAssistantDiscovery extends AbstractMQTTDiscovery { @SuppressWarnings("unused") diff --git a/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/discovery/Homie300Discovery.java b/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/discovery/Homie300Discovery.java index 4b0f0f8f469..d34608fa430 100644 --- a/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/discovery/Homie300Discovery.java +++ b/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/discovery/Homie300Discovery.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * * @author David Graeff - Initial contribution */ -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.mqtthomie") +@Component(service = DiscoveryService.class, configurationPid = "discovery.mqtthomie") @NonNullByDefault public class Homie300Discovery extends AbstractMQTTDiscovery { private final Logger logger = LoggerFactory.getLogger(Homie300Discovery.class); diff --git a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/discovery/MqttServiceDiscoveryService.java b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/discovery/MqttServiceDiscoveryService.java index a7a8c11b189..88a6ee8e319 100644 --- a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/discovery/MqttServiceDiscoveryService.java +++ b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/discovery/MqttServiceDiscoveryService.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * * @author David Graeff - Initial contribution */ -@Component(immediate = true, service = DiscoveryService.class, configurationPid = "discovery.systemmqttbroker") +@Component(service = DiscoveryService.class, configurationPid = "discovery.systemmqttbroker") public class MqttServiceDiscoveryService extends AbstractDiscoveryService implements MqttServiceObserver { private final Logger logger = LoggerFactory.getLogger(MqttServiceDiscoveryService.class); MqttService mqttService; diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/discovery/NanoleafMDNSDiscoveryParticipant.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/discovery/NanoleafMDNSDiscoveryParticipant.java index 7caf85b3a98..df12a64e3b2 100644 --- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/discovery/NanoleafMDNSDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/discovery/NanoleafMDNSDiscoveryParticipant.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * @see MSDN * Discovery */ -@Component(immediate = true, configurationPid = "discovery.nanoleaf") +@Component(configurationPid = "discovery.nanoleaf") @NonNullByDefault public class NanoleafMDNSDiscoveryParticipant implements MDNSDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/discovery/NeeoBrainDiscovery.java b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/discovery/NeeoBrainDiscovery.java index db18e1ba4a7..bfdb2b834f7 100644 --- a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/discovery/NeeoBrainDiscovery.java +++ b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/discovery/NeeoBrainDiscovery.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * @author Tim Roberts - initial contribution */ @NonNullByDefault -@Component(immediate = true) +@Component public class NeeoBrainDiscovery implements MDNSDiscoveryParticipant { /** The logger */ diff --git a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/discovery/NetworkDiscoveryService.java b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/discovery/NetworkDiscoveryService.java index 3862fe1946a..7c1676d1b95 100644 --- a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/discovery/NetworkDiscoveryService.java +++ b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/discovery/NetworkDiscoveryService.java @@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Rewritten */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.network") +@Component(service = DiscoveryService.class, configurationPid = "discovery.network") public class NetworkDiscoveryService extends AbstractDiscoveryService implements PresenceDetectionListener { static final int PING_TIMEOUT_IN_MS = 500; static final int MAXIMUM_IPS_PER_INTERFACE = 255; diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/discovery/NikoHomeControlBridgeDiscoveryService.java b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/discovery/NikoHomeControlBridgeDiscoveryService.java index 81e4e9f584b..9465cb1b498 100644 --- a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/discovery/NikoHomeControlBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/discovery/NikoHomeControlBridgeDiscoveryService.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * * @author Mark Herwege - Initial Contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.nikohomecontrol") +@Component(service = DiscoveryService.class, configurationPid = "discovery.nikohomecontrol") @NonNullByDefault public class NikoHomeControlBridgeDiscoveryService extends AbstractDiscoveryService { diff --git a/bundles/org.openhab.binding.ntp/src/main/java/org/openhab/binding/ntp/internal/discovery/NtpDiscovery.java b/bundles/org.openhab.binding.ntp/src/main/java/org/openhab/binding/ntp/internal/discovery/NtpDiscovery.java index 2a2acc14235..507938b855f 100644 --- a/bundles/org.openhab.binding.ntp/src/main/java/org/openhab/binding/ntp/internal/discovery/NtpDiscovery.java +++ b/bundles/org.openhab.binding.ntp/src/main/java/org/openhab/binding/ntp/internal/discovery/NtpDiscovery.java @@ -40,7 +40,7 @@ import org.osgi.service.component.annotations.Reference; * @author Marcel Verpaalen - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.ntp") +@Component(service = DiscoveryService.class, configurationPid = "discovery.ntp") public class NtpDiscovery extends AbstractDiscoveryService { private final TimeZoneProvider timeZoneProvider; diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/OwDynamicStateDescriptionProvider.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/OwDynamicStateDescriptionProvider.java index 02646d4e2cf..61f58ee054d 100644 --- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/OwDynamicStateDescriptionProvider.java +++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/OwDynamicStateDescriptionProvider.java @@ -34,8 +34,7 @@ import org.slf4j.LoggerFactory; * @author Jan N. Klug - Initial contribution */ @NonNullByDefault -@Component(service = { DynamicStateDescriptionProvider.class, - OwDynamicStateDescriptionProvider.class }, immediate = true) +@Component(service = { DynamicStateDescriptionProvider.class, OwDynamicStateDescriptionProvider.class }) public class OwDynamicStateDescriptionProvider implements DynamicStateDescriptionProvider { private final Map descriptions = new ConcurrentHashMap<>(); diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/discovery/OnkyoUpnpDiscoveryParticipant.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/discovery/OnkyoUpnpDiscoveryParticipant.java index 7d0ecea0d30..eb768decf4d 100644 --- a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/discovery/OnkyoUpnpDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/discovery/OnkyoUpnpDiscoveryParticipant.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * @author Paul Frank - Initial contribution */ @NonNullByDefault -@Component(immediate = true) +@Component public class OnkyoUpnpDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(OnkyoUpnpDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java index 9c046560a69..70582868caf 100644 --- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java +++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * * @author Chris Graham - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.opensprinkler") +@Component(service = DiscoveryService.class, configurationPid = "discovery.opensprinkler") public class OpenSprinklerDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(OpenSprinklerDiscoveryService.class); private static final Set SUPPORTED_THING_TYPES_UIDS = new HashSet<>( diff --git a/bundles/org.openhab.binding.orvibo/src/main/java/org/openhab/binding/orvibo/internal/discovery/SocketDiscoveryService.java b/bundles/org.openhab.binding.orvibo/src/main/java/org/openhab/binding/orvibo/internal/discovery/SocketDiscoveryService.java index 3f37e57046f..b62799c1719 100644 --- a/bundles/org.openhab.binding.orvibo/src/main/java/org/openhab/binding/orvibo/internal/discovery/SocketDiscoveryService.java +++ b/bundles/org.openhab.binding.orvibo/src/main/java/org/openhab/binding/orvibo/internal/discovery/SocketDiscoveryService.java @@ -39,7 +39,7 @@ import com.github.tavalin.s20.Socket; * * @author Daniel Walters - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.orvibo") +@Component(service = DiscoveryService.class, configurationPid = "discovery.orvibo") public class SocketDiscoveryService extends AbstractDiscoveryService implements SocketDiscoveryListener { private final Logger logger = LoggerFactory.getLogger(SocketDiscoveryService.class); diff --git a/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/discovery/PioneerAvrDiscoveryParticipant.java b/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/discovery/PioneerAvrDiscoveryParticipant.java index 814c28c19ec..ddfb5d2babb 100644 --- a/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/discovery/PioneerAvrDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/discovery/PioneerAvrDiscoveryParticipant.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * * @author Antoine Besnard - Initial contribution */ -@Component(immediate = true) +@Component public class PioneerAvrDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(PioneerAvrDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/discovery/PulseaudioDiscoveryParticipant.java b/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/discovery/PulseaudioDiscoveryParticipant.java index 2847e58c6d6..f8d5deafe23 100644 --- a/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/discovery/PulseaudioDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/discovery/PulseaudioDiscoveryParticipant.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * * @author Tobias Bräutigam - Initial contribution */ -@Component(immediate = true) +@Component public class PulseaudioDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(PulseaudioDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/discovery/RFXComBridgeDiscovery.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/discovery/RFXComBridgeDiscovery.java index ad6b2b0530b..af4c888b364 100644 --- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/discovery/RFXComBridgeDiscovery.java +++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/discovery/RFXComBridgeDiscovery.java @@ -40,7 +40,7 @@ import jd2xx.JD2XX; * @author Pauli Anttila - Initial contribution * */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.rfxcom") +@Component(service = DiscoveryService.class, configurationPid = "discovery.rfxcom") public class RFXComBridgeDiscovery extends AbstractDiscoveryService { private static final long REFRESH_INTERVAL_IN_SECONDS = 600; diff --git a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDiscovery.java b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDiscovery.java index 6914563186b..f1ce1c056ec 100644 --- a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDiscovery.java +++ b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDiscovery.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * * @author Tim Roberts - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.russound") +@Component(service = DiscoveryService.class, configurationPid = "discovery.russound") public class RioSystemDiscovery extends AbstractDiscoveryService { /** The logger */ private final Logger logger = LoggerFactory.getLogger(RioSystemDiscovery.class); diff --git a/bundles/org.openhab.binding.sagercaster/src/main/java/org/openhab/binding/sagercaster/internal/discovery/SagerCasterDiscoveryService.java b/bundles/org.openhab.binding.sagercaster/src/main/java/org/openhab/binding/sagercaster/internal/discovery/SagerCasterDiscoveryService.java index ddfd9fb459a..6db414cded0 100644 --- a/bundles/org.openhab.binding.sagercaster/src/main/java/org/openhab/binding/sagercaster/internal/discovery/SagerCasterDiscoveryService.java +++ b/bundles/org.openhab.binding.sagercaster/src/main/java/org/openhab/binding/sagercaster/internal/discovery/SagerCasterDiscoveryService.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * @author Gaël L'hopital - Initial Contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.sagercaster") +@Component(service = DiscoveryService.class, configurationPid = "discovery.sagercaster") public class SagerCasterDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(SagerCasterDiscoveryService.class); private static final int DISCOVER_TIMEOUT_SECONDS = 30; diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/discovery/SamsungTvDiscoveryParticipant.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/discovery/SamsungTvDiscoveryParticipant.java index 503d338a827..f7fb8d8382e 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/discovery/SamsungTvDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/discovery/SamsungTvDiscoveryParticipant.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * @author Arjan Mels - Changed to upnp.UpnpDiscoveryParticipant */ @NonNullByDefault -@Component(immediate = true) +@Component public class SamsungTvDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(SamsungTvDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyEventServlet.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyEventServlet.java index 75f8ac3b7e1..29a5612bab1 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyEventServlet.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyEventServlet.java @@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory; * @author Markus Michels - Initial contribution */ @NonNullByDefault -@Component(service = HttpServlet.class, configurationPolicy = ConfigurationPolicy.OPTIONAL, immediate = true) +@Component(service = HttpServlet.class, configurationPolicy = ConfigurationPolicy.OPTIONAL) public class ShellyEventServlet extends HttpServlet { private static final long serialVersionUID = 549582869577534569L; private final Logger logger = LoggerFactory.getLogger(ShellyEventServlet.class); diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyDiscoveryParticipant.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyDiscoveryParticipant.java index 08febceff6d..620576e4f5b 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyDiscoveryParticipant.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * @author Markus Michels - Initial contribution */ @NonNullByDefault -@Component(service = MDNSDiscoveryParticipant.class, immediate = true) +@Component(service = MDNSDiscoveryParticipant.class) public class ShellyDiscoveryParticipant implements MDNSDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(ShellyDiscoveryParticipant.class); private final ShellyBindingConfiguration bindingConfig = new ShellyBindingConfiguration(); diff --git a/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/discovery/SilvercrestWifiSocketDiscoveryService.java b/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/discovery/SilvercrestWifiSocketDiscoveryService.java index 5ec44cb4a1d..4caaccffcc1 100644 --- a/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/discovery/SilvercrestWifiSocketDiscoveryService.java +++ b/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/discovery/SilvercrestWifiSocketDiscoveryService.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * @author Jaime Vaz - Initial contribution * */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.silvercrestwifisocket") +@Component(service = DiscoveryService.class, configurationPid = "discovery.silvercrestwifisocket") public class SilvercrestWifiSocketDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(SilvercrestWifiSocketDiscoveryService.class); diff --git a/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/handler/SilvercrestWifiSocketMediatorImpl.java b/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/handler/SilvercrestWifiSocketMediatorImpl.java index a0dbe6e0a02..c006210be1d 100644 --- a/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/handler/SilvercrestWifiSocketMediatorImpl.java +++ b/bundles/org.openhab.binding.silvercrestwifisocket/src/main/java/org/openhab/binding/silvercrestwifisocket/internal/handler/SilvercrestWifiSocketMediatorImpl.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * * @author Jaime Vaz - Initial contribution */ -@Component(service = SilvercrestWifiSocketMediator.class, immediate = true) +@Component(service = SilvercrestWifiSocketMediator.class) public class SilvercrestWifiSocketMediatorImpl implements SilvercrestWifiSocketMediator { private final Logger logger = LoggerFactory.getLogger(SilvercrestWifiSocketMediatorImpl.class); diff --git a/bundles/org.openhab.binding.sinope/src/main/java/org/openhab/binding/sinope/internal/SinopeHandlerFactory.java b/bundles/org.openhab.binding.sinope/src/main/java/org/openhab/binding/sinope/internal/SinopeHandlerFactory.java index 639f05ce175..0d7a891ab70 100644 --- a/bundles/org.openhab.binding.sinope/src/main/java/org/openhab/binding/sinope/internal/SinopeHandlerFactory.java +++ b/bundles/org.openhab.binding.sinope/src/main/java/org/openhab/binding/sinope/internal/SinopeHandlerFactory.java @@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.Component; * * @author Pascal Larin - Initial contribution */ -@Component(service = ThingHandlerFactory.class, immediate = true) +@Component(service = ThingHandlerFactory.class) public class SinopeHandlerFactory extends BaseThingHandlerFactory { private static final Set SUPPORTED_THING_TYPES_UIDS = SinopeBindingConstants.SUPPORTED_THING_TYPES_UIDS; diff --git a/bundles/org.openhab.binding.smaenergymeter/src/main/java/org/openhab/binding/smaenergymeter/internal/discovery/SMAEnergyMeterDiscoveryService.java b/bundles/org.openhab.binding.smaenergymeter/src/main/java/org/openhab/binding/smaenergymeter/internal/discovery/SMAEnergyMeterDiscoveryService.java index 668cbef6c1f..73807171e5f 100644 --- a/bundles/org.openhab.binding.smaenergymeter/src/main/java/org/openhab/binding/smaenergymeter/internal/discovery/SMAEnergyMeterDiscoveryService.java +++ b/bundles/org.openhab.binding.smaenergymeter/src/main/java/org/openhab/binding/smaenergymeter/internal/discovery/SMAEnergyMeterDiscoveryService.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * * @author Osman Basha - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.smaenergymeter") +@Component(service = DiscoveryService.class, configurationPid = "discovery.smaenergymeter") public class SMAEnergyMeterDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(SMAEnergyMeterDiscoveryService.class); diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsHandlerFactory.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsHandlerFactory.java index 80270ece28e..35273cd52d4 100644 --- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsHandlerFactory.java +++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsHandlerFactory.java @@ -56,7 +56,7 @@ import com.google.gson.Gson; */ @NonNullByDefault @Component(service = { ThingHandlerFactory.class, - EventHandler.class }, immediate = true, configurationPid = "binding.smarthings", property = "event.topics=org/openhab/binding/smartthings/state") + EventHandler.class }, configurationPid = "binding.smarthings", property = "event.topics=org/openhab/binding/smartthings/state") public class SmartthingsHandlerFactory extends BaseThingHandlerFactory implements ThingHandlerFactory, EventHandler { private final Logger logger = LoggerFactory.getLogger(SmartthingsHandlerFactory.class); diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java index b5613b6a29b..44309b1ad07 100644 --- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java +++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java @@ -50,7 +50,7 @@ import com.google.gson.Gson; */ @NonNullByDefault @SuppressWarnings("serial") -@Component(immediate = true, service = HttpServlet.class) +@Component(service = HttpServlet.class) public class SmartthingsServlet extends HttpServlet { private static final String PATH = "/smartthings"; private final Logger logger = LoggerFactory.getLogger(SmartthingsServlet.class); diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java index 9e97e0712db..6982bc98399 100644 --- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java +++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java @@ -49,7 +49,7 @@ import com.google.gson.Gson; */ @NonNullByDefault @Component(service = { DiscoveryService.class, - EventHandler.class }, immediate = true, configurationPid = "discovery.smartthings", property = "event.topics=org/openhab/binding/smartthings/discovery") + EventHandler.class }, configurationPid = "discovery.smartthings", property = "event.topics=org/openhab/binding/smartthings/discovery") public class SmartthingsDiscoveryService extends AbstractDiscoveryService implements EventHandler { private static final int DISCOVERY_TIMEOUT_SEC = 30; private static final int INITIAL_DELAY_SEC = 10; // Delay 10 sec to give time for bridge and things to be created diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java index 257296156ec..ac88b75ff70 100644 --- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * @author Karel Goderis - Initial contribution */ @NonNullByDefault -@Component(immediate = true) +@Component public class ZonePlayerDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(ZonePlayerDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java index 78f60f8080b..3c906906a5f 100644 --- a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * * @author David Åberg - Initial contribution */ -@Component(immediate = true) +@Component public class SonyAudioDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(SonyAudioDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/SpotifyAuthService.java b/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/SpotifyAuthService.java index 3888f78401a..476dfe161db 100644 --- a/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/SpotifyAuthService.java +++ b/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/SpotifyAuthService.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * @author Andreas Stenlund - Initial contribution * @author Hilbrand Bouwkamp - Made this the service class instead of only interface. Added templates */ -@Component(service = SpotifyAuthService.class, immediate = true, configurationPid = "binding.spotify.authService") +@Component(service = SpotifyAuthService.class, configurationPid = "binding.spotify.authService") @NonNullByDefault public class SpotifyAuthService { diff --git a/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java b/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java index 90f337ac8ac..94fc04ab379 100644 --- a/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * @author Mark Hilbush - Add support for LMS authentication * */ -@Component(immediate = true) +@Component public class SqueezeBoxServerDiscoveryParticipant implements UpnpDiscoveryParticipant { private final Logger logger = LoggerFactory.getLogger(SqueezeBoxServerDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java index fcc95309c3d..447974e81c3 100644 --- a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java +++ b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * @author Wouter Born - Add null annotations */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.systeminfo") +@Component(service = DiscoveryService.class, configurationPid = "discovery.systeminfo") public class SysteminfoDiscoveryService extends AbstractDiscoveryService { public static final String DEFAULT_THING_ID = "unknown"; public static final String DEFAULT_THING_LABEL = "Local computer"; diff --git a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/discovery/TellstickBridgeDiscovery.java b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/discovery/TellstickBridgeDiscovery.java index 5e5b1358251..362781a77b5 100644 --- a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/discovery/TellstickBridgeDiscovery.java +++ b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/discovery/TellstickBridgeDiscovery.java @@ -34,7 +34,7 @@ import org.tellstick.device.TellstickController; * @author Jarle Hjortland - Initial contribution * */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.tellstick") +@Component(service = DiscoveryService.class, configurationPid = "discovery.tellstick") public class TellstickBridgeDiscovery extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(TellstickBridgeDiscovery.class); diff --git a/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java b/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java index 98c9f5d0742..1b673aa22e3 100644 --- a/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java +++ b/bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/command/TeslaCommandExtension.java @@ -56,7 +56,7 @@ import com.google.gson.Gson; * @author Kai Kreuzer - refactored to use Tesla account thing */ @NonNullByDefault -@Component(service = ConsoleCommandExtension.class, immediate = true) +@Component(service = ConsoleCommandExtension.class) public class TeslaCommandExtension extends AbstractConsoleCommandExtension { private static final String CMD_LOGIN = "login"; diff --git a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/discovery/TradfriDiscoveryParticipant.java b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/discovery/TradfriDiscoveryParticipant.java index 0fb3672254f..fc338731ad4 100644 --- a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/discovery/TradfriDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/discovery/TradfriDiscoveryParticipant.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * * @author Kai Kreuzer - Initial contribution */ -@Component(service = MDNSDiscoveryParticipant.class, immediate = true) +@Component(service = MDNSDiscoveryParticipant.class) @NonNullByDefault public class TradfriDiscoveryParticipant implements MDNSDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/discovery/VeluxDiscoveryService.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/discovery/VeluxDiscoveryService.java index 6bf3f147189..8aa033d38ac 100644 --- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/discovery/VeluxDiscoveryService.java +++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/discovery/VeluxDiscoveryService.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; // // To-be-discussed: check whether an immediate activation is preferable. // Might be activated by: -// @Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.velux") +// @Component(service = DiscoveryService.class, configurationPid = "discovery.velux") // @NonNullByDefault @Component(service = DiscoveryService.class, configurationPid = "discovery.velux") diff --git a/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicBridgeDiscovery.java b/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicBridgeDiscovery.java index d5fc148aa04..0bad5c1909e 100644 --- a/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicBridgeDiscovery.java +++ b/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicBridgeDiscovery.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * @author Stefan Andres - Initial contribution */ @NonNullByDefault -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.vitotronic") +@Component(service = DiscoveryService.class, configurationPid = "discovery.vitotronic") public class VitotronicBridgeDiscovery extends AbstractDiscoveryService { private int adapterPort = 31113; diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryParticipant.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryParticipant.java index 82f2e66a7f4..f7e4cb8bad9 100644 --- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryParticipant.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - some refactoring for performance and simplification * */ -@Component(service = UpnpDiscoveryParticipant.class, immediate = true) +@Component(service = UpnpDiscoveryParticipant.class) public class WemoDiscoveryParticipant implements UpnpDiscoveryParticipant { private Logger logger = LoggerFactory.getLogger(WemoDiscoveryParticipant.class); diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryService.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryService.java index 94452ff5c7f..0a43f532fb6 100644 --- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryService.java +++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/discovery/WemoDiscoveryService.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; * @author Hans-Jörg Merk - Initial contribution * */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.wemo") +@Component(service = DiscoveryService.class, configurationPid = "discovery.wemo") public class WemoDiscoveryService extends AbstractDiscoveryService { private Logger logger = LoggerFactory.getLogger(WemoDiscoveryService.class); diff --git a/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/discovery/WiFiLEDDiscoveryService.java b/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/discovery/WiFiLEDDiscoveryService.java index 89402e0fe53..2b22e36cd20 100644 --- a/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/discovery/WiFiLEDDiscoveryService.java +++ b/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/discovery/WiFiLEDDiscoveryService.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * * @author Osman Basha - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.wifiled") +@Component(service = DiscoveryService.class, configurationPid = "discovery.wifiled") public class WiFiLEDDiscoveryService extends AbstractDiscoveryService { private static final int DEFAULT_BROADCAST_PORT = 48899; diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/discovery/YamahaDiscoveryParticipant.java b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/discovery/YamahaDiscoveryParticipant.java index d8bced5f61a..c9bc67d2bf8 100644 --- a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/discovery/YamahaDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/discovery/YamahaDiscoveryParticipant.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Initial contribution * @author Tomasz Maruszak - Introduced config object, migrated to newer UPnP api */ -@Component(immediate = true) +@Component @NonNullByDefault public class YamahaDiscoveryParticipant implements UpnpDiscoveryParticipant { diff --git a/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/discovery/YeelightDiscoveryService.java b/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/discovery/YeelightDiscoveryService.java index dbd44d808ec..e40e7f23515 100644 --- a/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/discovery/YeelightDiscoveryService.java +++ b/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/discovery/YeelightDiscoveryService.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * * @author Coaster Li - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.yeelight") +@Component(service = DiscoveryService.class, configurationPid = "discovery.yeelight") public class YeelightDiscoveryService extends AbstractDiscoveryService implements DeviceListener { private final Logger logger = LoggerFactory.getLogger(YeelightDiscoveryService.class.getSimpleName()); diff --git a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/discovery/ZWayBridgeDiscoveryService.java b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/discovery/ZWayBridgeDiscoveryService.java index 28cbe89ff24..ce6e2086de8 100644 --- a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/discovery/ZWayBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/discovery/ZWayBridgeDiscoveryService.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * * @author Patrick Hecker - Initial contribution */ -@Component(service = DiscoveryService.class, immediate = true, configurationPid = "discovery.zway") +@Component(service = DiscoveryService.class, configurationPid = "discovery.zway") public class ZWayBridgeDiscoveryService extends AbstractDiscoveryService { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java index 42229ff3ac5..9a7d86cd101 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java @@ -50,7 +50,7 @@ import io.github.hapjava.server.impl.HomekitServer; * * @author Andy Lintner - Initial contribution */ -@Component(immediate = true, service = { Homekit.class }, configurationPid = "org.openhab.homekit", property = { +@Component(service = { Homekit.class }, configurationPid = "org.openhab.homekit", property = { Constants.SERVICE_PID + "=org.openhab.homekit", "port:Integer=9123" }) @ConfigurableService(category = "io", label = "HomeKit Integration", description_uri = "io:homekit") @NonNullByDefault diff --git a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationService.java b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationService.java index 17773a2520f..ea1632db131 100644 --- a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationService.java +++ b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationService.java @@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Initial Contribution */ @NonNullByDefault -@Component(immediate = true, service = HueEmulationService.class) +@Component(service = HueEmulationService.class) public class HueEmulationService implements EventHandler { public static final String CONFIG_PID = "org.openhab.hueemulation"; diff --git a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/HueHandlerFactory.java b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/HueHandlerFactory.java index 42c1df143c4..701a0794fb3 100644 --- a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/HueHandlerFactory.java +++ b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/HueHandlerFactory.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Initial contribution */ @NonNullByDefault -@Component(immediate = true, service = ModuleHandlerFactory.class) +@Component(service = ModuleHandlerFactory.class) public class HueHandlerFactory extends BaseModuleHandlerFactory { private final Logger logger = LoggerFactory.getLogger(HueHandlerFactory.class); diff --git a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/RulesHandlerFactory.java b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/RulesHandlerFactory.java index 97f2a2b1669..917f9d9a67a 100644 --- a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/RulesHandlerFactory.java +++ b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/RulesHandlerFactory.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Initial contribution */ @NonNullByDefault -@Component(immediate = true, service = ModuleHandlerFactory.class) +@Component(service = ModuleHandlerFactory.class) public class RulesHandlerFactory extends BaseModuleHandlerFactory { private final Logger logger = LoggerFactory.getLogger(RulesHandlerFactory.class); diff --git a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/TimerModuleExHandlerFactory.java b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/TimerModuleExHandlerFactory.java index 60beacdf618..3862154a1f0 100644 --- a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/TimerModuleExHandlerFactory.java +++ b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/TimerModuleExHandlerFactory.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Initial contribution */ @NonNullByDefault -@Component(immediate = true, service = ModuleHandlerFactory.class) +@Component(service = ModuleHandlerFactory.class) public class TimerModuleExHandlerFactory extends BaseModuleHandlerFactory { private final Logger logger = LoggerFactory.getLogger(TimerModuleExHandlerFactory.class); diff --git a/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java b/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java index 335aec753d1..fe5924e4fd2 100644 --- a/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java +++ b/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java @@ -61,7 +61,7 @@ import com.google.gson.GsonBuilder; * * @author Pepijn de Geus - Initial contribution */ -@Component(immediate = true, service = HttpServlet.class, configurationPid = "org.openhab.imperihome", // +@Component(service = HttpServlet.class, configurationPid = "org.openhab.imperihome", // property = Constants.SERVICE_PID + "=org.openhab.imperihome") @ConfigurableService(category = "io", label = "ImperiHome Integration", description_uri = "io:imperihome") public class ImperiHomeApiServlet extends HttpServlet { diff --git a/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java b/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java index a87cada2015..3d294bacc1d 100644 --- a/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java +++ b/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java @@ -79,7 +79,7 @@ import io.netty.handler.ssl.SslContextBuilder; * * @author David Graeff - Initial contribution */ -@Component(immediate = true, service = EmbeddedBrokerService.class, configurationPid = Constants.PID, // +@Component(service = EmbeddedBrokerService.class, configurationPid = Constants.PID, // property = org.osgi.framework.Constants.SERVICE_PID + "=" + Constants.PID) @ConfigurableService(category = "MQTT", label = "MQTT Embedded Broker", description_uri = "mqtt:mqttembeddedbroker") @NonNullByDefault diff --git a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/NeeoService.java b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/NeeoService.java index 610079cecf5..056756faa93 100644 --- a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/NeeoService.java +++ b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/NeeoService.java @@ -70,9 +70,9 @@ import org.slf4j.LoggerFactory; * @author Tim Roberts - Initial Contribution */ @NonNullByDefault -@Component(service = EventSubscriber.class, immediate = true, property = { - "service.pid=org.openhab.io.neeo.NeeoService", "service.config.description.uri=io:neeo", - "service.config.label=NEEO Integration", "service.config.category=io" }) +@Component(service = EventSubscriber.class, property = { "service.pid=org.openhab.io.neeo.NeeoService", + "service.config.description.uri=io:neeo", "service.config.label=NEEO Integration", + "service.config.category=io" }) public class NeeoService implements EventSubscriber, NetworkAddressChangeListener { /** The logger */ diff --git a/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java b/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java index e7fce5abfe3..7f3f9999842 100644 --- a/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java +++ b/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java @@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory; * @author Victor Belov - Initial contribution * @author Kai Kreuzer - migrated code to new Jetty client and ESH APIs */ -@Component(immediate = true, service = { EventSubscriber.class, +@Component(service = { EventSubscriber.class, ActionService.class }, configurationPid = "org.openhab.openhabcloud", property = Constants.SERVICE_PID + "=org.openhab.openhabcloud") @ConfigurableService(category = "io", label = "openHAB Cloud", description_uri = "io:openhabcloud") diff --git a/bundles/org.openhab.io.transport.modbus/src/main/java/org/openhab/io/transport/modbus/internal/ModbusManagerImpl.java b/bundles/org.openhab.io.transport.modbus/src/main/java/org/openhab/io/transport/modbus/internal/ModbusManagerImpl.java index 3ab5bbbdc57..4d75f9d0802 100644 --- a/bundles/org.openhab.io.transport.modbus/src/main/java/org/openhab/io/transport/modbus/internal/ModbusManagerImpl.java +++ b/bundles/org.openhab.io.transport.modbus/src/main/java/org/openhab/io/transport/modbus/internal/ModbusManagerImpl.java @@ -84,7 +84,7 @@ import net.wimpi.modbus.net.ModbusSlaveConnection; * * @author Sami Salonen - Initial contribution */ -@Component(service = ModbusManager.class, immediate = true, configurationPid = "transport.modbus") +@Component(service = ModbusManager.class, configurationPid = "transport.modbus") @NonNullByDefault public class ModbusManagerImpl implements ModbusManager { diff --git a/bundles/org.openhab.transform.bin2json/src/main/java/org/openhab/transform/bin2json/internal/Bin2JsonTransformationService.java b/bundles/org.openhab.transform.bin2json/src/main/java/org/openhab/transform/bin2json/internal/Bin2JsonTransformationService.java index b5acc9b1afd..0ac64510bf3 100644 --- a/bundles/org.openhab.transform.bin2json/src/main/java/org/openhab/transform/bin2json/internal/Bin2JsonTransformationService.java +++ b/bundles/org.openhab.transform.bin2json/src/main/java/org/openhab/transform/bin2json/internal/Bin2JsonTransformationService.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * @author Pauli Anttila - Initial contribution */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=BIN2JSON" }) +@Component(property = { "smarthome.transform=BIN2JSON" }) public class Bin2JsonTransformationService implements TransformationService { private Logger logger = LoggerFactory.getLogger(Bin2JsonTransformationService.class); diff --git a/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationService.java b/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationService.java index c3847bfc46e..85e283447cb 100644 --- a/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationService.java +++ b/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationService.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * @author Jan N. Klug - added command whitelist service */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=EXEC" }) +@Component(property = { "smarthome.transform=EXEC" }) public class ExecTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(ExecTransformationService.class); private final ExecTransformationWhitelistWatchService execTransformationWhitelistWatchService; diff --git a/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/JavaScriptTransformationService.java b/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/JavaScriptTransformationService.java index 10712e2351f..1864d3d9192 100644 --- a/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/JavaScriptTransformationService.java +++ b/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/JavaScriptTransformationService.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * @author Thomas Kordelle - pre compiled scripts */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=JS" }) +@Component(property = { "smarthome.transform=JS" }) public class JavaScriptTransformationService implements TransformationService { private Logger logger = LoggerFactory.getLogger(JavaScriptTransformationService.class); diff --git a/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java b/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java index 5dd7d8c465b..3d7496dde3c 100644 --- a/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java +++ b/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java @@ -40,7 +40,7 @@ import com.hubspot.jinjava.Jinjava; * */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=JINJA" }) +@Component(property = { "smarthome.transform=JINJA" }) public class JinjaTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(JinjaTransformationService.class); diff --git a/bundles/org.openhab.transform.jsonpath/src/main/java/org/openhab/transform/jsonpath/internal/JSonPathTransformationService.java b/bundles/org.openhab.transform.jsonpath/src/main/java/org/openhab/transform/jsonpath/internal/JSonPathTransformationService.java index df406da6a5a..6d67bbc029a 100644 --- a/bundles/org.openhab.transform.jsonpath/src/main/java/org/openhab/transform/jsonpath/internal/JSonPathTransformationService.java +++ b/bundles/org.openhab.transform.jsonpath/src/main/java/org/openhab/transform/jsonpath/internal/JSonPathTransformationService.java @@ -38,7 +38,7 @@ import com.jayway.jsonpath.PathNotFoundException; * */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=JSONPATH" }) +@Component(property = { "smarthome.transform=JSONPATH" }) public class JSonPathTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(JSonPathTransformationService.class); diff --git a/bundles/org.openhab.transform.map/src/main/java/org/openhab/transform/map/internal/MapTransformationService.java b/bundles/org.openhab.transform.map/src/main/java/org/openhab/transform/map/internal/MapTransformationService.java index 0f28556d5ec..342a116fe7a 100644 --- a/bundles/org.openhab.transform.map/src/main/java/org/openhab/transform/map/internal/MapTransformationService.java +++ b/bundles/org.openhab.transform.map/src/main/java/org/openhab/transform/map/internal/MapTransformationService.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - Initial contribution and API * @author Gaël L'hopital - Make it localizable */ -@Component(immediate = true, service = TransformationService.class, property = { "smarthome.transform=MAP" }) +@Component(service = TransformationService.class, property = { "smarthome.transform=MAP" }) public class MapTransformationService extends AbstractFileTransformationService { private final Logger logger = LoggerFactory.getLogger(MapTransformationService.class); diff --git a/bundles/org.openhab.transform.regex/src/main/java/org/openhab/transform/regex/internal/RegExTransformationService.java b/bundles/org.openhab.transform.regex/src/main/java/org/openhab/transform/regex/internal/RegExTransformationService.java index 188ef6d08e0..62bc5f0cb45 100644 --- a/bundles/org.openhab.transform.regex/src/main/java/org/openhab/transform/regex/internal/RegExTransformationService.java +++ b/bundles/org.openhab.transform.regex/src/main/java/org/openhab/transform/regex/internal/RegExTransformationService.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * @author Thomas.Eichstaedt-Engelen */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=REGEX" }) +@Component(property = { "smarthome.transform=REGEX" }) public class RegExTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(RegExTransformationService.class); diff --git a/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java b/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java index 3b6cb699896..f2f7b35d60d 100644 --- a/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java +++ b/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * @author Gaël L'hopital * @author Markus Rathgeb - drop usage of Guava */ -@Component(immediate = true, service = TransformationService.class, property = { "smarthome.transform=SCALE" }) +@Component(service = TransformationService.class, property = { "smarthome.transform=SCALE" }) public class ScaleTransformationService extends AbstractFileTransformationService> { private final Logger logger = LoggerFactory.getLogger(ScaleTransformationService.class); diff --git a/bundles/org.openhab.transform.xpath/src/main/java/org/openhab/transform/xpath/internal/XPathTransformationService.java b/bundles/org.openhab.transform.xpath/src/main/java/org/openhab/transform/xpath/internal/XPathTransformationService.java index 811c45d273f..ba655e89e16 100644 --- a/bundles/org.openhab.transform.xpath/src/main/java/org/openhab/transform/xpath/internal/XPathTransformationService.java +++ b/bundles/org.openhab.transform.xpath/src/main/java/org/openhab/transform/xpath/internal/XPathTransformationService.java @@ -38,7 +38,7 @@ import org.xml.sax.InputSource; * @author Thomas.Eichstaedt-Engelen */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=XPATH" }) +@Component(property = { "smarthome.transform=XPATH" }) public class XPathTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(XPathTransformationService.class); diff --git a/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java b/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java index 8653bc6226f..b228e53110c 100644 --- a/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java +++ b/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * @author Thomas.Eichstaedt-Engelen */ @NonNullByDefault -@Component(immediate = true, property = { "smarthome.transform=XSLT" }) +@Component(property = { "smarthome.transform=XSLT" }) public class XsltTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(XsltTransformationService.class);