Remove immediate = true from all Components (#8615)

We recommend not to use this on add-ons.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>

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);

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);

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);

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;

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;

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);

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);

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 {
 

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);
 

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

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

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);

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

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<BluetoothAdapter> adapters = new CopyOnWriteArraySet<>();

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;

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);

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);

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 {
 

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);

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;

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 {
 

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<ChannelUID, StateDescription> descriptions = new ConcurrentHashMap<>();

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

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);

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);

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);

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.

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 {
 
     /**

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.";

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);
 

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;

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);

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 {
 

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);

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;

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);
 

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() {

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);

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);
 

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);
 

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

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;

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();

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);

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);

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);

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);

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);
 

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);
 

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);
 

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<ChannelGroupTypeUID, ChannelGroupType> channelGroupTypesByUID = new HashMap<>();
     protected List<HomematicThingTypeExcluder> homematicThingTypeExcluders = new CopyOnWriteArrayList<>();

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<ChannelTypeUID, ChannelType> channelTypesByUID = new HashMap<>();
     protected List<HomematicThingTypeExcluder> homematicThingTypeExcluders = new CopyOnWriteArrayList<>();

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<URI, ConfigDescription> configDescriptionsByURI = new HashMap<>();
     protected List<HomematicThingTypeExcluder> homematicThingTypeExcluders = new CopyOnWriteArrayList<>();

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<ThingTypeUID, ThingType> thingTypesByUID = new HashMap<>();
     protected List<HomematicThingTypeExcluder> homematicThingTypeExcluders = new CopyOnWriteArrayList<>();

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;

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);

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

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 = "<modelName>Philips hue";

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

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);

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;

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);

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,
+@Component(service = { ChannelTypeProvider.class, ChannelGroupTypeProvider.class, KM200ChannelTypeProvider.class })
-        KM200ChannelTypeProvider.class }, immediate = true)
 @NonNullByDefault
 public class KM200ChannelTypeProvider implements ChannelTypeProvider, ChannelGroupTypeProvider {
     private final List<ChannelType> channelTypes = new CopyOnWriteArrayList<>();

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);

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 {
 

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);
 

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<T> implements MessageBodyReader<T>, MessageBodyWriter<T> {
 
     private final Gson gson;

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);

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";

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;

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);

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";

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 {
 

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 {
 

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);

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;

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 {
 

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";

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);

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<ThingTypeUID> SUPPORTED_THING_TYPES = Collections.singleton(THING_TYPE_BRIDGE);

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 */

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;

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);
 

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);
 

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);

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

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 {
 

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 {
 ...

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 {
 

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);

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")

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);

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;

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 <a href="https://openhab.org/documentation/development/bindings/discovery-services.html">MSDN
  *      Discovery</a>
  */
-@Component(immediate = true, configurationPid = "discovery.nanoleaf")
+@Component(configurationPid = "discovery.nanoleaf")
 @NonNullByDefault
 public class NanoleafMDNSDiscoveryParticipant implements MDNSDiscoveryParticipant {
 

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 */

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;

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 {
 

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;

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,
+@Component(service = { DynamicStateDescriptionProvider.class, OwDynamicStateDescriptionProvider.class })
-        OwDynamicStateDescriptionProvider.class }, immediate = true)
 public class OwDynamicStateDescriptionProvider implements DynamicStateDescriptionProvider {
 
     private final Map<ChannelUID, StateDescription> descriptions = new ConcurrentHashMap<>();

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);