We recommend not to use this on add-ons.
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
* @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);
*
* @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);
*
* @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);
* @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;
* @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;
*
* @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);
*
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class AutelisDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(AutelisDiscoveryParticipant.class);
* @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 {
*
* @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);
*
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class AirthingsDiscoveryParticipant implements BluetoothDiscoveryParticipant {
private static final int AIRTHINGS_COMPANY_ID = 820; // Formerly Corentium AS
*
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class AM43DiscoveryParticipant implements BluetoothDiscoveryParticipant {
@Override
* @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);
*
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class BlukiiDiscoveryParticipant implements BluetoothDiscoveryParticipant {
@Override
* @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<>();
*
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class RuuviTagDiscoveryParticipant implements BluetoothDiscoveryParticipant {
private static final int RUUVITAG_COMPANY_ID = 1177;
* @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);
* @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);
*
* @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 {
* @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);
* @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;
* @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 {
* @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<>();
* @author David Graeff - Initial contribution
*/
@NonNullByDefault
-@Component(service = UpnpDiscoveryParticipant.class, immediate = true)
+@Component(service = UpnpDiscoveryParticipant.class)
public class BridgeDiscoveryParticipant implements UpnpDiscoveryParticipant {
@Override
* @author Jan-Willem Veldhuis - Initial contribution
*
*/
-@Component(immediate = true)
+@Component
public class DenonMarantzDiscoveryParticipant implements MDNSDiscoveryParticipant {
private Logger logger = LoggerFactory.getLogger(DenonMarantzDiscoveryParticipant.class);
* @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);
* @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);
* @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.
* @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 {
/**
* @author Mike Major - Initial contribution
*
*/
-@Component(immediate = true)
+@Component
public class DLinkSmartHomeDiscoveryParticipant implements MDNSDiscoveryParticipant {
private static final String SERVICE_TYPE = "_dhnap._tcp.local.";
* @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);
* @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;
* @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);
*
* @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 {
* @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);
* @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;
* @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);
*
* @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() {
*
* @author Laurent Garnier - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class FreeboxServerDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(FreeboxServerDiscoveryParticipant.class);
* @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);
*
* @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);
*/
@NonNullByDefault
@Component(service = { DiscoveryService.class,
- TrackerDiscoveryService.class }, immediate = true, configurationPid = "discovery.gpstracker")
+ TrackerDiscoveryService.class }, configurationPid = "discovery.gpstracker")
public class TrackerDiscoveryService extends AbstractDiscoveryService {
/**
* Discovery timeout
* @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;
* @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();
*
*/
@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);
* @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);
* @author Andrew Fiddian-Green - Initial contribution
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class HDPowerViewHubDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(HDPowerViewHubDiscoveryParticipant.class);
* @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);
* @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);
*
* @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);
*
* @author Gerhard Riegler - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class HomegearDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(HomegearDiscoveryParticipant.class);
*
* @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<>();
* @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<>();
* @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<>();
* @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<>();
*
* @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;
* @author Stewart Cossey - Initial contribution
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class HPPrinterDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(HPPrinterDiscoveryParticipant.class);
* @author Thomas Höfer - Added representation
*/
@NonNullByDefault
-@Component(service = UpnpDiscoveryParticipant.class, immediate = true)
+@Component(service = UpnpDiscoveryParticipant.class)
public class HueBridgeDiscoveryParticipant implements UpnpDiscoveryParticipant {
@Override
* @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";
* @author Daniel Walters - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class HyperionDiscoveryParticipant implements MDNSDiscoveryParticipant {
@Override
*/
@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);
*
* @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;
*
* @author Tobias Bräutigam - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class IppPrinterDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(IppPrinterDiscoveryParticipant.class);
*
* @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<ChannelType> channelTypes = new CopyOnWriteArrayList<>();
* @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);
* @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 {
*
*/
@NonNullByDefault
-@Component(service = UpnpDiscoveryParticipant.class, immediate = true)
+@Component(service = UpnpDiscoveryParticipant.class)
public class KonnectedUPnPServer implements UpnpDiscoveryParticipant {
private Logger logger = LoggerFactory.getLogger(KonnectedUPnPServer.class);
@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;
*
* @author Gregory Moyer - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class LaMetricTimeDiscoveryParticipant implements UpnpDiscoveryParticipant {
private Logger logger = LoggerFactory.getLogger(LaMetricTimeDiscoveryParticipant.class);
* @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";
*
*/
@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;
* @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);
* @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";
* @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 {
*
* @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 {
* @author Pawel Pieczul - Initial contribution
*
*/
-@Component(immediate = true)
+@Component
public class LxDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(LxDiscoveryParticipant.class);
* @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;
*
* @author Bob Adair - Initial contribution
*/
-@Component(immediate = true)
+@Component
@NonNullByDefault
public class LutronMdnsBridgeDiscoveryService implements MDNSDiscoveryParticipant {
*
* @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";
* @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);
* @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);
*
*/
@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 */
*
*/
@NonNullByDefault
-@Component(service = MDNSDiscoveryParticipant.class, immediate = true)
+@Component(service = MDNSDiscoveryParticipant.class)
public class MiIoDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final CloudConnector cloudConnector;
* @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);
*
* @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);
*
* @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);
*
* @author Mattias Markehed - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class MinecraftMDNSDiscoveryParticipant implements MDNSDiscoveryParticipant {
@Override
* @author Nagy Attila Gabor - initial contribution
*
*/
-@Component(immediate = true)
+@Component
@NonNullByDefault
public class SunspecDiscoveryParticipant implements ModbusDiscoveryParticipant {
```java
-@Component(immediate = true)
+@Component
@NonNullByDefault
public class SunspecDiscoveryParticipant implements ModbusDiscoveryParticipant {
...
* @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 {
*
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class MPDDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(MPDDiscoveryParticipant.class);
*
* @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")
*
* @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);
*
* @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;
* @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 {
* @author Tim Roberts - initial contribution
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class NeeoBrainDiscovery implements MDNSDiscoveryParticipant {
/** The logger */
* @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;
*
* @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 {
* @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;
* @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<ChannelUID, StateDescription> descriptions = new ConcurrentHashMap<>();
* @author Paul Frank - Initial contribution
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class OnkyoUpnpDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(OnkyoUpnpDiscoveryParticipant.class);
*
* @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<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<>(
*
* @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);
*
* @author Antoine Besnard - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class PioneerAvrDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(PioneerAvrDiscoveryParticipant.class);
*
* @author Tobias Bräutigam - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class PulseaudioDiscoveryParticipant implements MDNSDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(PulseaudioDiscoveryParticipant.class);
* @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;
*
* @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);
* @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;
* @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);
* @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);
* @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();
* @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);
*
* @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);
*
* @author Pascal Larin - Initial contribution
*/
-@Component(service = ThingHandlerFactory.class, immediate = true)
+@Component(service = ThingHandlerFactory.class)
public class SinopeHandlerFactory extends BaseThingHandlerFactory {
private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = SinopeBindingConstants.SUPPORTED_THING_TYPES_UIDS;
*
* @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);
*/
@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);
*/
@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);
*/
@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
* @author Karel Goderis - Initial contribution
*/
@NonNullByDefault
-@Component(immediate = true)
+@Component
public class ZonePlayerDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(ZonePlayerDiscoveryParticipant.class);
*
* @author David Åberg - Initial contribution
*/
-@Component(immediate = true)
+@Component
public class SonyAudioDiscoveryParticipant implements UpnpDiscoveryParticipant {
private final Logger logger = LoggerFactory.getLogger(SonyAudioDiscoveryParticipant.class);
* @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 {
* @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);
* @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";
* @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);
* @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";
*
* @author Kai Kreuzer - Initial contribution
*/
-@Component(service = MDNSDiscoveryParticipant.class, immediate = true)
+@Component(service = MDNSDiscoveryParticipant.class)
@NonNullByDefault
public class TradfriDiscoveryParticipant implements MDNSDiscoveryParticipant {
//
// 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")
* @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;
* @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);
* @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);
*
* @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;
* @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 {
*
* @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());
*
* @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());
*
* @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
* @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";
* @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);
* @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);
* @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);
*
* @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 {
*
* @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
* @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 */
* @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")
*
* @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 {
* @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);
* @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;
* @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);
*
*/
@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);
*
*/
@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);
* @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<Properties> {
private final Logger logger = LoggerFactory.getLogger(MapTransformationService.class);
* @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);
* @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<Map<Range, String>> {
private final Logger logger = LoggerFactory.getLogger(ScaleTransformationService.class);
* @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);
* @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);
projects / openhab-addons.git / commitdiff