From c58d894bf0b7ef8cd2b6eb927206ada7413fe979 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 23 Dec 2023 19:06:21 +0100 Subject: [PATCH] Use `OnOffType.from` to reduce code (#16101) You can create an `OnOffType` using a boolean nowadays which reduces the amount of code. Signed-off-by: Wouter Born --- .../internal/handler/RFZoneHandler.java | 5 ++- .../internal/handler/AllPlayHandler.java | 6 ++-- .../internal/handler/EchoHandler.java | 8 ++--- .../amplipi/internal/AmpliPiGroupHandler.java | 2 +- .../amplipi/internal/AmpliPiZoneHandler.java | 2 +- .../internal/handler/AnthemCommandParser.java | 6 ++-- .../internal/helpers/AsuswrtUtils.java | 4 +-- .../pro3/AtlonaPro3PortocolHandler.java | 4 +-- .../internal/handler/AutelisHandler.java | 2 +- .../handler/AVMFritzButtonHandler.java | 3 +- .../handler/Powerline546EHandler.java | 2 +- .../handler/BenqProjectorHandler.java | 4 +-- .../internal/handler/BigAssFanHandler.java | 16 ++++----- .../handler/DaikinMadokaHandler.java | 2 +- .../internal/handler/BondDeviceHandler.java | 18 +++++----- .../CameraNotificationState.java | 2 +- .../privacymode/PrivacyModeState.java | 2 +- .../dto/SilentModeServiceState.java | 2 +- .../internal/XMLResponseHandler.java | 2 +- .../helper/BsbLanParameterConverter.java | 2 +- .../handler/SmartherModuleHandler.java | 2 +- .../internal/handler/ThingHandlerPanel.java | 2 +- .../handler/ThingHandlerPartition.java | 2 +- .../internal/handler/ThingHandlerZone.java | 2 +- .../cbus/handler/CBusLightHandler.java | 4 +-- .../internal/ChromecastStatusUpdater.java | 4 +-- .../internal/handler/HVACHandler.java | 2 +- .../internal/DanfossAirUnit.java | 8 ++--- .../internal/DenonMarantzState.java | 18 +++++----- .../dmx/internal/multiverse/DmxChannel.java | 2 +- .../internal/handler/SmartPlugHandler.java | 2 +- .../handler/DSCAlarmBaseBridgeHandler.java | 2 +- .../internal/handler/PanelThingHandler.java | 30 ++++++++-------- .../handler/PartitionThingHandler.java | 8 ++--- .../internal/handler/ZoneThingHandler.java | 10 +++--- .../internal/dto/DwdWarningsData.java | 2 +- .../echonetlite/internal/StateCodec.java | 2 +- .../ecobee/internal/handler/EcobeeUtils.java | 2 +- .../handler/EcovacsVacuumHandler.java | 6 ++-- .../devices/ElroConnectsDeviceCxsmAlarm.java | 2 +- .../ElroConnectsDeviceEntrySensor.java | 2 +- .../ElroConnectsDeviceGenericAlarm.java | 2 +- .../ElroConnectsDeviceMotionSensor.java | 5 ++- .../ElroConnectsDeviceTemperatureSensor.java | 2 +- .../internal/handler/Enigma2Handler.java | 8 ++--- .../enocean/internal/eep/A5_07/A5_07_01.java | 2 +- .../enocean/internal/eep/A5_07/A5_07_02.java | 2 +- .../enocean/internal/eep/A5_08/A5_08.java | 4 +-- .../enocean/internal/eep/A5_10/A5_10.java | 4 +-- .../enocean/internal/eep/A5_11/A5_11_04.java | 2 +- .../enocean/internal/eep/A5_13/A5_13_01.java | 2 +- .../enocean/internal/eep/A5_14/A5_14_0A.java | 2 +- .../enocean/internal/eep/A5_20/A5_20_04.java | 4 +-- .../internal/eep/Base/PTM200Message.java | 2 +- .../enocean/internal/eep/D2_01/D2_01.java | 4 +-- .../enocean/internal/eep/D2_06/D2_06_50.java | 2 +- .../enocean/internal/eep/D2_14/D2_14_30.java | 10 +++--- .../enocean/internal/eep/F6_02/F6_02.java | 2 +- ...RockerSwitchActionToggleSwitchProfile.java | 2 +- .../handler/EpsonProjectorHandler.java | 10 +++--- .../internal/handler/FeicanHandler.java | 2 +- .../internal/domain/MeasureType.java | 2 +- .../handler/FineOffsetSensorHandler.java | 2 +- .../handler/FoldingClientHandler.java | 4 +-- .../folding/internal/handler/SlotHandler.java | 4 +-- .../internal/handler/FreeboxHandler.java | 2 +- .../internal/handler/FreeboxThingHandler.java | 4 +-- .../handler/FSInternetRadioHandler.java | 4 +-- .../gce/internal/handler/Ipx800v3Handler.java | 2 +- .../internal/command/CommandGetstate.java | 2 +- .../internal/command/CommandSetstate.java | 2 +- .../internal/handler/GoEChargerHandler.java | 2 +- .../internal/handler/GoEChargerV2Handler.java | 2 +- .../GPSTrackerTriggerSwitchProfile.java | 2 +- .../gree/internal/handler/GreeHandler.java | 2 +- .../handler/GroheOndusSenseGuardHandler.java | 2 +- .../internal/HaywardThingHandler.java | 2 +- .../handler/HDPowerViewHubHandler.java | 2 +- .../handler/HDPowerViewShadeHandler.java | 2 +- .../herzborg/internal/CurtainHandler.java | 4 +-- .../converter/type/OnOffTypeConverter.java | 2 +- .../internal/handler/HueSensorHandler.java | 4 +-- .../sensors/GeofencePresenceHandler.java | 2 +- .../handler/sensors/LightLevelHandler.java | 4 +-- .../handler/sensors/PresenceHandler.java | 2 +- .../handler/HydrawiseControllerHandler.java | 7 ++-- .../handler/HydrawiseLocalHandler.java | 3 +- .../internal/handler/HyperionNgHandler.java | 4 +-- .../internal/handler/IAqualinkHandler.java | 2 +- .../internal/handler/ICloudDeviceHandler.java | 2 +- .../OnOffTypeWSBooleanValueConverter.java | 2 +- .../OnOffTypeWSIntegerValueConverter.java | 2 +- .../ihc/internal/handler/IhcHandler.java | 3 +- .../profiles/PushButtonToCommandProfile.java | 2 +- .../internal/device/MessageHandler.java | 2 +- .../internal/handler/IntesisHomeHandler.java | 4 +-- .../handler/JablotronJa100FHandler.java | 2 +- .../handler/JablotronJa100Handler.java | 2 +- .../handler/JablotronOasisHandler.java | 2 +- .../LaCrosseTemperatureSensorHandler.java | 4 +-- .../internal/lacrosse/Tx22SensorHandler.java | 4 +-- .../internal/pca301/Pca301SensorHandler.java | 2 +- .../internal/handler/KaleidescapeHandler.java | 2 +- .../handler/KaleidescapeMessageHandler.java | 6 ++-- .../internal/handler/KonnectedHandler.java | 2 +- .../converter/InversionConverter.java | 2 +- .../LcnModuleKeyLockTableSubHandler.java | 2 +- .../subhandler/LcnModuleRelaySubHandler.java | 2 +- .../internal/LeapMotionColorProfile.java | 2 +- .../internal/LeapMotionDimmerProfile.java | 2 +- .../internal/LeapMotionSwitchProfile.java | 2 +- .../serial/responses/OnOffResponse.java | 2 +- .../lgwebos/internal/PowerControlPower.java | 2 +- .../binding/lifx/internal/dto/PowerState.java | 2 +- .../internal/controls/LxControlJalousie.java | 2 +- .../controls/LxControlJalousieTest.java | 2 +- .../internal/grxprg/PrgProtocolHandler.java | 9 ++--- .../lutron/internal/handler/CcoHandler.java | 2 +- .../internal/handler/SwitchHandler.java | 2 +- .../radiora/handler/PhantomButtonHandler.java | 2 +- .../internal/ChannelUpdaterJob.java | 2 +- .../binding/max/internal/device/Device.java | 2 +- .../handler/MelCloudDeviceHandler.java | 7 ++-- .../MelCloudHeatpumpDeviceHandler.java | 10 +++--- .../handler/MeteostickSensorHandler.java | 2 +- .../miele/internal/handler/FridgeHandler.java | 2 +- .../handler/XiaomiActorPlugHandler.java | 4 +-- .../XiaomiAqaraActorSwitch1Handler.java | 2 +- .../XiaomiAqaraActorSwitch2Handler.java | 8 ++--- .../internal/handler/MiIoBasicHandler.java | 2 +- .../mikrotik/internal/util/StateUtil.java | 2 +- .../handler/MillheatHeaterHandler.java | 10 +++--- .../internal/handler/MillheatRoomHandler.java | 2 +- .../handler/MinecraftPlayerHandler.java | 2 +- .../handler/MinecraftServerHandler.java | 2 +- .../handler/MinecraftSignHandler.java | 2 +- .../internal/HeliosEasyControlsHandler.java | 2 +- .../handler/ModbusDataThingHandler.java | 2 +- .../mystrom/internal/MyStromBulbHandler.java | 2 +- .../mystrom/internal/MyStromPlugHandler.java | 2 +- .../handler/NanoleafControllerHandler.java | 5 ++- .../nanoleaf/internal/model/State.java | 2 +- .../neato/internal/handler/NeatoHandler.java | 8 ++--- .../neeo/internal/NeeoRoomProtocol.java | 5 ++- .../sdm/handler/SDMThermostatHandler.java | 2 +- .../channelhelper/SirenChannelHelper.java | 4 +-- .../internal/handler/NetworkHandler.java | 3 +- .../internal/handler/NibeHeatPumpHandler.java | 2 +- .../handler/NikobusSwitchModuleHandler.java | 2 +- .../handler/NikoHomeControlActionHandler.java | 4 +-- .../nuvo/internal/handler/NuvoHandler.java | 2 +- .../onewire/internal/DigitalIoConfig.java | 4 +-- .../onkyo/internal/handler/OnkyoHandler.java | 2 +- .../internal/OpenGarageHandler.java | 2 +- .../oppo/internal/handler/OppoHandler.java | 2 +- .../handler/OrbitBhyveBridgeHandler.java | 2 +- .../handler/OrbitBhyveSprinklerHandler.java | 8 ++--- .../handlers/ParadoxPartitionHandler.java | 2 +- .../internal/handlers/ParadoxZoneHandler.java | 2 +- .../handler/PentairEasyTouchHandler.java | 34 +++++++++---------- .../handler/PentairIntelliFloHandler.java | 2 +- .../internal/handler/AbstractAvrHandler.java | 4 +-- .../internal/PJLinkDeviceHandler.java | 7 ++-- .../internal/handler/PLCDigitalHandler.java | 2 +- .../internal/handler/PLCMemoryHandler.java | 4 +-- .../internal/handler/PLCPulseHandler.java | 2 +- .../AbstractSleepingEndDeviceHandler.java | 2 +- .../handler/PlugwiseRelayDeviceHandler.java | 2 +- .../handler/PlugwiseSwitchHandler.java | 4 +-- .../handler/PowermaxThingHandler.java | 2 +- .../internal/state/PowermaxState.java | 4 +-- .../handler/QbusBistabielHandler.java | 2 +- .../handler/RemoteopenhabBridgeHandler.java | 2 +- .../messages/RFXComHomeConfortMessage.java | 2 +- .../messages/RFXComLighting4Message.java | 2 +- .../internal/handler/RobonectHandler.java | 4 +-- .../rio/system/RioSystemProtocol.java | 4 +-- .../internal/rio/zone/RioZoneProtocol.java | 16 ++++----- .../internal/handler/SamsungTvHandler.java | 2 +- .../service/MediaRendererService.java | 2 +- .../service/RemoteControllerService.java | 8 ++--- .../internal/handler/SatelThingHandler.java | 2 +- .../senechome/internal/SenecHomeHandler.java | 2 +- .../internal/api1/Shelly1CoIoTProtocol.java | 18 +++++----- .../internal/api1/Shelly1CoIoTVersion1.java | 4 +-- .../internal/api1/Shelly1CoIoTVersion2.java | 9 ++--- .../internal/handler/ShellyBaseHandler.java | 6 ++-- .../internal/handler/ShellyLightHandler.java | 3 +- .../shelly/internal/util/ShellyUtils.java | 4 +-- .../handler/SleepIQDualBedHandler.java | 4 +-- .../converter/SmartthingsConverter.java | 2 +- .../SomfyTahomaMyfoxCameraHandler.java | 2 +- .../internal/handler/SonyAudioHandler.java | 26 +++++++------- .../communication/SonyProjectorConnector.java | 6 ++-- .../handler/SonyProjectorHandler.java | 4 +-- .../handler/SqueezeBoxPlayerHandler.java | 8 ++--- .../tacmi/internal/coe/TACmiHandler.java | 4 +-- .../tacmi/internal/schema/ApiPageParser.java | 4 +-- .../internal/handler/TadoHomeHandler.java | 2 +- .../handler/TadoMobileDeviceHandler.java | 2 +- .../internal/helpers/TapoUtils.java | 4 +-- .../tivo/internal/handler/TiVoHandler.java | 2 +- .../internal/model/LightState.java | 2 +- .../internal/model/Sysinfo.java | 10 +++--- .../internal/soap/SOAPValueConverter.java | 2 +- .../internal/handler/TradfriPlugHandler.java | 2 +- .../model/TradfriAirPurifierData.java | 2 +- .../model/TradfriWirelessDeviceData.java | 2 +- .../internal/handler/UpnpRendererHandler.java | 6 ++-- .../internal/handler/VelbusRelayHandler.java | 2 +- .../VelbusSensorWithAlarmClockHandler.java | 8 ++--- .../internal/handler/VelbusVMBGPOHandler.java | 2 +- .../internal/bridge/VeluxBridgeLANConfig.java | 2 +- .../ventaair/internal/VentaThingHandler.java | 2 +- .../internal/VolvoOnCallHandlerFactory.java | 4 +-- .../internal/handler/VehicleHandler.java | 4 +-- .../wrapper/VehiclePositionWrapper.java | 4 +-- .../internal/link/TypeConverters.java | 2 +- .../binding/wemo/internal/InsightParser.java | 2 +- .../internal/handler/WemoCoffeeHandler.java | 4 +-- .../internal/handler/WemoDimmerHandler.java | 8 ++--- .../internal/handler/WemoLightHandler.java | 6 ++-- .../internal/handler/WemoMakerHandler.java | 4 +-- .../internal/handler/WemoMotionHandler.java | 2 +- .../internal/handler/WemoSwitchHandler.java | 2 +- .../wifiled/internal/handler/LEDStateDTO.java | 2 +- .../internal/handler/WolfSmartsetUtils.java | 2 +- .../internal/handler/YamahaBridgeHandler.java | 6 ++-- .../handler/YamahaZoneThingHandler.java | 16 ++++----- .../YeelightCeilingWithAmbientHandler.java | 2 +- .../YeelightCeilingWithNightHandler.java | 2 +- .../internal/handler/ZmMonitorHandler.java | 6 ++-- .../AbstractHomekitAccessoryImpl.java | 4 +-- .../accessories/BooleanItemReader.java | 2 +- .../HomekitCharacteristicFactory.java | 8 ++--- .../HomekitIrrigationSystemImpl.java | 2 +- .../internal/dto/HueStatePlug.java | 2 +- .../internal/AbstractDynamoDBItem.java | 2 +- .../internal/RRD4jPersistenceService.java | 2 +- 239 files changed, 456 insertions(+), 488 deletions(-) diff --git a/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/RFZoneHandler.java b/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/RFZoneHandler.java index f224a0e711..1d1defb978 100644 --- a/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/RFZoneHandler.java +++ b/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/RFZoneHandler.java @@ -104,9 +104,8 @@ public class RFZoneHandler extends ADThingHandler { logger.trace("RF Zone handler for serial {} received update: {}", config.serial, rfxMsg.data); firstUpdateReceived.set(true); - updateState(CHANNEL_RF_LOWBAT, (rfxMsg.data & RFXMessage.BIT_LOWBAT) == 0 ? OnOffType.OFF : OnOffType.ON); - updateState(CHANNEL_RF_SUPERVISION, - (rfxMsg.data & RFXMessage.BIT_SUPER) == 0 ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_RF_LOWBAT, OnOffType.from((rfxMsg.data & RFXMessage.BIT_LOWBAT) != 0)); + updateState(CHANNEL_RF_SUPERVISION, OnOffType.from((rfxMsg.data & RFXMessage.BIT_SUPER) != 0)); updateState(CHANNEL_RF_LOOP1, (rfxMsg.data & RFXMessage.BIT_LOOP1) == 0 ? OpenClosedType.CLOSED : OpenClosedType.OPEN); diff --git a/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/handler/AllPlayHandler.java b/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/handler/AllPlayHandler.java index 49c2d6a703..ea93b1c04b 100644 --- a/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/handler/AllPlayHandler.java +++ b/bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/handler/AllPlayHandler.java @@ -403,14 +403,14 @@ public class AllPlayHandler extends BaseThingHandler @Override public void onShuffleModeChanged(ShuffleMode shuffleMode) { logger.debug("{}: ShuffleMode changed to {}", speaker.getName(), shuffleMode); - OnOffType shuffleOnOff = (shuffleMode == ShuffleMode.SHUFFLE) ? OnOffType.ON : OnOffType.OFF; + OnOffType shuffleOnOff = OnOffType.from(shuffleMode == ShuffleMode.SHUFFLE); updateState(SHUFFLE_MODE, shuffleOnOff); } @Override public void onMuteChanged(boolean mute) { logger.debug("{}: Mute changed to {}", speaker.getName(), mute); - updateState(MUTE, mute ? OnOffType.ON : OnOffType.OFF); + updateState(MUTE, OnOffType.from(mute)); } @Override @@ -425,7 +425,7 @@ public class AllPlayHandler extends BaseThingHandler @Override public void onVolumeControlChanged(boolean enabled) { - updateState(VOLUME_CONTROL, enabled ? OnOffType.ON : OnOffType.OFF); + updateState(VOLUME_CONTROL, OnOffType.from(enabled)); } @Override diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java index e398799039..2ec69eb17d 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java @@ -1097,10 +1097,10 @@ public class EchoHandler extends BaseThingHandler implements IEchoThingHandler { updateState(CHANNEL_MUSIC_PROVIDER_ID, new StringType(musicProviderId)); updateState(CHANNEL_AMAZON_MUSIC_TRACK_ID, new StringType(amazonMusicTrackId)); - updateState(CHANNEL_AMAZON_MUSIC, isPlaying && amazonMusic ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_AMAZON_MUSIC, OnOffType.from(isPlaying && amazonMusic)); updateState(CHANNEL_AMAZON_MUSIC_PLAY_LIST_ID, new StringType(amazonMusicPlayListId)); updateState(CHANNEL_RADIO_STATION_ID, new StringType(radioStationId)); - updateState(CHANNEL_RADIO, isPlaying && isRadio ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_RADIO, OnOffType.from(isPlaying && isRadio)); updateState(CHANNEL_PROVIDER_DISPLAY_NAME, new StringType(providerDisplayName)); updateState(CHANNEL_PLAYER, isPlaying ? PlayPauseType.PLAY : PlayPauseType.PAUSE); updateState(CHANNEL_IMAGE_URL, new StringType(imageUrl)); @@ -1111,13 +1111,13 @@ public class EchoHandler extends BaseThingHandler implements IEchoThingHandler { updateState(CHANNEL_SUBTITLE1, new StringType(subTitle1)); updateState(CHANNEL_SUBTITLE2, new StringType(subTitle2)); if (bluetoothState != null) { - updateState(CHANNEL_BLUETOOTH, bluetoothIsConnected ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_BLUETOOTH, OnOffType.from(bluetoothIsConnected)); updateState(CHANNEL_BLUETOOTH_MAC, new StringType(bluetoothMAC)); updateState(CHANNEL_BLUETOOTH_DEVICE_NAME, new StringType(bluetoothDeviceName)); } updateState(CHANNEL_ASCENDING_ALARM, - ascendingAlarm != null ? (ascendingAlarm ? OnOffType.ON : OnOffType.OFF) : UnDefType.UNDEF); + ascendingAlarm != null ? OnOffType.from(ascendingAlarm) : UnDefType.UNDEF); final Integer notificationVolumeLevel = this.notificationVolumeLevel; if (notificationVolumeLevel != null) { diff --git a/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiGroupHandler.java b/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiGroupHandler.java index 6c5f863a36..963f27d13f 100644 --- a/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiGroupHandler.java +++ b/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiGroupHandler.java @@ -163,7 +163,7 @@ public class AmpliPiGroupHandler extends BaseThingHandler implements AmpliPiStat Integer volDelta = groupState.getVolDelta(); Integer sourceId = groupState.getSourceId(); - updateState(AmpliPiBindingConstants.CHANNEL_MUTE, mute ? OnOffType.ON : OnOffType.OFF); + updateState(AmpliPiBindingConstants.CHANNEL_MUTE, OnOffType.from(mute)); updateState(AmpliPiBindingConstants.CHANNEL_VOLUME, AmpliPiUtils.volumeToPercentType(volDelta)); updateState(AmpliPiBindingConstants.CHANNEL_SOURCE, new DecimalType(sourceId)); } diff --git a/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiZoneHandler.java b/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiZoneHandler.java index 1cba6138ed..1ceab0a0d2 100644 --- a/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiZoneHandler.java +++ b/bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiZoneHandler.java @@ -163,7 +163,7 @@ public class AmpliPiZoneHandler extends BaseThingHandler implements AmpliPiStatu Integer vol = zoneState.getVol(); Integer sourceId = zoneState.getSourceId(); - updateState(AmpliPiBindingConstants.CHANNEL_MUTE, mute ? OnOffType.ON : OnOffType.OFF); + updateState(AmpliPiBindingConstants.CHANNEL_MUTE, OnOffType.from(mute)); updateState(AmpliPiBindingConstants.CHANNEL_VOLUME, AmpliPiUtils.volumeToPercentType(vol)); updateState(AmpliPiBindingConstants.CHANNEL_SOURCE, new DecimalType(sourceId)); } diff --git a/bundles/org.openhab.binding.anthem/src/main/java/org/openhab/binding/anthem/internal/handler/AnthemCommandParser.java b/bundles/org.openhab.binding.anthem/src/main/java/org/openhab/binding/anthem/internal/handler/AnthemCommandParser.java index c40e56313c..164ddfecd7 100644 --- a/bundles/org.openhab.binding.anthem/src/main/java/org/openhab/binding/anthem/internal/handler/AnthemCommandParser.java +++ b/bundles/org.openhab.binding.anthem/src/main/java/org/openhab/binding/anthem/internal/handler/AnthemCommandParser.java @@ -200,8 +200,7 @@ public class AnthemCommandParser { mmatcher.find(); String zone = mmatcher.group(1); String power = mmatcher.group(2); - return AnthemUpdate.createStateUpdate(zone, CHANNEL_POWER, - "1".equals(power) ? OnOffType.ON : OnOffType.OFF); + return AnthemUpdate.createStateUpdate(zone, CHANNEL_POWER, OnOffType.from("1".equals(power))); } catch (IndexOutOfBoundsException | IllegalStateException e) { logger.debug("Parsing exception on command: {}", command, e); } @@ -231,8 +230,7 @@ public class AnthemCommandParser { matcher.find(); String zone = matcher.group(1); String mute = matcher.group(2); - return AnthemUpdate.createStateUpdate(zone, CHANNEL_MUTE, - "1".equals(mute) ? OnOffType.ON : OnOffType.OFF); + return AnthemUpdate.createStateUpdate(zone, CHANNEL_MUTE, OnOffType.from("1".equals(mute))); } catch (IndexOutOfBoundsException | IllegalStateException e) { logger.debug("Parsing exception on command: {}", command, e); } diff --git a/bundles/org.openhab.binding.asuswrt/src/main/java/org/openhab/binding/asuswrt/internal/helpers/AsuswrtUtils.java b/bundles/org.openhab.binding.asuswrt/src/main/java/org/openhab/binding/asuswrt/internal/helpers/AsuswrtUtils.java index 613797fac7..47f64ac7e3 100644 --- a/bundles/org.openhab.binding.asuswrt/src/main/java/org/openhab/binding/asuswrt/internal/helpers/AsuswrtUtils.java +++ b/bundles/org.openhab.binding.asuswrt/src/main/java/org/openhab/binding/asuswrt/internal/helpers/AsuswrtUtils.java @@ -324,14 +324,14 @@ public class AsuswrtUtils { * Returns an {@link OnOffType} from a {@link Boolean}. */ public static OnOffType getOnOffType(@Nullable Boolean boolVal) { - return (boolVal != null ? boolVal ? OnOffType.ON : OnOffType.OFF : OnOffType.OFF); + return boolVal != null ? OnOffType.from(boolVal) : OnOffType.OFF; } /** * Returns an {@link OnOffType} from an {@link Integer}. */ public static OnOffType getOnOffType(Integer intVal) { - return intVal == 0 ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(intVal != 0); } /** diff --git a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java index dda1a52b8a..7d667a6c4b 100644 --- a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java +++ b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java @@ -819,7 +819,7 @@ class AtlonaPro3PortocolHandler { */ private void handlePanelLockResponse(String resp) { callback.stateChanged(AtlonaPro3Utilities.createChannelID(AtlonaPro3Constants.GROUP_PRIMARY, - AtlonaPro3Constants.CHANNEL_PANELLOCK), RSP_LOCK.equals(resp) ? OnOffType.ON : OnOffType.OFF); + AtlonaPro3Constants.CHANNEL_PANELLOCK), OnOffType.from(RSP_LOCK.equals(resp))); } /** @@ -1012,7 +1012,7 @@ class AtlonaPro3PortocolHandler { */ private void handleIrLockResponse(String resp) { callback.stateChanged(AtlonaPro3Utilities.createChannelID(AtlonaPro3Constants.GROUP_PRIMARY, - AtlonaPro3Constants.CHANNEL_IRENABLE), RSP_IRON.equals(resp) ? OnOffType.ON : OnOffType.OFF); + AtlonaPro3Constants.CHANNEL_IRENABLE), OnOffType.from(RSP_IRON.equals(resp))); } /** diff --git a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java index f2ededc240..6fdf0098a7 100644 --- a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java +++ b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java @@ -497,7 +497,7 @@ public class AutelisHandler extends BaseThingHandler { if ("Number".equals(type)) { return new DecimalType(value); } else if ("Switch".equals(type)) { - return Integer.parseInt(value) > 0 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(Integer.parseInt(value) > 0); } else { return StringType.valueOf(value); } diff --git a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java index 1b2d5f6f31..f70439d083 100644 --- a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java +++ b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java @@ -130,8 +130,7 @@ public class AVMFritzButtonHandler extends DeviceHandler { if (lowBattery == null) { updateThingChannelState(lowBatteryChannelId, UnDefType.UNDEF); } else { - updateThingChannelState(lowBatteryChannelId, - BatteryModel.BATTERY_ON.equals(lowBattery) ? OnOffType.ON : OnOffType.OFF); + updateThingChannelState(lowBatteryChannelId, OnOffType.from(BatteryModel.BATTERY_ON.equals(lowBattery))); } } diff --git a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/Powerline546EHandler.java b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/Powerline546EHandler.java index 01106f3c53..440bc30e94 100644 --- a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/Powerline546EHandler.java +++ b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/Powerline546EHandler.java @@ -147,7 +147,7 @@ public class Powerline546EHandler extends AVMFritzBaseBridgeHandler implements F if (state == null) { updateThingChannelState(CHANNEL_OUTLET, UnDefType.UNDEF); } else { - updateThingChannelState(CHANNEL_OUTLET, SwitchModel.ON.equals(state) ? OnOffType.ON : OnOffType.OFF); + updateThingChannelState(CHANNEL_OUTLET, OnOffType.from(SwitchModel.ON.equals(state))); } } } diff --git a/bundles/org.openhab.binding.benqprojector/src/main/java/org/openhab/binding/benqprojector/internal/handler/BenqProjectorHandler.java b/bundles/org.openhab.binding.benqprojector/src/main/java/org/openhab/binding/benqprojector/internal/handler/BenqProjectorHandler.java index aefbdb9959..607a2e2abf 100644 --- a/bundles/org.openhab.binding.benqprojector/src/main/java/org/openhab/binding/benqprojector/internal/handler/BenqProjectorHandler.java +++ b/bundles/org.openhab.binding.benqprojector/src/main/java/org/openhab/binding/benqprojector/internal/handler/BenqProjectorHandler.java @@ -205,10 +205,10 @@ public class BenqProjectorHandler extends BaseThingHandler { } case FREEZE: Switch freeze = remoteController.getFreeze(); - return freeze == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(freeze == Switch.ON); case BLANK: Switch blank = remoteController.getBlank(); - return blank == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(blank == Switch.ON); case DIRECTCMD: break; case LAMP_TIME: diff --git a/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/handler/BigAssFanHandler.java b/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/handler/BigAssFanHandler.java index 3b6dc9e197..a5fa0b388a 100644 --- a/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/handler/BigAssFanHandler.java +++ b/bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/handler/BigAssFanHandler.java @@ -748,7 +748,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process fan power update for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_FAN_POWER, state); fanStateMap.put(CHANNEL_FAN_POWER, state); } @@ -781,7 +781,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process fan auto update for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_FAN_AUTO, state); fanStateMap.put(CHANNEL_FAN_AUTO, state); } @@ -792,7 +792,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process fan whoosh update for {}: {}", thing.getUID(), messageParts[4]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[4]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[4])); updateChannel(CHANNEL_FAN_WHOOSH, state); fanStateMap.put(CHANNEL_FAN_WHOOSH, state); } @@ -803,7 +803,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process fan wintermode update for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_FAN_WINTERMODE, state); fanStateMap.put(CHANNEL_FAN_WINTERMODE, state); } @@ -847,7 +847,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process fan sleep mode for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_FAN_SLEEP, state); fanStateMap.put(CHANNEL_FAN_SLEEP, state); } @@ -880,7 +880,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process light power update for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_LIGHT_POWER, state); fanStateMap.put(CHANNEL_LIGHT_POWER, state); } @@ -914,7 +914,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process light auto update for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "ON".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("ON".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_LIGHT_AUTO, state); fanStateMap.put(CHANNEL_LIGHT_AUTO, state); } @@ -964,7 +964,7 @@ public class BigAssFanHandler extends BaseThingHandler { return; } logger.debug("Process motion sensor update for {}: {}", thing.getUID(), messageParts[3]); - OnOffType state = "OCCUPIED".equalsIgnoreCase(messageParts[3]) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from("OCCUPIED".equalsIgnoreCase(messageParts[3])); updateChannel(CHANNEL_MOTION, state); fanStateMap.put(CHANNEL_MOTION, state); } diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java index 6787f83704..e8f8a91249 100644 --- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java +++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java @@ -669,7 +669,7 @@ public class DaikinMadokaHandler extends ConnectedBluetoothHandler implements Re return; } - OnOffType oot = command.isPowerState() ? OnOffType.ON : OnOffType.OFF; + OnOffType oot = OnOffType.from(command.isPowerState()); this.madokaSettings.setOnOffState(oot); diff --git a/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java b/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java index d0846decbf..b3a54ac414 100644 --- a/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java +++ b/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java @@ -632,12 +632,12 @@ public class BondDeviceHandler extends BaseThingHandler { updateStatus(ThingStatus.ONLINE); - updateState(CHANNEL_POWER, updateState.power == 0 ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_POWER, OnOffType.from(updateState.power != 0)); boolean fanOn; final BondDevice devInfo = this.deviceInfo; if (devInfo != null && devInfo.actions.contains(BondDeviceAction.TURN_FP_FAN_OFF)) { fanOn = updateState.fpfanPower != 0; - updateState(CHANNEL_FAN_POWER, fanOn ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_FAN_POWER, OnOffType.from(!fanOn)); updateState(CHANNEL_FAN_SPEED, new PercentType(updateState.fpfanSpeed)); } else { fanOn = updateState.power != 0; @@ -653,25 +653,23 @@ public class BondDeviceHandler extends BaseThingHandler { updateState(CHANNEL_FAN_SPEED, formPercentType(fanOn, value)); updateState(CHANNEL_RAW_FAN_SPEED, fanOn ? new DecimalType(updateState.speed) : DecimalType.ZERO); } - updateState(CHANNEL_FAN_BREEZE_STATE, updateState.breeze[0] == 0 ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_FAN_BREEZE_STATE, OnOffType.from(updateState.breeze[0] != 0)); updateState(CHANNEL_FAN_BREEZE_MEAN, new PercentType(updateState.breeze[1])); updateState(CHANNEL_FAN_BREEZE_VAR, new PercentType(updateState.breeze[2])); updateState(CHANNEL_FAN_DIRECTION, updateState.direction == 1 ? new StringType("summer") : new StringType("winter")); updateState(CHANNEL_FAN_TIMER, new DecimalType(updateState.timer)); - updateState(CHANNEL_LIGHT_POWER, updateState.light == 0 ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_LIGHT_POWER, OnOffType.from(updateState.light != 0)); updateState(CHANNEL_LIGHT_BRIGHTNESS, formPercentType(updateState.light != 0, updateState.brightness)); - updateState(CHANNEL_UP_LIGHT_ENABLE, updateState.upLight == 0 ? OnOffType.OFF : OnOffType.ON); - updateState(CHANNEL_UP_LIGHT_POWER, - (updateState.upLight == 1 && updateState.light == 1) ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_UP_LIGHT_ENABLE, OnOffType.from(updateState.upLight != 0)); + updateState(CHANNEL_UP_LIGHT_POWER, OnOffType.from(updateState.upLight == 1 && updateState.light == 1)); updateState(CHANNEL_UP_LIGHT_BRIGHTNESS, formPercentType((updateState.upLight == 1 && updateState.light == 1), updateState.upLightBrightness)); - updateState(CHANNEL_DOWN_LIGHT_ENABLE, updateState.downLight == 0 ? OnOffType.OFF : OnOffType.ON); - updateState(CHANNEL_DOWN_LIGHT_POWER, - (updateState.downLight == 1 && updateState.light == 1) ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_DOWN_LIGHT_ENABLE, OnOffType.from(updateState.downLight != 0)); + updateState(CHANNEL_DOWN_LIGHT_POWER, OnOffType.from(updateState.downLight == 1 && updateState.light == 1)); updateState(CHANNEL_DOWN_LIGHT_BRIGHTNESS, formPercentType( (updateState.downLight == 1 && updateState.light == 1), updateState.downLightBrightness)); diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/cameranotification/CameraNotificationState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/cameranotification/CameraNotificationState.java index a8191319fb..dd30908dd8 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/cameranotification/CameraNotificationState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/cameranotification/CameraNotificationState.java @@ -42,6 +42,6 @@ public enum CameraNotificationState { * @return the on/off state corresponding to the notification state of this enumeration literal */ public OnOffType toOnOffType() { - return this == ENABLED ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(this == ENABLED); } } diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/privacymode/PrivacyModeState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/privacymode/PrivacyModeState.java index 29a145a26f..0db6d1dfb9 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/privacymode/PrivacyModeState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/privacymode/PrivacyModeState.java @@ -50,6 +50,6 @@ public enum PrivacyModeState { * @return the on/off state corresponding to the privacy mode state of this enumeration literal */ public OnOffType toOnOffType() { - return this == ENABLED ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(this == ENABLED); } } diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/silentmode/dto/SilentModeServiceState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/silentmode/dto/SilentModeServiceState.java index fc50d008bc..82ae302bcf 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/silentmode/dto/SilentModeServiceState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/silentmode/dto/SilentModeServiceState.java @@ -49,6 +49,6 @@ public class SilentModeServiceState extends BoschSHCServiceState { public SilentModeState mode; public OnOffType toOnOffType() { - return mode == SilentModeState.MODE_SILENT ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(mode == SilentModeState.MODE_SILENT); } } diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java index ffdee6b057..4af1986d6d 100644 --- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java +++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java @@ -461,7 +461,7 @@ public class XMLResponseHandler extends DefaultHandler { skipPreviousEnabled = OnOffType.ON; break; case Volume: - OnOffType muted = volumeMuteEnabled ? OnOffType.ON : OnOffType.OFF; + OnOffType muted = OnOffType.from(volumeMuteEnabled); commandExecutor.setCurrentMuted(volumeMuteEnabled); commandExecutor.postVolumeMuted(muted); break; diff --git a/bundles/org.openhab.binding.bsblan/src/main/java/org/openhab/binding/bsblan/internal/helper/BsbLanParameterConverter.java b/bundles/org.openhab.binding.bsblan/src/main/java/org/openhab/binding/bsblan/internal/helper/BsbLanParameterConverter.java index 711735fa0c..91f3fe5d84 100644 --- a/bundles/org.openhab.binding.bsblan/src/main/java/org/openhab/binding/bsblan/internal/helper/BsbLanParameterConverter.java +++ b/bundles/org.openhab.binding.bsblan/src/main/java/org/openhab/binding/bsblan/internal/helper/BsbLanParameterConverter.java @@ -106,7 +106,7 @@ public class BsbLanParameterConverter { private static State getStateForSwitchValueChannel(BsbLanApiParameterDTO parameter) { // treat "0" as OFF and everything else as ON - return "0".equals(parameter.value) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!"0".equals(parameter.value)); } /** diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java index 921d69452c..98ab8b6c10 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java @@ -708,7 +708,7 @@ public class SmartherModuleHandler extends BaseThingHandler { updateChannelState(CHANNEL_MEASURES_TEMPERATURE, localChrono.getThermometer().toState()); updateChannelState(CHANNEL_MEASURES_HUMIDITY, localChrono.getHygrometer().toState()); // Update the Status channels - updateChannelState(CHANNEL_STATUS_STATE, (localChrono.isActive() ? OnOffType.ON : OnOffType.OFF)); + updateChannelState(CHANNEL_STATUS_STATE, OnOffType.from((localChrono.isActive()))); updateChannelState(CHANNEL_STATUS_FUNCTION, new StringType(StringUtils.capitalize(localChrono.getFunction().toLowerCase()))); updateChannelState(CHANNEL_STATUS_MODE, diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java index d6165848b7..15e0625adb 100644 --- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java +++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java @@ -75,7 +75,7 @@ public class ThingHandlerPanel extends CaddxBaseThingHandler { // All Panel channels are OnOffType OnOffType onOffType; - onOffType = ("true".equals(data)) ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from("true".equals(data)); updateState(channelUID, onOffType); } } diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPartition.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPartition.java index ea041e0975..d9edcc7416 100644 --- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPartition.java +++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPartition.java @@ -68,7 +68,7 @@ public class ThingHandlerPartition extends CaddxBaseThingHandler { if (CaddxBindingConstants.PARTITION_SECONDARY_COMMAND.equals(channelUID.getId())) { updateState(channelUID, new DecimalType(data)); } else { - OnOffType onOffType = ("true".equals(data)) ? OnOffType.ON : OnOffType.OFF; + OnOffType onOffType = OnOffType.from("true".equals(data)); updateState(channelUID, onOffType); } } diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerZone.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerZone.java index 079ec8145d..43726aef65 100644 --- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerZone.java +++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerZone.java @@ -79,7 +79,7 @@ public class ThingHandlerZone extends CaddxBaseThingHandler { logger.trace(" updateChannel: {} = {}", channelUID, data); } else { - OnOffType onOffType = ("true".equals(data)) ? OnOffType.ON : OnOffType.OFF; + OnOffType onOffType = OnOffType.from("true".equals(data)); updateState(channelUID, onOffType); logger.trace(" updateChannel: {} = {}", channelUID, onOffType); diff --git a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/handler/CBusLightHandler.java b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/handler/CBusLightHandler.java index 7458121690..6431e1528c 100644 --- a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/handler/CBusLightHandler.java +++ b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/handler/CBusLightHandler.java @@ -56,7 +56,7 @@ public class CBusLightHandler extends CBusGroupHandler { int level = group.getLevel(); logger.debug("handle RefreshType Command for Chanell {} Group {} level {}", channelUID, groupId, level); if (channelUID.getId().equals(CBusBindingConstants.CHANNEL_STATE)) { - updateState(channelUID, (level > 0) ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(level > 0)); } else if (channelUID.getId().equals(CBusBindingConstants.CHANNEL_LEVEL)) { updateState(channelUID, new PercentType((int) (level * 100 / 255.0))); } @@ -127,7 +127,7 @@ public class CBusLightHandler extends CBusGroupHandler { } else { try { int v = Integer.parseInt(value); - updateState(channelUID, v > 0 ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(v > 0)); updateState(channelLevelUID, new PercentType((int) (v * 100 / 255.0))); } catch (NumberFormatException e) { logger.warn("Invalid value presented to channel {}. Received {}, expected On/Off", channelUID, diff --git a/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/ChromecastStatusUpdater.java b/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/ChromecastStatusUpdater.java index e03bd86c34..007f566c9f 100644 --- a/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/ChromecastStatusUpdater.java +++ b/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/ChromecastStatusUpdater.java @@ -124,7 +124,7 @@ public class ChromecastStatusUpdater { name = new StringType(application.name); id = new StringType(application.id); statusText = new StringType(application.statusText); - idling = application.isIdleScreen ? OnOffType.ON : OnOffType.OFF; + idling = OnOffType.from(application.isIdleScreen); } callback.updateState(CHANNEL_APP_NAME, name); @@ -142,7 +142,7 @@ public class ChromecastStatusUpdater { this.volume = value; callback.updateState(CHANNEL_VOLUME, value); - callback.updateState(CHANNEL_MUTE, volume.muted ? OnOffType.ON : OnOffType.OFF); + callback.updateState(CHANNEL_MUTE, OnOffType.from(volume.muted)); } public void updateMediaStatus(final @Nullable MediaStatus mediaStatus) { diff --git a/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java b/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java index 9b52212acd..c256eef46d 100644 --- a/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java +++ b/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java @@ -146,7 +146,7 @@ public class HVACHandler extends BaseThingHandler { if (command instanceof RefreshType) { final String on = query(controller, "o"); if (on != null) { - updateState(ON, "1".equals(on) ? OnOffType.ON : OnOffType.OFF); + updateState(ON, OnOffType.from("1".equals(on))); } } else if (command instanceof OnOffType onOffCommand) { controller diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnit.java b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnit.java index 91d5a97b2f..058ff1517c 100644 --- a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnit.java +++ b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnit.java @@ -162,15 +162,15 @@ public class DanfossAirUnit { } public OnOffType getBoost() throws IOException { - return getBoolean(REGISTER_1_READ, BOOST) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBoolean(REGISTER_1_READ, BOOST)); } public OnOffType getNightCooling() throws IOException { - return getBoolean(REGISTER_1_READ, NIGHT_COOLING) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBoolean(REGISTER_1_READ, NIGHT_COOLING)); } public OnOffType getBypass() throws IOException { - return getBoolean(REGISTER_1_READ, BYPASS) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBoolean(REGISTER_1_READ, BYPASS)); } public QuantityType getHumidity() throws IOException { @@ -255,7 +255,7 @@ public class DanfossAirUnit { if (cmd instanceof OnOffType) { set(REGISTER_1_WRITE, register, OnOffType.ON.equals(cmd) ? (byte) 1 : (byte) 0); } - return getBoolean(REGISTER_1_READ, register) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBoolean(REGISTER_1_READ, register)); } private StringType setStringTypeRegister(Command cmd, byte[] register) throws IOException { diff --git a/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/DenonMarantzState.java b/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/DenonMarantzState.java index 40d2d90d44..95f2a229c4 100644 --- a/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/DenonMarantzState.java +++ b/bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/DenonMarantzState.java @@ -132,7 +132,7 @@ public class DenonMarantzState { } public void setPower(boolean power) { - OnOffType newVal = power ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(power); if (newVal != this.power) { this.power = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_POWER, this.power); @@ -140,7 +140,7 @@ public class DenonMarantzState { } public void setMainZonePower(boolean mainPower) { - OnOffType newVal = mainPower ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(mainPower); if (newVal != this.mainZonePower) { this.mainZonePower = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_MAIN_ZONE_POWER, this.mainZonePower); @@ -148,7 +148,7 @@ public class DenonMarantzState { } public void setMute(boolean mute) { - OnOffType newVal = mute ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(mute); if (newVal != this.mute) { this.mute = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_MUTE, this.mute); @@ -207,7 +207,7 @@ public class DenonMarantzState { } public void setZone2Power(boolean power) { - OnOffType newVal = power ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(power); if (newVal != this.zone2Power) { this.zone2Power = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_ZONE2_POWER, this.zone2Power); @@ -227,7 +227,7 @@ public class DenonMarantzState { } public void setZone2Mute(boolean mute) { - OnOffType newVal = mute ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(mute); if (newVal != this.zone2Mute) { this.zone2Mute = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_ZONE2_MUTE, this.zone2Mute); @@ -243,7 +243,7 @@ public class DenonMarantzState { } public void setZone3Power(boolean power) { - OnOffType newVal = power ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(power); if (newVal != this.zone3Power) { this.zone3Power = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_ZONE3_POWER, this.zone3Power); @@ -263,7 +263,7 @@ public class DenonMarantzState { } public void setZone3Mute(boolean mute) { - OnOffType newVal = mute ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(mute); if (newVal != this.zone3Mute) { this.zone3Mute = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_ZONE3_MUTE, this.zone3Mute); @@ -279,7 +279,7 @@ public class DenonMarantzState { } public void setZone4Power(boolean power) { - OnOffType newVal = power ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(power); if (newVal != this.zone4Power) { this.zone4Power = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_ZONE4_POWER, this.zone4Power); @@ -299,7 +299,7 @@ public class DenonMarantzState { } public void setZone4Mute(boolean mute) { - OnOffType newVal = mute ? OnOffType.ON : OnOffType.OFF; + OnOffType newVal = OnOffType.from(mute); if (newVal != this.zone4Mute) { this.zone4Mute = newVal; handler.stateChanged(DenonMarantzBindingConstants.CHANNEL_ZONE4_MUTE, this.zone4Mute); diff --git a/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/DmxChannel.java b/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/DmxChannel.java index b24d598c54..f9552bbfba 100644 --- a/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/DmxChannel.java +++ b/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/DmxChannel.java @@ -290,7 +290,7 @@ public class DmxChannel extends BaseDmxChannel { // notify on/off listeners if on/off state changed if ((lastStateValue == 0) || (value == 0)) { - OnOffType state = (value == 0) ? OnOffType.OFF : OnOffType.ON; + OnOffType state = OnOffType.from(value != 0); for (Entry listener : onOffListeners.entrySet()) { (listener.getValue()).updateSwitchState(listener.getKey(), state); logger.trace("sending ONOFF={} (raw={}), status update to listener {}", state, value, diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/SmartPlugHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/SmartPlugHandler.java index a4d3d229cb..780fc85860 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/SmartPlugHandler.java +++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/SmartPlugHandler.java @@ -114,7 +114,7 @@ public class SmartPlugHandler extends DraytonWiserThingHandler { } private State getZigbeeConnected() { - return getData().device.getLqi() == null ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(getData().device.getLqi() != null); } private State getDeviceLocked() { diff --git a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseBridgeHandler.java b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseBridgeHandler.java index db93d232d3..026163aead 100644 --- a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseBridgeHandler.java +++ b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseBridgeHandler.java @@ -233,7 +233,7 @@ public abstract class DSCAlarmBaseBridgeHandler extends BaseBridgeHandler { updateStatus(isOnline ? ThingStatus.ONLINE : ThingStatus.OFFLINE); ChannelUID channelUID = new ChannelUID(getThing().getUID(), BRIDGE_RESET); - updateState(channelUID, isOnline ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(isOnline)); } /** diff --git a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java index b677d2bb68..ca19dc4764 100644 --- a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java +++ b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java @@ -98,12 +98,12 @@ public class PanelThingHandler extends DSCAlarmBaseThingHandler { break; case PANEL_TIME_STAMP: boolState = state != 0; - onOffType = boolState ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(boolState); updateState(channelUID, onOffType); break; case PANEL_TIME_BROADCAST: boolState = state != 0; - onOffType = boolState ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(boolState); updateState(channelUID, onOffType); break; case PANEL_COMMAND: @@ -114,67 +114,67 @@ public class PanelThingHandler extends DSCAlarmBaseThingHandler { break; case PANEL_TROUBLE_LED: boolState = state != 0; - onOffType = boolState ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(boolState); updateState(channelUID, onOffType); break; case PANEL_SERVICE_REQUIRED: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_AC_TROUBLE: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_TELEPHONE_TROUBLE: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_FTC_TROUBLE: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_ZONE_FAULT: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_ZONE_TAMPER: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_ZONE_LOW_BATTERY: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_TIME_LOSS: trouble = state != 0; - onOffType = trouble ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trouble); updateState(channelUID, onOffType); break; case PANEL_FIRE_KEY_ALARM: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PANEL_PANIC_KEY_ALARM: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PANEL_AUX_KEY_ALARM: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PANEL_AUX_INPUT_ALARM: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; default: diff --git a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PartitionThingHandler.java b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PartitionThingHandler.java index a749146ab2..e467b289aa 100644 --- a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PartitionThingHandler.java +++ b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PartitionThingHandler.java @@ -66,22 +66,22 @@ public class PartitionThingHandler extends DSCAlarmBaseThingHandler { break; case PARTITION_ARMED: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PARTITION_ENTRY_DELAY: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PARTITION_EXIT_DELAY: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PARTITION_IN_ALARM: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case PARTITION_OPENING_CLOSING_MODE: diff --git a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/ZoneThingHandler.java b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/ZoneThingHandler.java index d2dd43a682..2c3a3d5018 100644 --- a/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/ZoneThingHandler.java +++ b/bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/ZoneThingHandler.java @@ -67,27 +67,27 @@ public class ZoneThingHandler extends DSCAlarmBaseThingHandler { updateState(channelUID, openClosedType); break; case ZONE_BYPASS_MODE: - onOffType = (state > 0) ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(state > 0); updateState(channelUID, onOffType); break; case ZONE_IN_ALARM: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case ZONE_TAMPER: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case ZONE_FAULT: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; case ZONE_TRIPPED: trigger = state != 0; - onOffType = trigger ? OnOffType.ON : OnOffType.OFF; + onOffType = OnOffType.from(trigger); updateState(channelUID, onOffType); break; default: diff --git a/bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsData.java b/bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsData.java index 750102cb9b..de4e7be27f 100644 --- a/bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsData.java +++ b/bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsData.java @@ -215,7 +215,7 @@ public class DwdWarningsData { public State getWarning(int number) { DwdWarningData data = getGemeindeData(number); - return data == null ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(data != null); } public State getSeverity(int number) { diff --git a/bundles/org.openhab.binding.echonetlite/src/main/java/org/openhab/binding/echonetlite/internal/StateCodec.java b/bundles/org.openhab.binding.echonetlite/src/main/java/org/openhab/binding/echonetlite/internal/StateCodec.java index 44f857d13a..56823f92a6 100644 --- a/bundles/org.openhab.binding.echonetlite/src/main/java/org/openhab/binding/echonetlite/internal/StateCodec.java +++ b/bundles/org.openhab.binding.echonetlite/src/main/java/org/openhab/binding/echonetlite/internal/StateCodec.java @@ -51,7 +51,7 @@ public interface StateCodec extends StateEncode, StateDecode { @Override public State decodeState(final ByteBuffer edt) { - return b(on) == edt.get() ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(b(on) == edt.get()); } @Override diff --git a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeUtils.java b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeUtils.java index 54603c7c05..5f39abf282 100644 --- a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeUtils.java +++ b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeUtils.java @@ -60,7 +60,7 @@ public final class EcobeeUtils { * Set the state to the passed value. If value is null, set the state to UNDEF */ public static State undefOrOnOff(@Nullable Boolean value) { - return value == null ? UnDefType.UNDEF : (value.booleanValue() ? OnOffType.ON : OnOffType.OFF); + return value == null ? UnDefType.UNDEF : OnOffType.from((value)); } public static State undefOrString(@Nullable String value) { diff --git a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java index 128afa3409..6aaaacbdd8 100644 --- a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java +++ b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java @@ -578,7 +578,7 @@ public class EcovacsVacuumHandler extends BaseThingHandler implements EcovacsDev updateState(CHANNEL_ID_TOTAL_CLEAN_RUNS, new DecimalType(totalStats.cleanRuns)); boolean continuousCleaningEnabled = device.sendCommand(new GetContinuousCleaningCommand()); - updateState(CHANNEL_ID_CONTINUOUS_CLEANING, continuousCleaningEnabled ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_ID_CONTINUOUS_CLEANING, OnOffType.from(continuousCleaningEnabled)); List cleanLogRecords = device.getCleanLogs(); if (!cleanLogRecords.isEmpty()) { @@ -630,11 +630,11 @@ public class EcovacsVacuumHandler extends BaseThingHandler implements EcovacsDev if (device.hasCapability(DeviceCapability.AUTO_EMPTY_STATION)) { boolean autoEmptyEnabled = device.sendCommand(new GetDustbinAutoEmptyCommand()); - updateState(CHANNEL_ID_AUTO_EMPTY, autoEmptyEnabled ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_ID_AUTO_EMPTY, OnOffType.from(autoEmptyEnabled)); } if (device.hasCapability(DeviceCapability.TRUE_DETECT_3D)) { boolean trueDetectEnabled = device.sendCommand(new GetTrueDetectCommand()); - updateState(CHANNEL_ID_TRUE_DETECT_3D, trueDetectEnabled ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_ID_TRUE_DETECT_3D, OnOffType.from(trueDetectEnabled)); } if (device.hasCapability(DeviceCapability.DEFAULT_CLEAN_COUNT_SETTING)) { lastDefaultCleaningPasses = device.sendCommand(new GetDefaultCleanPassesCommand()); diff --git a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceCxsmAlarm.java b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceCxsmAlarm.java index e13b5ee702..4b3ead3f64 100644 --- a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceCxsmAlarm.java +++ b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceCxsmAlarm.java @@ -136,7 +136,7 @@ public class ElroConnectsDeviceCxsmAlarm extends ElroConnectsDevice { default: handler.updateState(SIGNAL_STRENGTH, new DecimalType(signalStrength)); handler.updateState(BATTERY_LEVEL, new DecimalType(batteryLevel)); - handler.updateState(LOW_BATTERY, (batteryLevel < 15) ? OnOffType.ON : OnOffType.OFF); + handler.updateState(LOW_BATTERY, OnOffType.from(batteryLevel < 15)); handler.updateStatus(ThingStatus.ONLINE); } } diff --git a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceEntrySensor.java b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceEntrySensor.java index 37da7dd3cc..7354d1c329 100644 --- a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceEntrySensor.java +++ b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceEntrySensor.java @@ -104,7 +104,7 @@ public class ElroConnectsDeviceEntrySensor extends ElroConnectsDevice { ElroDeviceStatus.OPEN.equals(elroStatus) ? OpenClosedType.OPEN : OpenClosedType.CLOSED); handler.updateState(SIGNAL_STRENGTH, new DecimalType(signalStrength)); handler.updateState(BATTERY_LEVEL, new DecimalType(batteryLevel)); - handler.updateState(LOW_BATTERY, (batteryLevel < 15) ? OnOffType.ON : OnOffType.OFF); + handler.updateState(LOW_BATTERY, OnOffType.from(batteryLevel < 15)); handler.updateStatus(ThingStatus.ONLINE); } } diff --git a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceGenericAlarm.java b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceGenericAlarm.java index 12830098d7..3ef12990f0 100644 --- a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceGenericAlarm.java +++ b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceGenericAlarm.java @@ -129,7 +129,7 @@ public class ElroConnectsDeviceGenericAlarm extends ElroConnectsDevice { default: handler.updateState(SIGNAL_STRENGTH, new DecimalType(signalStrength)); handler.updateState(BATTERY_LEVEL, new DecimalType(batteryLevel)); - handler.updateState(LOW_BATTERY, (batteryLevel < 15) ? OnOffType.ON : OnOffType.OFF); + handler.updateState(LOW_BATTERY, OnOffType.from(batteryLevel < 15)); handler.updateStatus(ThingStatus.ONLINE); } } diff --git a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceMotionSensor.java b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceMotionSensor.java index d7f005e5d0..a8a5330d03 100644 --- a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceMotionSensor.java +++ b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceMotionSensor.java @@ -99,11 +99,10 @@ public class ElroConnectsDeviceMotionSensor extends ElroConnectsDevice { handler.updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE, msg); break; default: - handler.updateState(MOTION, - ElroDeviceStatus.TRIGGERED.equals(elroStatus) ? OnOffType.ON : OnOffType.OFF); + handler.updateState(MOTION, OnOffType.from(ElroDeviceStatus.TRIGGERED.equals(elroStatus))); handler.updateState(SIGNAL_STRENGTH, new DecimalType(signalStrength)); handler.updateState(BATTERY_LEVEL, new DecimalType(batteryLevel)); - handler.updateState(LOW_BATTERY, (batteryLevel < 15) ? OnOffType.ON : OnOffType.OFF); + handler.updateState(LOW_BATTERY, OnOffType.from(batteryLevel < 15)); handler.updateStatus(ThingStatus.ONLINE); } } diff --git a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceTemperatureSensor.java b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceTemperatureSensor.java index fec1afe3dc..5e9524967f 100644 --- a/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceTemperatureSensor.java +++ b/bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceTemperatureSensor.java @@ -81,7 +81,7 @@ public class ElroConnectsDeviceTemperatureSensor extends ElroConnectsDevice { default: handler.updateState(SIGNAL_STRENGTH, new DecimalType(signalStrength)); handler.updateState(BATTERY_LEVEL, new DecimalType(batteryLevel)); - handler.updateState(LOW_BATTERY, (batteryLevel < 15) ? OnOffType.ON : OnOffType.OFF); + handler.updateState(LOW_BATTERY, OnOffType.from(batteryLevel < 15)); handler.updateState(TEMPERATURE, new QuantityType<>(temperature, CELSIUS)); handler.updateState(HUMIDITY, new QuantityType<>(humidity, Units.PERCENT)); handler.updateStatus(ThingStatus.ONLINE); diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java index d5735fb054..6ea1d73252 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java @@ -87,8 +87,8 @@ public class Enigma2Handler extends BaseThingHandler { boolean online = client.refresh(); if (online) { updateStatus(ThingStatus.ONLINE); - updateState(CHANNEL_POWER, client.isPower() ? OnOffType.ON : OnOffType.OFF); - updateState(CHANNEL_MUTE, client.isMute() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_POWER, OnOffType.from(client.isPower())); + updateState(CHANNEL_MUTE, OnOffType.from(client.isMute())); updateState(CHANNEL_VOLUME, new PercentType(client.getVolume())); updateState(CHANNEL_CHANNEL, new StringType(client.getChannel())); updateState(CHANNEL_TITLE, new StringType(client.getTitle())); @@ -168,7 +168,7 @@ public class Enigma2Handler extends BaseThingHandler { private void handleMute(ChannelUID channelUID, Command command, Enigma2Client client) { if (command instanceof RefreshType) { client.refreshVolume(); - updateState(channelUID, client.isMute() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(client.isMute())); } else if (OnOffType.ON.equals(command)) { client.setMute(true); } else if (OnOffType.OFF.equals(command)) { @@ -250,7 +250,7 @@ public class Enigma2Handler extends BaseThingHandler { private void handlePower(ChannelUID channelUID, Command command, Enigma2Client client) { if (RefreshType.REFRESH == command) { client.refreshPower(); - updateState(channelUID, client.isPower() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(client.isPower())); } else if (OnOffType.ON == command) { client.setPower(true); } else if (OnOffType.OFF == command) { diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_01.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_01.java index 3555d6438e..bb3ac14882 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_01.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_01.java @@ -38,7 +38,7 @@ public class A5_07_01 extends A5_07 { @Override protected State getMotion() { - return getDB1Value() <= PIR_OFF ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(PIR_OFF < getDB1Value()); } @Override diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_02.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_02.java index 98b0723574..028fc4b5cc 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_02.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_02.java @@ -36,7 +36,7 @@ public class A5_07_02 extends A5_07 { @Override protected State getMotion() { - return getBit(getDB0Value(), 7) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(getDB0Value(), 7)); } @Override diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_08/A5_08.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_08/A5_08.java index 13630dc2f3..86d2a349ad 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_08/A5_08.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_08/A5_08.java @@ -85,9 +85,9 @@ public abstract class A5_08 extends _4BSMessage { / (getUnscaledIlluminationMax() - getUnscaledIlluminationMin())); return new QuantityType<>(scaledIllumination, Units.LUX); } else if (channelId.equals(CHANNEL_MOTIONDETECTION)) { - return getBit(getDB0(), 1) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!getBit(getDB0(), 1)); } else if (channelId.equals(CHANNEL_OCCUPANCY)) { - return getBit(getDB0(), 0) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!getBit(getDB0(), 0)); } return UnDefType.UNDEF; diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_10/A5_10.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_10/A5_10.java index d60f7e8472..8fb3dc61ee 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_10/A5_10.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_10/A5_10.java @@ -131,10 +131,10 @@ public abstract class A5_10 extends _4BSMessage { return getTemperature(); case CHANNEL_BATTERYLOW: - return getBit(getDB0(), 4) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(getDB0(), 4)); case CHANNEL_OCCUPANCY: - return getBit(getDB0(), 0) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!getBit(getDB0(), 0)); case CHANNEL_DAYNIGHTMODESTATE: return new DecimalType(getDB0Value() & 0x01); diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_11/A5_11_04.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_11/A5_11_04.java index 05b5297180..0458c89fa8 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_11/A5_11_04.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_11/A5_11_04.java @@ -104,7 +104,7 @@ public class A5_11_04 extends _4BSMessage { byte db0 = getDB0(); boolean lightOn = getBit(db0, 0); - return lightOn ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(lightOn); } protected State getDimmerStatus() { diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_13/A5_13_01.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_13/A5_13_01.java index d86109c62a..be14ca9d3b 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_13/A5_13_01.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_13/A5_13_01.java @@ -68,7 +68,7 @@ public class A5_13_01 extends A5_13 { } protected State getRainStatus() { - return getBit(getDB0Value(), 1) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(getDB0Value(), 1)); } @Override diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_0A.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_0A.java index c52e3d5efa..21b1c9850e 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_0A.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_0A.java @@ -37,7 +37,7 @@ public class A5_14_0A extends A5_14_09 { private State getVibration() { boolean alarm = getBit(getDB0(), 0); - return alarm ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(alarm); } @Override diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java index 9aa7bf154c..7870447172 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java @@ -232,7 +232,7 @@ public class A5_20_04 extends A5_20 { } private State getMeasurementControl() { - return getBit(getDB0Value(), 7) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!getBit(getDB0Value(), 7)); } private State getFeedTemperature() { @@ -261,7 +261,7 @@ public class A5_20_04 extends A5_20 { } private State getButtonLock() { - return getBit(getDB0Value(), 2) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(getDB0Value(), 2)); } private State getValvePosition() { diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/Base/PTM200Message.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/Base/PTM200Message.java index 40a850a623..78b220529b 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/Base/PTM200Message.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/Base/PTM200Message.java @@ -60,7 +60,7 @@ public class PTM200Message extends _RPSMessage { Function getCurrentStateFunc, Configuration config) { switch (channelId) { case CHANNEL_GENERAL_SWITCHING: - return bytes[0] == SWITCH_ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(bytes[0] == SWITCH_ON); case CHANNEL_ROLLERSHUTTER: return bytes[0] == UP ? PercentType.ZERO : (bytes[0] == DOWN ? PercentType.HUNDRED : UnDefType.UNDEF); case CHANNEL_CONTACT: diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java index 3775eff16d..6ca827b6f5 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java @@ -86,7 +86,7 @@ public abstract class D2_01 extends _VLDMessage { protected State getSwitchingData() { if (getCMD() == CMD_ACTUATOR_STATUS_RESPONE) { - return (bytes[bytes.length - 1] & OUTPUT_VALUE_MASK) == STATUS_SWITCHING_OFF ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from((bytes[bytes.length - 1] & OUTPUT_VALUE_MASK) != STATUS_SWITCHING_OFF); } return UnDefType.UNDEF; @@ -98,7 +98,7 @@ public abstract class D2_01 extends _VLDMessage { protected State getSwitchingData(byte channel) { if (getCMD() == CMD_ACTUATOR_STATUS_RESPONE && (getChannel() == channel || getChannel() == ALL_CHANNELS_MASK)) { - return (bytes[bytes.length - 1] & OUTPUT_VALUE_MASK) == STATUS_SWITCHING_OFF ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from((bytes[bytes.length - 1] & OUTPUT_VALUE_MASK) != STATUS_SWITCHING_OFF); } return UnDefType.UNDEF; diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java index d8a58c7c29..a90b89a0a9 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java @@ -142,7 +142,7 @@ public class D2_06_50 extends _VLDMessage { case CHANNEL_BATTERY_LEVEL: return new DecimalType(bytes[6] & 0x7f); case CHANNEL_BATTERYLOW: - return getBit(bytes[6], 7) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(bytes[6], 7)); } } diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_14/D2_14_30.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_14/D2_14_30.java index 2674a27a37..63190f82e5 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_14/D2_14_30.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_14/D2_14_30.java @@ -68,15 +68,15 @@ public class D2_14_30 extends _VLDMessage { Configuration config) { switch (channelId) { case CHANNEL_SMOKEDETECTION: - return getBit(bytes[0], 7) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(bytes[0], 7)); case CHANNEL_SENSORFAULT: - return getBit(bytes[0], 6) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(bytes[0], 6)); case CHANNEL_MAINTENANCESTATUS: - return getBit(bytes[0], 5) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(bytes[0], 5)); case CHANNEL_SENSORANALYSISHUMIDITYRANGE: - return getBit(bytes[0], 4) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(bytes[0], 4)); case CHANNEL_SENSORANALYSISTEMPERATURRANGE: - return getBit(bytes[0], 3) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(getBit(bytes[0], 3)); case CHANNEL_TIMESINCELASTMAINTENANCE: return new QuantityType<>(((bytes[0] << 5) + (bytes[0] >>> 3)) & 0xFF, Units.WEEK); case CHANNEL_BATTERY_LEVEL: diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02.java index b8feccd0a3..e84a7387c8 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02.java @@ -167,7 +167,7 @@ public abstract class F6_02 extends _RPSMessage { } protected State inverse(OnOffType currentState) { - return currentState == OnOffType.ON ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(currentState != OnOffType.ON); } protected State inverse(UpDownType currentState) { diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/profiles/RockerSwitchActionToggleSwitchProfile.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/profiles/RockerSwitchActionToggleSwitchProfile.java index 1242550215..c05fa9df3e 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/profiles/RockerSwitchActionToggleSwitchProfile.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/profiles/RockerSwitchActionToggleSwitchProfile.java @@ -49,7 +49,7 @@ public class RockerSwitchActionToggleSwitchProfile extends RockerSwitchActionBas public void onTriggerFromHandler(String event) { // Ignore released event if (!CommonTriggerEvents.RELEASED.equals(event) && isEventValid(event)) { - OnOffType newState = OnOffType.ON.equals(previousState) ? OnOffType.OFF : OnOffType.ON; + OnOffType newState = OnOffType.from(!OnOffType.ON.equals(previousState)); callback.sendCommand(newState); previousState = newState; } diff --git a/bundles/org.openhab.binding.epsonprojector/src/main/java/org/openhab/binding/epsonprojector/internal/handler/EpsonProjectorHandler.java b/bundles/org.openhab.binding.epsonprojector/src/main/java/org/openhab/binding/epsonprojector/internal/handler/EpsonProjectorHandler.java index 9f77f35385..f088739021 100644 --- a/bundles/org.openhab.binding.epsonprojector/src/main/java/org/openhab/binding/epsonprojector/internal/handler/EpsonProjectorHandler.java +++ b/bundles/org.openhab.binding.epsonprojector/src/main/java/org/openhab/binding/epsonprojector/internal/handler/EpsonProjectorHandler.java @@ -191,7 +191,7 @@ public class EpsonProjectorHandler extends BaseThingHandler { switch (commandType) { case AKEYSTONE: Switch autoKeystone = remoteController.getAutoKeystone(); - return autoKeystone == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(autoKeystone == Switch.ON); case ASPECT_RATIO: AspectRatio aspectRatio = remoteController.getAspectRatio(); return new StringType(aspectRatio.toString()); @@ -224,7 +224,7 @@ public class EpsonProjectorHandler extends BaseThingHandler { return new DecimalType(fleshColor); case FREEZE: Switch freeze = remoteController.getFreeze(); - return freeze == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(freeze == Switch.ON); case GAMMA: Gamma gamma = remoteController.getGamma(); return new StringType(gamma.toString()); @@ -236,7 +236,7 @@ public class EpsonProjectorHandler extends BaseThingHandler { return new DecimalType(hPosition); case HREVERSE: Switch hReverse = remoteController.getHorizontalReverse(); - return hReverse == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(hReverse == Switch.ON); case KEY_CODE: break; case LAMP_TIME: @@ -247,7 +247,7 @@ public class EpsonProjectorHandler extends BaseThingHandler { return new StringType(luminance.toString()); case MUTE: Switch mute = remoteController.getMute(); - return mute == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(mute == Switch.ON); case POWER: PowerStatus powerStatus = remoteController.getPowerStatus(); if (isLinked(CHANNEL_TYPE_POWERSTATE)) { @@ -288,7 +288,7 @@ public class EpsonProjectorHandler extends BaseThingHandler { return new DecimalType(vPosition); case VREVERSE: Switch vReverse = remoteController.getVerticalReverse(); - return vReverse == Switch.ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(vReverse == Switch.ON); default: logger.warn("Unknown '{}' command!", commandType); return UnDefType.UNDEF; diff --git a/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/handler/FeicanHandler.java b/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/handler/FeicanHandler.java index 66a64a8392..d447cdb260 100644 --- a/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/handler/FeicanHandler.java +++ b/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/handler/FeicanHandler.java @@ -115,7 +115,7 @@ public class FeicanHandler extends BaseThingHandler { * @throws IOException Connection to the bulb failed */ private void handleOnOff(DecimalType value) throws IOException { - handleOnOff(DecimalType.ZERO.equals(value) ? OnOffType.OFF : OnOffType.ON); + handleOnOff(OnOffType.from(!DecimalType.ZERO.equals(value))); } /** diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java index 68c43b9772..56f6586b49 100644 --- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java +++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java @@ -97,7 +97,7 @@ public enum MeasureType { CO2(PARTS_PER_MILLION, 2, CHANNEL_TYPE_CO2, Utils::toUInt16), WATER_LEAK_DETECTION(1, CHANNEL_TYPE_WATER_LEAK_DETECTION, - (data, offset, context) -> toUInt8(data[offset]) != 0 ? OnOffType.ON : OnOffType.OFF), + (data, offset, context) -> OnOffType.from(toUInt8(data[offset]) != 0)), LIGHTNING_DISTANCE(KILO(METRE), 1, CHANNEL_TYPE_LIGHTNING_DISTANCE, (data, offset) -> { int distance = toUInt8(data[offset]); diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetSensorHandler.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetSensorHandler.java index ce63a97c26..7d480d6eb9 100644 --- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetSensorHandler.java +++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetSensorHandler.java @@ -81,7 +81,7 @@ public class FineOffsetSensorHandler extends BaseThingHandler { BatteryStatus batteryStatus = sensorDevice.getBatteryStatus(); updateState(FineOffsetWeatherStationBindingConstants.SENSOR_CHANNEL_LOW_BATTERY, - batteryStatus.isLow() ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(batteryStatus.isLow())); Integer percentage = batteryStatus.getPercentage(); if (percentage != null) { updateState(FineOffsetWeatherStationBindingConstants.SENSOR_CHANNEL_BATTERY_LEVEL, diff --git a/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/FoldingClientHandler.java b/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/FoldingClientHandler.java index 8641ba9f18..f47f199264 100644 --- a/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/FoldingClientHandler.java +++ b/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/FoldingClientHandler.java @@ -146,8 +146,8 @@ public class FoldingClientHandler extends BaseBridgeHandler { FoldingDiscoveryProxy.getInstance().newSlot(getThing().getUID(), host, si.id, si.description); } } - updateState(getThing().getChannel("run").getUID(), running ? OnOffType.ON : OnOffType.OFF); - updateState(getThing().getChannel("finish").getUID(), finishing ? OnOffType.ON : OnOffType.OFF); + updateState(getThing().getChannel("run").getUID(), OnOffType.from(running)); + updateState(getThing().getChannel("finish").getUID(), OnOffType.from(finishing)); } public void delayedRefresh() { diff --git a/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/SlotHandler.java b/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/SlotHandler.java index dc87c23ea4..54a080b160 100644 --- a/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/SlotHandler.java +++ b/bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/SlotHandler.java @@ -83,8 +83,8 @@ public class SlotHandler extends BaseThingHandler implements SlotUpdateListener updateState(getThing().getChannel("status").getUID(), new StringType(si.status)); boolean finishing = "FINISHING".equals(si.status); boolean run = finishing || "READY".equals(si.status) || "RUNNING".equals(si.status); - updateState(getThing().getChannel("finish").getUID(), finishing ? OnOffType.ON : OnOffType.OFF); - updateState(getThing().getChannel("run").getUID(), run ? OnOffType.ON : OnOffType.OFF); + updateState(getThing().getChannel("finish").getUID(), OnOffType.from(finishing)); + updateState(getThing().getChannel("run").getUID(), OnOffType.from(run)); updateState(getThing().getChannel("description").getUID(), new StringType(si.description)); } } diff --git a/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxHandler.java b/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxHandler.java index db210bfd20..bd769221d9 100644 --- a/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxHandler.java +++ b/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxHandler.java @@ -706,7 +706,7 @@ public class FreeboxHandler extends BaseBridgeHandler { } private void updateChannelSwitchState(String channel, boolean state) { - updateState(new ChannelUID(getThing().getUID(), channel), state ? OnOffType.ON : OnOffType.OFF); + updateState(new ChannelUID(getThing().getUID(), channel), OnOffType.from(state)); } private void updateChannelDecimalState(String channel, int state) { diff --git a/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxThingHandler.java b/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxThingHandler.java index 532d1486ad..6489ac4f78 100644 --- a/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxThingHandler.java +++ b/bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxThingHandler.java @@ -309,7 +309,7 @@ public class FreeboxThingHandler extends BaseThingHandler { } } if (found) { - updateState(new ChannelUID(getThing().getUID(), REACHABLE), reachable ? OnOffType.ON : OnOffType.OFF); + updateState(new ChannelUID(getThing().getUID(), REACHABLE), OnOffType.from(reachable)); } if (vendor != null && !vendor.isEmpty()) { updateProperty(Thing.PROPERTY_VENDOR, vendor); @@ -387,7 +387,7 @@ public class FreeboxThingHandler extends BaseThingHandler { } private void updateGroupChannelSwitchState(String group, String channel, boolean state) { - updateState(new ChannelUID(getThing().getUID(), group, channel), state ? OnOffType.ON : OnOffType.OFF); + updateState(new ChannelUID(getThing().getUID(), group, channel), OnOffType.from(state)); } private void updateGroupChannelStringState(String group, String channel, String state) { diff --git a/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/handler/FSInternetRadioHandler.java b/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/handler/FSInternetRadioHandler.java index ae0c0d7156..ecedab33e5 100644 --- a/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/handler/FSInternetRadioHandler.java +++ b/bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/handler/FSInternetRadioHandler.java @@ -78,7 +78,7 @@ public class FSInternetRadioHandler extends BaseThingHandler { // update all channels that are linked switch (channel.getUID().getId()) { case CHANNEL_POWER: - updateState(channel.getUID(), radioOn ? OnOffType.ON : OnOffType.OFF); + updateState(channel.getUID(), OnOffType.from(radioOn)); break; case CHANNEL_VOLUME_ABSOLUTE: updateState(channel.getUID(), @@ -92,7 +92,7 @@ public class FSInternetRadioHandler extends BaseThingHandler { updateState(channel.getUID(), DecimalType.valueOf(String.valueOf(radio.getMode()))); break; case CHANNEL_MUTE: - updateState(channel.getUID(), radio.getMuted() ? OnOffType.ON : OnOffType.OFF); + updateState(channel.getUID(), OnOffType.from(radio.getMuted())); break; case CHANNEL_PRESET: // preset is write-only, ignore diff --git a/bundles/org.openhab.binding.gce/src/main/java/org/openhab/binding/gce/internal/handler/Ipx800v3Handler.java b/bundles/org.openhab.binding.gce/src/main/java/org/openhab/binding/gce/internal/handler/Ipx800v3Handler.java index 79a0217fef..c2e5e98ae5 100644 --- a/bundles/org.openhab.binding.gce/src/main/java/org/openhab/binding/gce/internal/handler/Ipx800v3Handler.java +++ b/bundles/org.openhab.binding.gce/src/main/java/org/openhab/binding/gce/internal/handler/Ipx800v3Handler.java @@ -252,7 +252,7 @@ public class Ipx800v3Handler extends BaseThingHandler implements Ipx800EventList state = new DecimalType(value); break; case RELAY: - state = value == 1 ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(value == 1); break; case ANALOG: state = new DecimalType(value); diff --git a/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandGetstate.java b/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandGetstate.java index 2f92c20c99..8ad9273caf 100644 --- a/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandGetstate.java +++ b/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandGetstate.java @@ -56,7 +56,7 @@ public class CommandGetstate extends AbstractCommand { setModule(deviceReply.substring(6, 7)); setConnector(deviceReply.substring(8, 9)); - setState((deviceReply.charAt(10) == '0' ? OnOffType.OFF : OnOffType.ON)); + setState(OnOffType.from(deviceReply.charAt(10) != '0')); } private void setState(OnOffType s) { diff --git a/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandSetstate.java b/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandSetstate.java index 07fc4045bf..c394429988 100644 --- a/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandSetstate.java +++ b/bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandSetstate.java @@ -69,7 +69,7 @@ public class CommandSetstate extends AbstractCommand { if (m.groupCount() == 4) { setModule(m.group(2)); setConnector(m.group(3)); - setState("0".equals(m.group(4)) ? OnOffType.OFF : OnOffType.ON); + setState(OnOffType.from(!"0".equals(m.group(4)))); return true; } } diff --git a/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerHandler.java b/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerHandler.java index 6d2bdb2697..346f96c11a 100644 --- a/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerHandler.java +++ b/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerHandler.java @@ -148,7 +148,7 @@ public class GoEChargerHandler extends GoEChargerBaseHandler { if (goeResponse.allowCharging == null) { return UnDefType.UNDEF; } - return goeResponse.allowCharging == 1 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(goeResponse.allowCharging == 1); case PHASES: if (goeResponse.energy == null) { return UnDefType.UNDEF; diff --git a/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerV2Handler.java b/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerV2Handler.java index b48a93fbf1..7b71bd2a40 100644 --- a/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerV2Handler.java +++ b/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerV2Handler.java @@ -143,7 +143,7 @@ public class GoEChargerV2Handler extends GoEChargerBaseHandler { } return new DecimalType(goeResponse.transaction); case ALLOW_CHARGING: - return goeResponse.allowCharging ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(goeResponse.allowCharging); case TEMPERATURE_TYPE2_PORT: // It was reported that the temperature is invalid when only one value is returned // That's why it is checked that at least 2 values are returned diff --git a/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerTriggerSwitchProfile.java b/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerTriggerSwitchProfile.java index 67b4485401..8ffe43b1a3 100644 --- a/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerTriggerSwitchProfile.java +++ b/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerTriggerSwitchProfile.java @@ -69,7 +69,7 @@ public class GPSTrackerTriggerSwitchProfile implements TriggerProfile { @Override public void onTriggerFromHandler(String payload) { if (payload.startsWith(regionName)) { - OnOffType state = payload.endsWith("enter") ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from(payload.endsWith("enter")); callback.sendCommand(state); logger.debug("Transition trigger {} handled for region {} by profile: {}", payload, regionName, state); } diff --git a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java index 6e809b4efd..b9eeb1fa36 100644 --- a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java +++ b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java @@ -481,7 +481,7 @@ public class GreeHandler extends BaseThingHandler { private @Nullable State updateOnOff(final String valueName) throws GreeException { if (device.hasStatusValChanged(valueName)) { - return device.getIntStatusVal(valueName) == 1 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(device.getIntStatusVal(valueName) == 1); } return null; } diff --git a/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java b/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java index 69587785f3..47d1a8bb55 100644 --- a/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java +++ b/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java @@ -159,7 +159,7 @@ public class GroheOndusSenseGuardHandler extends GroheOndusBaseHandler 0 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(Integer.parseInt(value) > 0); case "Number:Dimensionless": switch (channelID) { case HaywardBindingConstants.CHANNEL_CHLORINATOR_AVGSALTLEVEL: diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java index f688e371d9..19478d033e 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java @@ -564,7 +564,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler { for (ScheduledEvent scheduledEvent : scheduledEvents) { String scheduledEventId = Integer.toString(scheduledEvent.id); ChannelUID channelUid = new ChannelUID(channelGroupUid, scheduledEventId); - updateState(channelUid, scheduledEvent.enabled ? OnOffType.ON : OnOffType.OFF); + updateState(channelUid, OnOffType.from(scheduledEvent.enabled)); } } diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java index 5da73ab1e7..787d98c8e9 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java @@ -423,7 +423,7 @@ public class HDPowerViewShadeHandler extends AbstractHubbedThingHandler { updateState(CHANNEL_SHADE_BATTERY_LEVEL, UnDefType.UNDEF); return; } - updateState(CHANNEL_SHADE_LOW_BATTERY, batteryStatus == 1 ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_SHADE_LOW_BATTERY, OnOffType.from(batteryStatus == 1)); updateState(CHANNEL_SHADE_BATTERY_LEVEL, new DecimalType(mappedValue)); } diff --git a/bundles/org.openhab.binding.herzborg/src/main/java/org/openhab/binding/herzborg/internal/CurtainHandler.java b/bundles/org.openhab.binding.herzborg/src/main/java/org/openhab/binding/herzborg/internal/CurtainHandler.java index fc706c934c..bca0b9cf6c 100644 --- a/bundles/org.openhab.binding.herzborg/src/main/java/org/openhab/binding/herzborg/internal/CurtainHandler.java +++ b/bundles/org.openhab.binding.herzborg/src/main/java/org/openhab/binding/herzborg/internal/CurtainHandler.java @@ -208,8 +208,8 @@ public class CurtainHandler extends BaseThingHandler { // If calibration has been lost, position is reported as -1. updateState(CHANNEL_POSITION, (position > 100 || position < 0) ? UnDefType.UNDEF : new PercentType(position)); - updateState(CHANNEL_REVERSE, reverse != 0 ? OnOffType.ON : OnOffType.OFF); - updateState(CHANNEL_HAND_START, handStart == 0 ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_REVERSE, OnOffType.from(reverse != 0)); + updateState(CHANNEL_HAND_START, OnOffType.from(handStart == 0)); updateState(CHANNEL_MODE, new StringType(String.valueOf(mode))); } diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/OnOffTypeConverter.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/OnOffTypeConverter.java index 514dccf030..f065ce8e6d 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/OnOffTypeConverter.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/OnOffTypeConverter.java @@ -42,7 +42,7 @@ public class OnOffTypeConverter extends AbstractTypeConverter { @Override protected OnOffType fromBinding(HmDatapoint dp) throws ConverterException { - return Boolean.FALSE.equals(dp.getValue()) != isInvert(dp) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(Boolean.FALSE.equals(dp.getValue()) == isInvert(dp)); } /** diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java index 9f274be669..846643bf22 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java @@ -279,7 +279,7 @@ public abstract class HueSensorHandler extends BaseThingHandler implements Senso if (flag != null) { try { boolean value = Boolean.parseBoolean(String.valueOf(flag)); - updateState(CHANNEL_FLAG, value ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_FLAG, OnOffType.from(value)); } catch (DateTimeParseException e) { // do nothing } @@ -289,7 +289,7 @@ public abstract class HueSensorHandler extends BaseThingHandler implements Senso if (battery != null) { DecimalType batteryLevel = DecimalType.valueOf(String.valueOf(battery)); updateState(CHANNEL_BATTERY_LEVEL, batteryLevel); - updateState(CHANNEL_BATTERY_LOW, batteryLevel.intValue() <= 10 ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_BATTERY_LOW, OnOffType.from(batteryLevel.intValue() <= 10)); } if (!configInitializedSuccessfully) { diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java index 5ac1407f75..c55f09fd9d 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java @@ -51,7 +51,7 @@ public class GeofencePresenceHandler extends HueSensorHandler { Object presence = sensor.getState().get(STATE_PRESENCE); if (presence != null) { boolean value = Boolean.parseBoolean(String.valueOf(presence)); - updateState(CHANNEL_PRESENCE, value ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_PRESENCE, OnOffType.from(value)); } } } diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java index b6c0156f5d..57ac315b45 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java @@ -80,13 +80,13 @@ public class LightLevelHandler extends HueSensorHandler { Object dark = sensor.getState().get(STATE_DARK); if (dark != null) { boolean value = Boolean.parseBoolean(String.valueOf(dark)); - updateState(CHANNEL_DARK, value ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_DARK, OnOffType.from(value)); } Object daylight = sensor.getState().get(STATE_DAYLIGHT); if (daylight != null) { boolean value = Boolean.parseBoolean(String.valueOf(daylight)); - updateState(CHANNEL_DAYLIGHT, value ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_DAYLIGHT, OnOffType.from(value)); } if (sensor.getConfig().containsKey(CONFIG_LED_INDICATION)) { diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java index 39caa20297..f61a0f06e5 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java @@ -95,7 +95,7 @@ public class PresenceHandler extends HueSensorHandler { Object presence = sensor.getState().get(STATE_PRESENCE); if (presence != null) { boolean value = Boolean.parseBoolean(String.valueOf(presence)); - updateState(CHANNEL_PRESENCE, value ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_PRESENCE, OnOffType.from(value)); } if (sensor.getConfig().containsKey(CONFIG_LED_INDICATION)) { diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java index 2653fee464..bfe14b1dcb 100644 --- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java +++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java @@ -330,9 +330,8 @@ public class HydrawiseControllerHandler extends BaseThingHandler implements Hydr updateGroupState(group, CHANNEL_ZONE_SUSPENDUNTIL, UnDefType.UNDEF); } } - updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_RUN, anyRunning.get() ? OnOffType.ON : OnOffType.OFF); - updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_SUSPEND, - anySuspended.get() ? OnOffType.ON : OnOffType.OFF); + updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_RUN, OnOffType.from(anyRunning.get())); + updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_SUSPEND, OnOffType.from(anySuspended.get())); updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_SUSPENDUNTIL, UnDefType.UNDEF); } @@ -352,7 +351,7 @@ public class HydrawiseControllerHandler extends BaseThingHandler implements Hydr updateGroupState(group, CHANNEL_SENSOR_OFFLEVEL, new DecimalType(sensor.model.offLevel)); } if (sensor.status.active != null) { - updateGroupState(group, CHANNEL_SENSOR_ACTIVE, sensor.status.active ? OnOffType.ON : OnOffType.OFF); + updateGroupState(group, CHANNEL_SENSOR_ACTIVE, OnOffType.from(sensor.status.active)); } if (sensor.status.waterFlow != null) { updateGroupState(group, CHANNEL_SENSOR_WATERFLOW, diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseLocalHandler.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseLocalHandler.java index 7fb078bf63..54f5b24242 100644 --- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseLocalHandler.java +++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseLocalHandler.java @@ -214,8 +214,7 @@ public class HydrawiseLocalHandler extends BaseThingHandler { updateGroupState(group, CHANNEL_ZONE_TIME_LEFT, new QuantityType<>(0, Units.SECOND)); } - updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_RUN, - !status.running.isEmpty() ? OnOffType.ON : OnOffType.OFF); + updateGroupState(CHANNEL_GROUP_ALLZONES, CHANNEL_ZONE_RUN, OnOffType.from(!status.running.isEmpty())); }); } diff --git a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java index 9fc4942309..7610ad25d3 100644 --- a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java +++ b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java @@ -260,7 +260,7 @@ public class HyperionNgHandler extends BaseThingHandler { private void updateHyperion(Hyperion hyperion) { boolean isOff = hyperion.isOff(); - OnOffType hyperionState = isOff ? OnOffType.OFF : OnOffType.ON; + OnOffType hyperionState = OnOffType.from(!isOff); updateState(CHANNEL_HYPERION_ENABLED, hyperionState); } @@ -268,7 +268,7 @@ public class HyperionNgHandler extends BaseThingHandler { for (Component component : components) { String componentName = component.getName(); boolean componentIsEnabled = component.isEnabled(); - OnOffType componentState = componentIsEnabled ? OnOffType.ON : OnOffType.OFF; + OnOffType componentState = OnOffType.from(componentIsEnabled); switch (componentName) { case COMPONENT_BLACKBORDER: updateState(CHANNEL_BLACKBORDER, componentState); diff --git a/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java b/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java index 3c854a353a..ae7cc2622a 100644 --- a/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java +++ b/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java @@ -458,7 +458,7 @@ public class IAqualinkHandler extends BaseThingHandler { case "Dimmer": return new PercentType(value); case "Switch": - return Integer.parseInt(value) > 0 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(Integer.parseInt(value) > 0); default: return StringType.valueOf(value); } diff --git a/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java b/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java index 7ce10106d5..033c521c71 100644 --- a/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java +++ b/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java @@ -81,7 +81,7 @@ public class ICloudDeviceHandler extends BaseThingHandler implements ICloudDevic Double batteryLevel = deviceInformationRecord.getBatteryLevel(); if (batteryLevel != Double.NaN) { updateState(BATTERY_LEVEL, new DecimalType(deviceInformationRecord.getBatteryLevel() * 100)); - updateState(LOW_BATTERY, batteryLevel < 0.2 ? OnOffType.ON : OnOffType.OFF); + updateState(LOW_BATTERY, OnOffType.from(batteryLevel < 0.2)); } if (deviceInformationRecord.getLocation() != null) { diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/OnOffTypeWSBooleanValueConverter.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/OnOffTypeWSBooleanValueConverter.java index 8a09be0a79..905538b7cf 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/OnOffTypeWSBooleanValueConverter.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/OnOffTypeWSBooleanValueConverter.java @@ -27,7 +27,7 @@ public class OnOffTypeWSBooleanValueConverter implements Converter 0 ^ convertData.getInverted() ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(from.value > 0 ^ convertData.getInverted()); } @Override diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java index a312479bd6..e8a6914ce3 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java @@ -859,8 +859,7 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener { if (params.getChannelTypeId() != null) { switch (params.getChannelTypeId()) { case CHANNEL_TYPE_RF_LOW_BATTERY: - updateState(channelId, - dev.getBatteryLevel() == 1 ? OnOffType.OFF : OnOffType.ON); + updateState(channelId, OnOffType.from(dev.getBatteryLevel() != 1)); break; case CHANNEL_TYPE_RF_SIGNAL_STRENGTH: int signalLevel = new SignalLevelConverter(dev.getSignalStrength()) diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/profiles/PushButtonToCommandProfile.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/profiles/PushButtonToCommandProfile.java index 8a34a975d5..530b5b69ef 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/profiles/PushButtonToCommandProfile.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/profiles/PushButtonToCommandProfile.java @@ -202,7 +202,7 @@ public class PushButtonToCommandProfile implements TriggerProfile { private Command toggleCommandIfNeeded(@Nullable Command command) { if (command == null) { logger.debug("Toggling command: previous state is '{}'", previousState); - return OnOffType.ON.equals(previousState) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!OnOffType.ON.equals(previousState)); } return command; } diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java index 829de51673..3a04cb9867 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java @@ -514,7 +514,7 @@ public abstract class MessageHandler { } else { boolean isOn = isLEDLit(cmd2, button); logger.debug("{}: dev {} button {} switched to {}", nm(), a, button, isOn ? "ON" : "OFF"); - feature.publish(isOn ? OnOffType.ON : OnOffType.OFF, StateChangeType.CHANGED); + feature.publish(OnOffType.from(isOn), StateChangeType.CHANGED); } } catch (FieldException e) { logger.warn("{} error parsing {}: ", nm(), msg, e); diff --git a/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisHomeHandler.java b/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisHomeHandler.java index 7599997f7b..2b9d1e0a4c 100644 --- a/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisHomeHandler.java +++ b/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisHomeHandler.java @@ -488,7 +488,7 @@ public class IntesisHomeHandler extends BaseThingHandler { switch (element.uid) { case 1: updateState(CHANNEL_TYPE_POWER, - "0".equals(String.valueOf(element.value)) ? OnOffType.OFF : OnOffType.ON); + OnOffType.from(!"0".equals(String.valueOf(element.value)))); break; case 2: switch (element.value) { @@ -552,7 +552,7 @@ public class IntesisHomeHandler extends BaseThingHandler { break; case 14: updateState(CHANNEL_TYPE_ERRORSTATUS, - "0".equals(String.valueOf(element.value)) ? OnOffType.OFF : OnOffType.ON); + OnOffType.from(!"0".equals(String.valueOf(element.value)))); break; case 15: updateState(CHANNEL_TYPE_ERRORCODE, StringType.valueOf(String.valueOf(element.value))); diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java index 298521a856..2ba986ddd4 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java @@ -277,7 +277,7 @@ public class JablotronJa100FHandler extends JablotronAlarmHandler { if (id.startsWith("SEC-")) { newState = new StringType(state.getState()); } else if (id.startsWith("PG-")) { - newState = "ON".equals(state.getState()) ? OnOffType.ON : OnOffType.OFF; + newState = OnOffType.from("ON".equals(state.getState())); } else if (id.startsWith("THM-")) { newState = new QuantityType<>(state.getTemperature(), SIUnits.CELSIUS); } else { diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java index 397f9e2939..62520edead 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java @@ -161,7 +161,7 @@ public class JablotronJa100Handler extends JablotronAlarmHandler { logger.debug("Updating channel: {} to value: {}", channel.getUID(), segment.getSegmentState()); State newState; if (segmentId.startsWith("pgm_")) { - newState = "unset".equals(segment.getSegmentState()) ? OnOffType.OFF : OnOffType.ON; + newState = OnOffType.from(!"unset".equals(segment.getSegmentState())); } else { newState = new StringType(segment.getSegmentState()); } diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronOasisHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronOasisHandler.java index 3d315b4e67..d04f43ae89 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronOasisHandler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronOasisHandler.java @@ -111,7 +111,7 @@ public class JablotronOasisHandler extends JablotronAlarmHandler { @Override protected void updateSegmentStatus(JablotronServiceDetailSegment segment) { logger.debug("Segment id: {} and status: {}", segment.getSegmentId(), segment.getSegmentState()); - State newState = "unset".equals(segment.getSegmentState()) ? OnOffType.OFF : OnOffType.ON; + State newState = OnOffType.from(!"unset".equals(segment.getSegmentState())); switch (segment.getSegmentId()) { case "STATE_1": updateState(CHANNEL_STATUS_A, newState); diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java index 82f69ab526..3b7060280a 100644 --- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java +++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java @@ -133,8 +133,8 @@ public class LaCrosseTemperatureSensorHandler extends JeeLinkSensorHandler(temp, SIUnits.CELSIUS)); updateState(HUMIDITY_CHANNEL, new QuantityType<>(reading.getHumidity(), Units.PERCENT)); - updateState(BATTERY_NEW_CHANNEL, reading.isBatteryNew() ? OnOffType.ON : OnOffType.OFF); - updateState(BATTERY_LOW_CHANNEL, reading.isBatteryLow() ? OnOffType.ON : OnOffType.OFF); + updateState(BATTERY_NEW_CHANNEL, OnOffType.from(reading.isBatteryNew())); + updateState(BATTERY_LOW_CHANNEL, OnOffType.from(reading.isBatteryLow())); } else { logger.debug("updating states for channel {} of thing {} ({}): temp={} ({}), humidity={}", reading.getChannel(), getThing().getLabel(), getThing().getUID().getId(), temp, diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java index 3260b4c200..a9f6fb8d18 100644 --- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java +++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java @@ -55,8 +55,8 @@ public class Tx22SensorHandler extends JeeLinkSensorHandler { logger.debug("updating states for thing {} ({}): {}", getThing().getLabel(), getThing().getUID().getId(), reading); - updateState(BATTERY_NEW_CHANNEL, reading.isBatteryNew() ? OnOffType.ON : OnOffType.OFF); - updateState(BATTERY_LOW_CHANNEL, reading.isBatteryLow() ? OnOffType.ON : OnOffType.OFF); + updateState(BATTERY_NEW_CHANNEL, OnOffType.from(reading.isBatteryNew())); + updateState(BATTERY_LOW_CHANNEL, OnOffType.from(reading.isBatteryLow())); if (reading.hasTemperature()) { BigDecimal temp = new BigDecimal(reading.getTemperature()).setScale(1, RoundingMode.HALF_UP); diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java index a386c3a49f..6febc5533d 100644 --- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java +++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java @@ -103,7 +103,7 @@ public class Pca301SensorHandler extends JeeLinkSensorHandler { channel.set(reading.getChannel()); BigDecimal current = new BigDecimal(reading.getCurrent()).setScale(1, RoundingMode.HALF_UP); - state = reading.isOn() ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(reading.isOn()); updateState(CURRENT_POWER_CHANNEL, new QuantityType<>(current, Units.WATT)); updateState(CONSUMPTION_CHANNEL, new QuantityType<>(reading.getTotal(), Units.WATT_HOUR)); diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java index ffab4046bd..4b5943bb17 100644 --- a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java +++ b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java @@ -484,7 +484,7 @@ public class KaleidescapeHandler extends BaseThingHandler implements Kaleidescap updateState(channel, new PercentType(this.volume)); break; case MUTE: - updateState(channel, this.isMuted ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from(this.isMuted)); break; case TITLE_NAME: connector.sendCommand(GET_PLAYING_TITLE_NAME, cache.get("TITLE_NAME")); diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java index 98123eddbf..5ef248974d 100644 --- a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java +++ b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java @@ -84,7 +84,7 @@ public enum KaleidescapeMessageHandler { public void handleMessage(String message, KaleidescapeHandler handler) { Matcher matcher = p.matcher(message); if (matcher.find()) { - handler.updateChannel(POWER, (ONE).equals(matcher.group(1)) ? OnOffType.ON : OnOffType.OFF); + handler.updateChannel(POWER, OnOffType.from(ONE.equals(matcher.group(1)))); } else { logger.debug("DEVICE_POWER_STATE - no match on message: {}", message); } @@ -346,10 +346,10 @@ public enum KaleidescapeMessageHandler { Matcher matcher = p.matcher(message); if (matcher.find()) { // update REPEAT switch state - handler.updateChannel(MUSIC_REPEAT, (ONE).equals(matcher.group(3)) ? OnOffType.ON : OnOffType.OFF); + handler.updateChannel(MUSIC_REPEAT, OnOffType.from(ONE.equals(matcher.group(3)))); // update RANDOM switch state - handler.updateChannel(MUSIC_RANDOM, (ONE).equals(matcher.group(4)) ? OnOffType.ON : OnOffType.OFF); + handler.updateChannel(MUSIC_RANDOM, OnOffType.from(ONE.equals(matcher.group(4)))); } else { logger.debug("MUSIC_NOW_PLAYING_STATUS - no match on message: {}", message); } diff --git a/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/handler/KonnectedHandler.java b/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/handler/KonnectedHandler.java index d3f347a415..8e7fd73d3a 100644 --- a/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/handler/KonnectedHandler.java +++ b/bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/handler/KonnectedHandler.java @@ -135,7 +135,7 @@ public class KonnectedHandler extends BaseThingHandler { Integer state = event.getState(); logger.debug("The event state is: {}", state); if (state != null) { - OnOffType onOffType = state == zoneConfig.onValue ? OnOffType.ON : OnOffType.OFF; + OnOffType onOffType = OnOffType.from(state == zoneConfig.onValue); updateState(channelId, onOffType); } } else if (channelType.contains(CHANNEL_HUMIDITY)) { diff --git a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/converter/InversionConverter.java b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/converter/InversionConverter.java index f0a8c40112..34cb5448ed 100644 --- a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/converter/InversionConverter.java +++ b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/converter/InversionConverter.java @@ -38,7 +38,7 @@ public class InversionConverter extends Converter { if (state instanceof OpenClosedType) { convertedState = state.equals(OpenClosedType.OPEN) ? OpenClosedType.CLOSED : OpenClosedType.OPEN; } else if (state instanceof OnOffType) { - convertedState = state.equals(OnOffType.ON) ? OnOffType.OFF : OnOffType.ON; + convertedState = OnOffType.from(!state.equals(OnOffType.ON)); } else if (state instanceof UpDownType) { convertedState = state.equals(UpDownType.UP) ? UpDownType.DOWN : UpDownType.UP; } diff --git a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleKeyLockTableSubHandler.java b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleKeyLockTableSubHandler.java index db831f7c45..5f93ee242b 100644 --- a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleKeyLockTableSubHandler.java +++ b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleKeyLockTableSubHandler.java @@ -79,7 +79,7 @@ public class LcnModuleKeyLockTableSubHandler extends AbstractLcnModuleSubHandler try { LcnChannelGroup channelGroup = LcnChannelGroup.fromTableId(tableId); for (int i = 0; i < states.length; i++) { - fireUpdate(channelGroup, i, states[i] ? OnOffType.ON : OnOffType.OFF); + fireUpdate(channelGroup, i, OnOffType.from(states[i])); } } catch (LcnException e) { logger.warn("Failed to set key table lock state: {}", e.getMessage()); diff --git a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRelaySubHandler.java b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRelaySubHandler.java index a948ea7488..b2cbca5f88 100644 --- a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRelaySubHandler.java +++ b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRelaySubHandler.java @@ -61,7 +61,7 @@ public class LcnModuleRelaySubHandler extends AbstractLcnModuleSubHandler { public void handleCommandPercent(PercentType command, LcnChannelGroup channelGroup, int number) throws LcnException { // don't use OnOffType.as(), because it returns @Nullable - handleCommandOnOff(command.intValue() > 0 ? OnOffType.ON : OnOffType.OFF, channelGroup, number); + handleCommandOnOff(OnOffType.from(command.intValue() > 0), channelGroup, number); } @Override diff --git a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionColorProfile.java b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionColorProfile.java index 114d9ab1f7..0764a061b8 100644 --- a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionColorProfile.java +++ b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionColorProfile.java @@ -61,7 +61,7 @@ public class LeapMotionColorProfile implements TriggerProfile { @Override public void onTriggerFromHandler(String event) { if (event.equals(LeapMotionBindingConstants.GESTURE_TAP)) { - callback.sendCommand(lastState.getBrightness().equals(PercentType.ZERO) ? OnOffType.ON : OnOffType.OFF); + callback.sendCommand(OnOffType.from(lastState.getBrightness().equals(PercentType.ZERO))); } else if (event.equals(LeapMotionBindingConstants.GESTURE_CLOCKWISE)) { HSBType color = changeColor(lastState, true); callback.sendCommand(color); diff --git a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionDimmerProfile.java b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionDimmerProfile.java index d309bbc447..4171b9645f 100644 --- a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionDimmerProfile.java +++ b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionDimmerProfile.java @@ -65,7 +65,7 @@ public class LeapMotionDimmerProfile implements TriggerProfile { @Override public void onTriggerFromHandler(String event) { if (event.equals(LeapMotionBindingConstants.GESTURE_TAP)) { - callback.sendCommand(lastState.equals(BigDecimal.ZERO) ? OnOffType.ON : OnOffType.OFF); + callback.sendCommand(OnOffType.from(lastState.equals(BigDecimal.ZERO))); } else if (event.startsWith(LeapMotionBindingConstants.GESTURE_FINGERS)) { int fingers = Integer .valueOf(Character.toString(event.charAt(LeapMotionBindingConstants.GESTURE_FINGERS.length()))); diff --git a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionSwitchProfile.java b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionSwitchProfile.java index 029160c4fb..b247a43df6 100644 --- a/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionSwitchProfile.java +++ b/bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionSwitchProfile.java @@ -47,7 +47,7 @@ public class LeapMotionSwitchProfile implements TriggerProfile { @Override public void onTriggerFromHandler(String event) { if (event.equals(LeapMotionBindingConstants.GESTURE_TAP)) { - callback.sendCommand(lastState ? OnOffType.OFF : OnOffType.ON); + callback.sendCommand(OnOffType.from(!lastState)); } } } diff --git a/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/responses/OnOffResponse.java b/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/responses/OnOffResponse.java index ea8905f9ef..07303cad81 100644 --- a/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/responses/OnOffResponse.java +++ b/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/responses/OnOffResponse.java @@ -36,7 +36,7 @@ public class OnOffResponse implements LGSerialResponse { this.success = success; if (success) { - state = "01".equals(data) ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from("01".equals(data)); } else { state = new StringType(data); } diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/PowerControlPower.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/PowerControlPower.java index eda9b69cc0..9da535f3c2 100644 --- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/PowerControlPower.java +++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/PowerControlPower.java @@ -49,7 +49,7 @@ public class PowerControlPower extends BaseChannelHandler { public void onReceiveCommand(String channelId, LGWebOSHandler handler, Command command) { final State state = handler.getSocket().getState(); if (RefreshType.REFRESH == command) { - handler.postUpdate(channelId, state == State.REGISTERED ? OnOffType.ON : OnOffType.OFF); + handler.postUpdate(channelId, OnOffType.from(state == State.REGISTERED)); } else if (OnOffType.ON == command) { switch (state) { case CONNECTING: diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/PowerState.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/PowerState.java index f4e4c51314..f2ee975738 100644 --- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/PowerState.java +++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/PowerState.java @@ -52,6 +52,6 @@ public enum PowerState { } public OnOffType toOnOffType() { - return this == ON ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(this == ON); } } diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlJalousie.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlJalousie.java index a759c19e92..9554d93814 100644 --- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlJalousie.java +++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlJalousie.java @@ -189,7 +189,7 @@ class LxControlJalousie extends LxControl { private OnOffType getAutoShadeState() { Double value = getStateDoubleValue(STATE_AUTO_ACTIVE); if (value != null) { - return value == 1.0 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(value == 1.0); } return null; } diff --git a/bundles/org.openhab.binding.loxone/src/test/java/org/openhab/binding/loxone/internal/controls/LxControlJalousieTest.java b/bundles/org.openhab.binding.loxone/src/test/java/org/openhab/binding/loxone/internal/controls/LxControlJalousieTest.java index 1c96531c33..d5667f652c 100644 --- a/bundles/org.openhab.binding.loxone/src/test/java/org/openhab/binding/loxone/internal/controls/LxControlJalousieTest.java +++ b/bundles/org.openhab.binding.loxone/src/test/java/org/openhab/binding/loxone/internal/controls/LxControlJalousieTest.java @@ -64,7 +64,7 @@ public class LxControlJalousieTest extends LxControlTest { testChannelState(ROLLERSHUTTER_CHANNEL, new PercentType(i)); testChannelState(SHADE_CHANNEL, OnOffType.OFF); changeLoxoneState("autoactive", a ? 1.0 : 0.0); - testChannelState(AUTO_SHADE_CHANNEL, a ? OnOffType.ON : OnOffType.OFF); + testChannelState(AUTO_SHADE_CHANNEL, OnOffType.from(a)); a = !a; } changeLoxoneState("position", 100.1); diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgProtocolHandler.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgProtocolHandler.java index 25ed07ed8a..af90382d83 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgProtocolHandler.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgProtocolHandler.java @@ -1033,12 +1033,9 @@ class PrgProtocolHandler { final boolean zoneLock = (q4bits.length() > 2 ? q4bits.charAt(2) : '0') == '1'; final boolean sceneLock = (q4bits.length() > 3 ? q4bits.charAt(4) : '0') == '1'; - phCallback.stateChanged(controlUnit, PrgConstants.CHANNEL_SCENESEQ, - seqMode ? OnOffType.ON : OnOffType.OFF); - phCallback.stateChanged(controlUnit, PrgConstants.CHANNEL_SCENELOCK, - sceneLock ? OnOffType.ON : OnOffType.OFF); - phCallback.stateChanged(controlUnit, PrgConstants.CHANNEL_ZONELOCK, - zoneLock ? OnOffType.ON : OnOffType.OFF); + phCallback.stateChanged(controlUnit, PrgConstants.CHANNEL_SCENESEQ, OnOffType.from(seqMode)); + phCallback.stateChanged(controlUnit, PrgConstants.CHANNEL_SCENELOCK, OnOffType.from(sceneLock)); + phCallback.stateChanged(controlUnit, PrgConstants.CHANNEL_ZONELOCK, OnOffType.from(zoneLock)); } catch (NumberFormatException e) { logger.error("Invalid controller information response: '{}'", resp); } diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/CcoHandler.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/CcoHandler.java index 06410f9924..5c353d2552 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/CcoHandler.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/CcoHandler.java @@ -191,7 +191,7 @@ public class CcoHandler extends LutronHandler { } try { BigDecimal state = new BigDecimal(parameters[1]); - updateState(CHANNEL_SWITCH, state.compareTo(BigDecimal.ZERO) == 0 ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_SWITCH, OnOffType.from(state.compareTo(BigDecimal.ZERO) != 0)); } catch (NumberFormatException e) { logger.warn("Unable to parse update {} {} from CCO {}", type, Arrays.asList(parameters), integrationId); diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/SwitchHandler.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/SwitchHandler.java index 0ff04075ef..8a59367dc6 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/SwitchHandler.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/SwitchHandler.java @@ -98,7 +98,7 @@ public class SwitchHandler extends LutronHandler { if (getThing().getStatus() == ThingStatus.UNKNOWN) { updateStatus(ThingStatus.ONLINE); } - postCommand(CHANNEL_SWITCH, level.compareTo(BigDecimal.ZERO) == 0 ? OnOffType.OFF : OnOffType.ON); + postCommand(CHANNEL_SWITCH, OnOffType.from(level.compareTo(BigDecimal.ZERO) != 0)); } } diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/handler/PhantomButtonHandler.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/handler/PhantomButtonHandler.java index dbe622406c..e0f1045b19 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/handler/PhantomButtonHandler.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/handler/PhantomButtonHandler.java @@ -68,6 +68,6 @@ public class PhantomButtonHandler extends LutronHandler { private void handleLEDMapFeedback(LEDMapFeedback feedback) { boolean zoneEnabled = feedback.getZoneValue(getConfigAs(PhantomButtonConfig.class).getButtonNumber()) == '1'; - updateState(LutronBindingConstants.CHANNEL_SWITCH, zoneEnabled ? OnOffType.ON : OnOffType.OFF); + updateState(LutronBindingConstants.CHANNEL_SWITCH, OnOffType.from(zoneEnabled)); } } diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java index 28ef252d15..e2634498a3 100644 --- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java +++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java @@ -120,7 +120,7 @@ public class ChannelUpdaterJob implements SchedulerRunnable, Runnable { private @Nullable State convertValueToState(Integer rawValue, Class itemClass, @Nullable Unit unit) { if (itemClass == SwitchItem.class) { - return (rawValue == 0) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(rawValue != 0); } if (itemClass == DateTimeItem.class && rawValue > 0) { diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/device/Device.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/device/Device.java index 70242098c3..7b90f259cd 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/device/Device.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/device/Device.java @@ -246,7 +246,7 @@ public abstract class Device { } public final OnOffType getBatteryLow() { - return (this.batteryLow ? OnOffType.ON : OnOffType.OFF); + return OnOffType.from(batteryLow); } public final String getRFAddress() { diff --git a/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java b/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java index 02159dfa4e..68f0aadf7a 100644 --- a/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java +++ b/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java @@ -264,7 +264,7 @@ public class MelCloudDeviceHandler extends BaseThingHandler { private void updateChannels(String channelId, DeviceStatus deviceStatus) { switch (channelId) { case CHANNEL_POWER: - updateState(CHANNEL_POWER, deviceStatus.getPower() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_POWER, OnOffType.from(deviceStatus.getPower())); break; case CHANNEL_OPERATION_MODE: updateState(CHANNEL_OPERATION_MODE, new StringType(deviceStatus.getOperationMode().toString())); @@ -283,11 +283,10 @@ public class MelCloudDeviceHandler extends BaseThingHandler { updateState(CHANNEL_VANE_VERTICAL, new StringType(deviceStatus.getVaneVertical().toString())); break; case CHANNEL_OFFLINE: - updateState(CHANNEL_OFFLINE, deviceStatus.getOffline() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_OFFLINE, OnOffType.from(deviceStatus.getOffline())); break; case CHANNEL_HAS_PENDING_COMMAND: - updateState(CHANNEL_HAS_PENDING_COMMAND, - deviceStatus.getHasPendingCommand() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_HAS_PENDING_COMMAND, OnOffType.from(deviceStatus.getHasPendingCommand())); break; case CHANNEL_ROOM_TEMPERATURE: updateState(CHANNEL_ROOM_TEMPERATURE, new DecimalType(deviceStatus.getRoomTemperature())); diff --git a/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudHeatpumpDeviceHandler.java b/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudHeatpumpDeviceHandler.java index 2dc8b0f742..29cdb20577 100644 --- a/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudHeatpumpDeviceHandler.java +++ b/bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudHeatpumpDeviceHandler.java @@ -242,7 +242,7 @@ public class MelCloudHeatpumpDeviceHandler extends BaseThingHandler { private void updateChannels(String channelId, HeatpumpDeviceStatus heatpumpDeviceStatus) { switch (channelId) { case CHANNEL_POWER: - updateState(CHANNEL_POWER, heatpumpDeviceStatus.getPower() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_POWER, OnOffType.from(heatpumpDeviceStatus.getPower())); break; case CHANNEL_TANKWATERTEMPERATURE: updateState(CHANNEL_TANKWATERTEMPERATURE, @@ -257,8 +257,7 @@ public class MelCloudHeatpumpDeviceHandler extends BaseThingHandler { new DecimalType(heatpumpDeviceStatus.getRoomTemperatureZone1())); break; case CHANNEL_FORCED_HOTWATERMODE: - updateState(CHANNEL_FORCED_HOTWATERMODE, - heatpumpDeviceStatus.getForcedHotWaterMode() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_FORCED_HOTWATERMODE, OnOffType.from(heatpumpDeviceStatus.getForcedHotWaterMode())); break; case CHANNEL_LAST_COMMUNICATION: updateState(CHANNEL_LAST_COMMUNICATION, @@ -269,11 +268,10 @@ public class MelCloudHeatpumpDeviceHandler extends BaseThingHandler { new DateTimeType(convertDateTime(heatpumpDeviceStatus.getNextCommunication()))); break; case CHANNEL_HAS_PENDING_COMMAND: - updateState(CHANNEL_HAS_PENDING_COMMAND, - heatpumpDeviceStatus.getHasPendingCommand() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_HAS_PENDING_COMMAND, OnOffType.from(heatpumpDeviceStatus.getHasPendingCommand())); break; case CHANNEL_OFFLINE: - updateState(CHANNEL_OFFLINE, heatpumpDeviceStatus.getOffline() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_OFFLINE, OnOffType.from(heatpumpDeviceStatus.getOffline())); break; } } diff --git a/bundles/org.openhab.binding.meteostick/src/main/java/org/openhab/binding/meteostick/internal/handler/MeteostickSensorHandler.java b/bundles/org.openhab.binding.meteostick/src/main/java/org/openhab/binding/meteostick/internal/handler/MeteostickSensorHandler.java index bb62e1dd7b..b23baebba6 100644 --- a/bundles/org.openhab.binding.meteostick/src/main/java/org/openhab/binding/meteostick/internal/handler/MeteostickSensorHandler.java +++ b/bundles/org.openhab.binding.meteostick/src/main/java/org/openhab/binding/meteostick/internal/handler/MeteostickSensorHandler.java @@ -173,7 +173,7 @@ public class MeteostickSensorHandler extends BaseThingHandler implements Meteost } private void processBattery(boolean batteryLow) { - OnOffType state = batteryLow ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from(batteryLow); updateState(new ChannelUID(getThing().getUID(), CHANNEL_LOW_BATTERY), state); } diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeHandler.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeHandler.java index 4d4f110f57..e91bb47807 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeHandler.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeHandler.java @@ -121,7 +121,7 @@ public class FridgeHandler extends MieleApplianceHandler // Supercool is not exposed directly as property, but can be deduced from state. ChannelUID channelUid = new ChannelUID(getThing().getUID(), SUPERCOOL_CHANNEL_ID); - State state = dp.Value.equals(String.valueOf(STATE_SUPER_COOLING)) ? OnOffType.ON : OnOffType.OFF; + State state = OnOffType.from(dp.Value.equals(String.valueOf(STATE_SUPER_COOLING))); logger.trace("Update state of {} to {} through '{}'", channelUid, state, dp.Name); updateState(channelUid, state); } diff --git a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiActorPlugHandler.java b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiActorPlugHandler.java index a613ce27c2..fca487927c 100644 --- a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiActorPlugHandler.java +++ b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiActorPlugHandler.java @@ -79,7 +79,7 @@ public class XiaomiActorPlugHandler extends XiaomiActorBaseHandler { void parseDefault(JsonObject data) { getStatusFromData(data); if (data.has(IN_USE)) { - updateState(CHANNEL_IN_USE, (data.get(IN_USE).getAsInt() == 1) ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_IN_USE, OnOffType.from(data.get(IN_USE).getAsInt() == 1)); } if (data.has(LOAD_POWER)) { updateState(CHANNEL_LOAD_POWER, new DecimalType(data.get(LOAD_POWER).getAsBigDecimal())); @@ -93,7 +93,7 @@ public class XiaomiActorPlugHandler extends XiaomiActorBaseHandler { private void getStatusFromData(JsonObject data) { if (data.has(STATUS)) { boolean isOn = ON.equals(data.get(STATUS).getAsString()); - updateState(CHANNEL_POWER_ON, isOn ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_POWER_ON, OnOffType.from(isOn)); if (!isOn) { updateState(CHANNEL_IN_USE, OnOffType.OFF); updateState(CHANNEL_LOAD_POWER, new DecimalType(0)); diff --git a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch1Handler.java b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch1Handler.java index b8763b2f03..f2fadcd5e9 100644 --- a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch1Handler.java +++ b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch1Handler.java @@ -74,7 +74,7 @@ public class XiaomiAqaraActorSwitch1Handler extends XiaomiActorBaseHandler { void parseDefault(JsonObject data) { if (data.has(CHANNEL_0)) { boolean isOn = ON.equals(data.get(CHANNEL_0).getAsString().toLowerCase()); - updateState(CHANNEL_SWITCH_CH0, isOn ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_SWITCH_CH0, OnOffType.from(isOn)); } } } diff --git a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch2Handler.java b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch2Handler.java index be6f23b473..53b6a9f803 100644 --- a/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch2Handler.java +++ b/bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch2Handler.java @@ -80,11 +80,11 @@ public class XiaomiAqaraActorSwitch2Handler extends XiaomiActorBaseHandler { @Override void parseDefault(JsonObject data) { if (data.has(CHANNEL_0)) { - boolean isOn = ON.equals(data.get(CHANNEL_0).getAsString().toLowerCase()); - updateState(CHANNEL_SWITCH_CH0, isOn ? OnOffType.ON : OnOffType.OFF); + boolean isOn = ON.equalsIgnoreCase(data.get(CHANNEL_0).getAsString()); + updateState(CHANNEL_SWITCH_CH0, OnOffType.from(isOn)); } else if (data.has(CHANNEL_1)) { - boolean isOn = ON.equals(data.get(CHANNEL_1).getAsString().toLowerCase()); - updateState(CHANNEL_SWITCH_CH1, isOn ? OnOffType.ON : OnOffType.OFF); + boolean isOn = ON.equalsIgnoreCase(data.get(CHANNEL_1).getAsString()); + updateState(CHANNEL_SWITCH_CH1, OnOffType.from(isOn)); } } } diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java index 126c8db6ba..a6821ebb67 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java @@ -691,7 +691,7 @@ public class MiIoBasicHandler extends MiIoAbstractHandler { break; case "switch": if (val.getAsJsonPrimitive().isNumber()) { - updateState(basicChannel.getChannel(), val.getAsInt() > 0 ? OnOffType.ON : OnOffType.OFF); + updateState(basicChannel.getChannel(), OnOffType.from(val.getAsInt() > 0)); } else { String strVal = val.getAsString().toLowerCase(); updateState(basicChannel.getChannel(), diff --git a/bundles/org.openhab.binding.mikrotik/src/main/java/org/openhab/binding/mikrotik/internal/util/StateUtil.java b/bundles/org.openhab.binding.mikrotik/src/main/java/org/openhab/binding/mikrotik/internal/util/StateUtil.java index 34138c5093..fc58127011 100644 --- a/bundles/org.openhab.binding.mikrotik/src/main/java/org/openhab/binding/mikrotik/internal/util/StateUtil.java +++ b/bundles/org.openhab.binding.mikrotik/src/main/java/org/openhab/binding/mikrotik/internal/util/StateUtil.java @@ -68,7 +68,7 @@ public class StateUtil { if (value == null) { return UnDefType.NULL; } - return value ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(value); } public static State boolContactOrNull(@Nullable Boolean value) { diff --git a/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatHeaterHandler.java b/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatHeaterHandler.java index 5841c88f7d..18b67d95aa 100644 --- a/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatHeaterHandler.java +++ b/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatHeaterHandler.java @@ -71,11 +71,11 @@ public class MillheatHeaterHandler extends MillheatBaseThingHandler { } } else if (MillheatBindingConstants.CHANNEL_HEATING_ACTIVE.equals(channelUID.getId())) { if (command instanceof RefreshType) { - updateState(channelUID, heater.isHeatingActive() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(heater.isHeatingActive())); } } else if (MillheatBindingConstants.CHANNEL_FAN_ACTIVE.equals(channelUID.getId())) { if (command instanceof RefreshType) { - updateState(channelUID, heater.fanActive() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(heater.fanActive())); } else if (heater.canChangeTemp() && heater.getRoom() == null) { updateIndependentHeaterProperties(null, null, command); } else { @@ -87,7 +87,7 @@ public class MillheatHeaterHandler extends MillheatBaseThingHandler { } } else if (MillheatBindingConstants.CHANNEL_INDEPENDENT.equals(channelUID.getId())) { if (command instanceof RefreshType) { - updateState(channelUID, heater.getRoom() == null ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(heater.getRoom() == null)); } } else if (MillheatBindingConstants.CHANNEL_CURRENT_POWER.equals(channelUID.getId())) { if (command instanceof RefreshType) { @@ -128,13 +128,13 @@ public class MillheatHeaterHandler extends MillheatBaseThingHandler { } } else if (MillheatBindingConstants.CHANNEL_MASTER_SWITCH.equals(channelUID.getId())) { if (command instanceof RefreshType) { - updateState(channelUID, heater.powerStatus() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(heater.powerStatus())); } else { if (heater.canChangeTemp() && heater.getRoom() == null) { updateIndependentHeaterProperties(null, command, null); } else { // Just overwrite with old state - updateState(channelUID, heater.powerStatus() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(heater.powerStatus())); } } } else { diff --git a/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatRoomHandler.java b/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatRoomHandler.java index 97b6d4bd42..80919568fa 100644 --- a/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatRoomHandler.java +++ b/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatRoomHandler.java @@ -108,7 +108,7 @@ public class MillheatRoomHandler extends MillheatBaseThingHandler { } } else if (CHANNEL_HEATING_ACTIVE.equals(channelUID.getId())) { if (command instanceof RefreshType) { - updateState(channelUID, room.isHeatingActive() ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(room.isHeatingActive())); } } else { logger.debug("Received command {} on channel {}, but this channel is not handled or supported by {}", diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftPlayerHandler.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftPlayerHandler.java index 784d640131..b1f7c5efe9 100644 --- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftPlayerHandler.java +++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftPlayerHandler.java @@ -91,7 +91,7 @@ public class MinecraftPlayerHandler extends BaseThingHandler { break; } } - State onlineState = playerOnline ? OnOffType.ON : OnOffType.OFF; + State onlineState = OnOffType.from(playerOnline); updateState(MinecraftBindingConstants.CHANNEL_PLAYER_ONLINE, onlineState); }).flatMap(players -> Observable.from(players)).filter(player -> config.getName().equals(player.getName())) .subscribe(player -> updatePlayerState(player)); diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftServerHandler.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftServerHandler.java index 15f7dcbdf6..b50984e445 100644 --- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftServerHandler.java +++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftServerHandler.java @@ -114,7 +114,7 @@ public class MinecraftServerHandler extends BaseBridgeHandler { * @param isOnline true if server is online */ private void updateOnlineState(boolean isOnline) { - State onlineState = isOnline ? OnOffType.ON : OnOffType.OFF; + State onlineState = OnOffType.from(isOnline); updateState(MinecraftBindingConstants.CHANNEL_ONLINE, onlineState); } diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftSignHandler.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftSignHandler.java index 6316dffadc..5a66fdd10c 100644 --- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftSignHandler.java +++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftSignHandler.java @@ -95,7 +95,7 @@ public class MinecraftSignHandler extends BaseThingHandler { * @param sign the sign to update */ private void updateSignState(SignData sign) { - State activeState = sign.getState() ? OnOffType.ON : OnOffType.OFF; + State activeState = OnOffType.from(sign.getState()); updateState(MinecraftBindingConstants.CHANNEL_SIGN_ACTIVE, activeState); } diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java index e0db7bcb37..80daa8761e 100644 --- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java +++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java @@ -877,7 +877,7 @@ public class HeliosEasyControlsHandler extends BaseThingHandler { break; case "Switch": if (variableType.equals(HeliosVariable.TYPE_INTEGER)) { - updateState(v.getGroupAndName(), "1".equals(value) ? OnOffType.ON : OnOffType.OFF); + updateState(v.getGroupAndName(), OnOffType.from("1".equals(value))); } break; case "String": diff --git a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java index f81fc52171..994bb22022 100644 --- a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java +++ b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java @@ -976,7 +976,7 @@ public class ModbusDataThingHandler extends BaseThingHandler { State boolLikeState; if (containsOnOff(acceptedDataTypes)) { - boolLikeState = boolValue ? OnOffType.ON : OnOffType.OFF; + boolLikeState = OnOffType.from(boolValue); } else if (containsOpenClosed(acceptedDataTypes)) { boolLikeState = boolValue ? OpenClosedType.OPEN : OpenClosedType.CLOSED; } else { diff --git a/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromBulbHandler.java b/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromBulbHandler.java index 9187ca06f2..025fe6c191 100644 --- a/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromBulbHandler.java +++ b/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromBulbHandler.java @@ -183,7 +183,7 @@ public class MyStromBulbHandler extends AbstractMyStromHandler { private void updateDevice(@Nullable MyStromBulbResponse deviceInfo) { if (deviceInfo != null) { - updateState(CHANNEL_SWITCH, deviceInfo.on ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_SWITCH, OnOffType.from(deviceInfo.on)); updateState(CHANNEL_RAMP, QuantityType.valueOf(deviceInfo.ramp, MetricPrefix.MILLI(SECOND))); if (deviceInfo instanceof MyStromDeviceSpecificInfo info) { updateState(CHANNEL_POWER, QuantityType.valueOf(info.power, WATT)); diff --git a/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromPlugHandler.java b/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromPlugHandler.java index 0d2a64e15d..f678e9b527 100644 --- a/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromPlugHandler.java +++ b/bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromPlugHandler.java @@ -97,7 +97,7 @@ public class MyStromPlugHandler extends AbstractMyStromHandler { protected void pollDevice() { MyStromReport report = cache.getValue(); if (report != null) { - updateState(CHANNEL_SWITCH, report.relay ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_SWITCH, OnOffType.from(report.relay)); updateState(CHANNEL_POWER, QuantityType.valueOf(report.power, WATT)); updateState(CHANNEL_ENERGY_CONSUMED_SINCE_LAST_CALL, QuantityType.valueOf(report.Ws, WATT_SECOND)); updateState(CHANNEL_TEMPERATURE, QuantityType.valueOf(report.temperature, CELSIUS)); diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java index 304f9f62ab..5cce6d642b 100644 --- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java +++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java @@ -678,10 +678,9 @@ public class NanoleafControllerHandler extends BaseBridgeHandler implements Nano updateState(CHANNEL_COLOR, stateColor); updateState(CHANNEL_COLOR_MODE, new StringType(state.getColorMode())); - updateState(CHANNEL_RHYTHM_ACTIVE, controllerInfo.getRhythm().getRhythmActive() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_RHYTHM_ACTIVE, OnOffType.from(controllerInfo.getRhythm().getRhythmActive())); updateState(CHANNEL_RHYTHM_MODE, new DecimalType(controllerInfo.getRhythm().getRhythmMode())); - updateState(CHANNEL_RHYTHM_STATE, - controllerInfo.getRhythm().getRhythmConnected() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_RHYTHM_STATE, OnOffType.from(controllerInfo.getRhythm().getRhythmConnected())); updatePanelColors(); if (EFFECT_NAME_SOLID_COLOR.equals(controllerInfo.getEffects().getSelect())) { diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/model/State.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/model/State.java index c121b55963..5bbdc14658 100644 --- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/model/State.java +++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/model/State.java @@ -42,7 +42,7 @@ public class State { public OnOffType getOnOff() { On localOn = on; - return (localOn != null && localOn.getValue()) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from((localOn != null && localOn.getValue())); } public void setOn(On on) { diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/handler/NeatoHandler.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/handler/NeatoHandler.java index 49166b6319..8ccbe584c8 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/handler/NeatoHandler.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/handler/NeatoHandler.java @@ -153,10 +153,10 @@ public class NeatoHandler extends BaseThingHandler { Details details = neatoState.getDetails(); if (details != null) { updateState(CHANNEL_BATTERY, new DecimalType(details.getCharge())); - updateState(CHANNEL_DOCKHASBEENSEEN, details.getDockHasBeenSeen() ? OnOffType.ON : OnOffType.OFF); - updateState(CHANNEL_ISCHARGING, details.getIsCharging() ? OnOffType.ON : OnOffType.OFF); - updateState(CHANNEL_ISSCHEDULED, details.getIsScheduleEnabled() ? OnOffType.ON : OnOffType.OFF); - updateState(CHANNEL_ISDOCKED, details.getIsDocked() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_DOCKHASBEENSEEN, OnOffType.from(details.getDockHasBeenSeen())); + updateState(CHANNEL_ISCHARGING, OnOffType.from(details.getIsCharging())); + updateState(CHANNEL_ISSCHEDULED, OnOffType.from(details.getIsScheduleEnabled())); + updateState(CHANNEL_ISDOCKED, OnOffType.from(details.getIsDocked())); } Cleaning cleaning = neatoState.getCleaning(); diff --git a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/NeeoRoomProtocol.java b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/NeeoRoomProtocol.java index a5a9d26b69..fe255eb8d6 100644 --- a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/NeeoRoomProtocol.java +++ b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/NeeoRoomProtocol.java @@ -196,7 +196,7 @@ public class NeeoRoomProtocol { final NeeoRecipe recipe = neeoRoom.getRecipes().getRecipe(recipeKey); if (recipe != null) { callback.stateChanged(UidUtils.createChannelId(NeeoConstants.ROOM_GROUP_RECIPE_ID, - NeeoConstants.ROOM_CHANNEL_ENABLED, recipeKey), recipe.isEnabled() ? OnOffType.ON : OnOffType.OFF); + NeeoConstants.ROOM_CHANNEL_ENABLED, recipeKey), OnOffType.from(recipe.isEnabled())); } } @@ -241,8 +241,7 @@ public class NeeoRoomProtocol { final NeeoScenario scenario = neeoRoom.getScenarios().getScenario(scenarioKey); if (scenario != null) { callback.stateChanged(UidUtils.createChannelId(NeeoConstants.ROOM_GROUP_SCENARIO_ID, - NeeoConstants.ROOM_CHANNEL_ENABLED, scenarioKey), - scenario.isConfigured() ? OnOffType.ON : OnOffType.OFF); + NeeoConstants.ROOM_CHANNEL_ENABLED, scenarioKey), OnOffType.from(scenario.isConfigured())); } } diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java index aa3a94d453..b067f3f65d 100644 --- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java +++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java @@ -168,7 +168,7 @@ public class SDMThermostatHandler extends SDMBaseHandler { SDMFanTrait fan = traits.fan; if (fan != null) { - updateState(CHANNEL_FAN_TIMER_MODE, fan.timerMode == SDMFanTimerMode.ON ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_FAN_TIMER_MODE, OnOffType.from(fan.timerMode == SDMFanTimerMode.ON)); updateState(CHANNEL_FAN_TIMER_TIMEOUT, fan.timerTimeout == null ? UnDefType.NULL : new DateTimeType(fan.timerTimeout.withZoneSameInstant(timeZoneProvider.getTimeZone()))); } diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SirenChannelHelper.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SirenChannelHelper.java index 3a17c2f668..e53b00d54d 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SirenChannelHelper.java +++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SirenChannelHelper.java @@ -45,8 +45,8 @@ public class SirenChannelHelper extends EventChannelHelper { return switch (channelId) { case CHANNEL_MONITORING -> homeStatus.getMonitoring(); case CHANNEL_STATUS -> homeStatus.getStatus().map(SirenStatus::get) - .map(status -> SirenStatus.SOUND == status ? OnOffType.ON : OnOffType.OFF) - .map(State.class::cast).orElse(UnDefType.UNDEF); + .map(status -> OnOffType.from(SirenStatus.SOUND == status)).map(State.class::cast) + .orElse(UnDefType.UNDEF); default -> null; }; } diff --git a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java index 4151ec3a6d..ee6dbf110a 100644 --- a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java +++ b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java @@ -92,8 +92,7 @@ public class NetworkHandler extends BaseThingHandler switch (channelUID.getId()) { case CHANNEL_ONLINE: - presenceDetection.getValue( - value -> updateState(CHANNEL_ONLINE, value.isReachable() ? OnOffType.ON : OnOffType.OFF)); + presenceDetection.getValue(value -> updateState(CHANNEL_ONLINE, OnOffType.from(value.isReachable()))); break; case CHANNEL_LATENCY: case CHANNEL_DEPRECATED_TIME: diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java index a2b5b94afc..81ac5c75aa 100644 --- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java +++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java @@ -455,7 +455,7 @@ public class NibeHeatPumpHandler extends BaseThingHandler implements NibeHeatPum state = new StringType(converted.toString()); } else if ("Switch".equalsIgnoreCase(acceptedItemType)) { - state = converted.intValue() == 0 ? OnOffType.OFF : OnOffType.ON; + state = OnOffType.from(converted.intValue() != 0); } else if ("Number".equalsIgnoreCase(acceptedItemType)) { state = new DecimalType(converted); diff --git a/bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusSwitchModuleHandler.java b/bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusSwitchModuleHandler.java index 5d1c95a95d..c489ebac6c 100644 --- a/bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusSwitchModuleHandler.java +++ b/bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusSwitchModuleHandler.java @@ -44,6 +44,6 @@ public class NikobusSwitchModuleHandler extends NikobusModuleHandler { @Override protected State stateFromValue(String channelId, int value) { - return value != 0 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(value != 0); } } diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/handler/NikoHomeControlActionHandler.java b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/handler/NikoHomeControlActionHandler.java index 520d9a5e4f..ff1f7a4cf3 100644 --- a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/handler/NikoHomeControlActionHandler.java +++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/handler/NikoHomeControlActionHandler.java @@ -316,10 +316,10 @@ public class NikoHomeControlActionHandler extends BaseThingHandler implements Nh switch (actionType) { case TRIGGER: - updateState(CHANNEL_BUTTON, (actionState == 0) ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_BUTTON, OnOffType.from(actionState != 0)); updateStatus(ThingStatus.ONLINE); case RELAY: - updateState(CHANNEL_SWITCH, (actionState == 0) ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_SWITCH, OnOffType.from(actionState != 0)); updateStatus(ThingStatus.ONLINE); break; case DIMMER: diff --git a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java index 7ef3a7d2f1..e026716a1b 100644 --- a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java +++ b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java @@ -1355,7 +1355,7 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis case CHANNEL_TYPE_ALLMUTE: case CHANNEL_TYPE_PAGE: case CHANNEL_TYPE_LOUDNESS: - state = ON.equals(value) ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(ON.equals(value)); break; case CHANNEL_TYPE_LOCK: state = ON.equals(value) ? OpenClosedType.OPEN : OpenClosedType.CLOSED; diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/DigitalIoConfig.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/DigitalIoConfig.java index cbedac1493..5eff7e499f 100644 --- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/DigitalIoConfig.java +++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/DigitalIoConfig.java @@ -82,9 +82,9 @@ public class DigitalIoConfig { public State convertState(Boolean rawValue) { if (ioLogic == DigitalIoLogic.NORMAL) { - return rawValue ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(rawValue); } else { - return rawValue ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!rawValue); } } diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java index 4b2570efce..00fbe7ed03 100644 --- a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java +++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java @@ -561,7 +561,7 @@ public class OnkyoHandler extends OnkyoUpnpHandler implements OnkyoEventListener } else if (classToConvert == OnOffType.class) { index = Integer.parseInt(data, 16); - state = index == 0 ? OnOffType.OFF : OnOffType.ON; + state = OnOffType.from(index != 0); } else if (classToConvert == DecimalType.class) { index = Integer.parseInt(data, 16); diff --git a/bundles/org.openhab.binding.opengarage/src/main/java/org/openhab/binding/opengarage/internal/OpenGarageHandler.java b/bundles/org.openhab.binding.opengarage/src/main/java/org/openhab/binding/opengarage/internal/OpenGarageHandler.java index dab22dbce5..ce01f317aa 100644 --- a/bundles/org.openhab.binding.opengarage/src/main/java/org/openhab/binding/opengarage/internal/OpenGarageHandler.java +++ b/bundles/org.openhab.binding.opengarage/src/main/java/org/openhab/binding/opengarage/internal/OpenGarageHandler.java @@ -148,7 +148,7 @@ public class OpenGarageHandler extends BaseThingHandler { logger.debug("Received unknown door value: {}", controllerVariables.door); } else { boolean doorOpen = controllerVariables.door == 1; - OnOffType onOff = maybeInvert.apply(doorOpen) ? OnOffType.ON : OnOffType.OFF; + OnOffType onOff = OnOffType.from(maybeInvert.apply(doorOpen)); UpDownType upDown = doorOpen ? UpDownType.UP : UpDownType.DOWN; OpenClosedType contact = doorOpen ? OpenClosedType.OPEN : OpenClosedType.CLOSED; diff --git a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java index 7deadd0c52..89cbfbb0cc 100644 --- a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java +++ b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java @@ -777,7 +777,7 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis break; case CHANNEL_POWER: case CHANNEL_MUTE: - state = ON.equals(value) ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(ON.equals(value)); break; case CHANNEL_SOURCE: case CHANNEL_SUB_SHIFT: diff --git a/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java b/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java index d0a7aadd7f..c07e8fea7a 100644 --- a/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java +++ b/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java @@ -288,7 +288,7 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler { } ch = getThingChannel(event.getDeviceId(), CHANNEL_CONTROL); if (ch != null) { - updateState(ch.getUID(), "off".equals(event.getMode()) ? OnOffType.OFF : OnOffType.ON); + updateState(ch.getUID(), OnOffType.from(!"off".equals(event.getMode()))); } updateDeviceStatus(event.getDeviceId()); break; diff --git a/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java b/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java index 2f20e03b5c..d16bc64722 100644 --- a/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java +++ b/bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java @@ -190,7 +190,7 @@ public class OrbitBhyveSprinklerHandler extends BaseThingHandler { public void updateDeviceStatus(OrbitBhyveDeviceStatus status) { if (!status.getMode().isEmpty()) { updateState(CHANNEL_MODE, new StringType(status.getMode())); - updateState(CHANNEL_CONTROL, "off".equals(status.getMode()) ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_CONTROL, OnOffType.from(!"off".equals(status.getMode()))); } if (!status.getNextStartTime().isEmpty()) { DateTimeType dt = new DateTimeType(status.getNextStartTime()); @@ -214,7 +214,7 @@ public class OrbitBhyveSprinklerHandler extends BaseThingHandler { } Channel ch = thing.getChannel(enableChannelName); if (ch != null) { - updateState(ch.getUID(), program.isEnabled() ? OnOffType.ON : OnOffType.OFF); + updateState(ch.getUID(), OnOffType.from(program.isEnabled())); } } @@ -259,11 +259,11 @@ public class OrbitBhyveSprinklerHandler extends BaseThingHandler { String enableChannelName = "enable_program_" + program.getProgram(); Channel ch = thing.getChannel(enableChannelName); if (ch != null) { - updateState(ch.getUID(), program.isEnabled() ? OnOffType.ON : OnOffType.OFF); + updateState(ch.getUID(), OnOffType.from(program.isEnabled())); } } public void updateSmartWatering(String senseMode) { - updateState(CHANNEL_SMART_WATERING, ("auto".equals(senseMode)) ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_SMART_WATERING, OnOffType.from("auto".equals(senseMode))); } } diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPartitionHandler.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPartitionHandler.java index 8ca6ed97a5..a70c4a8062 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPartitionHandler.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPartitionHandler.java @@ -84,7 +84,7 @@ public class ParadoxPartitionHandler extends EntityBaseHandler { } private OnOffType booleanToSwitchState(boolean value) { - return value ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(value); } @Override diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxZoneHandler.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxZoneHandler.java index b9e620216d..4d980675ee 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxZoneHandler.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxZoneHandler.java @@ -94,7 +94,7 @@ public class ParadoxZoneHandler extends EntityBaseHandler { } private OnOffType booleanToSwitchState(boolean value) { - return value ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(value); } @Override diff --git a/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairEasyTouchHandler.java b/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairEasyTouchHandler.java index f66877d096..50b7a5d409 100644 --- a/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairEasyTouchHandler.java +++ b/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairEasyTouchHandler.java @@ -338,87 +338,87 @@ public class PentairEasyTouchHandler extends PentairBaseThingHandler { switch (channel) { case EASYTOUCH_POOL: if (p29 == null || (p29.pool != p29cur.pool)) { - updateState(channel, (p29cur.pool) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.pool))); } break; case EASYTOUCH_SPA: if (p29 == null || (p29.spa != p29cur.spa)) { - updateState(channel, (p29cur.spa) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.spa))); } break; case EASYTOUCH_AUX1: if (p29 == null || (p29.aux1 != p29cur.aux1)) { - updateState(channel, (p29cur.aux1) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux1))); } break; case EASYTOUCH_AUX2: if (p29 == null || (p29.aux2 != p29cur.aux2)) { - updateState(channel, (p29cur.aux2) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux2))); } break; case EASYTOUCH_AUX3: if (p29 == null || (p29.aux3 != p29cur.aux3)) { - updateState(channel, (p29cur.aux3) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux3))); } break; case EASYTOUCH_AUX4: if (p29 == null || (p29.aux4 != p29cur.aux4)) { - updateState(channel, (p29cur.aux4) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux4))); } break; case EASYTOUCH_AUX5: if (p29 == null || (p29.aux5 != p29cur.aux5)) { - updateState(channel, (p29cur.aux5) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux5))); } break; case EASYTOUCH_AUX6: if (p29 == null || (p29.aux6 != p29cur.aux6)) { - updateState(channel, (p29cur.aux6) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux6))); } break; case EASYTOUCH_AUX7: if (p29 == null || (p29.aux7 != p29cur.aux7)) { - updateState(channel, (p29cur.aux7) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.aux7))); } break; case EASYTOUCH_FEATURE1: if (p29 == null || (p29.feature1 != p29cur.feature1)) { - updateState(channel, (p29cur.feature1) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature1))); } break; case EASYTOUCH_FEATURE2: if (p29 == null || (p29.feature2 != p29cur.feature2)) { - updateState(channel, (p29cur.feature2) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature2))); } break; case EASYTOUCH_FEATURE3: if (p29 == null || (p29.feature3 != p29cur.feature3)) { - updateState(channel, (p29cur.feature3) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature3))); } break; case EASYTOUCH_FEATURE4: if (p29 == null || (p29.feature4 != p29cur.feature4)) { - updateState(channel, (p29cur.feature4) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature4))); } break; case EASYTOUCH_FEATURE5: if (p29 == null || (p29.feature5 != p29cur.feature5)) { - updateState(channel, (p29cur.feature5) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature5))); } break; case EASYTOUCH_FEATURE6: if (p29 == null || (p29.feature6 != p29cur.feature6)) { - updateState(channel, (p29cur.feature6) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature6))); } break; case EASYTOUCH_FEATURE7: if (p29 == null || (p29.feature7 != p29cur.feature7)) { - updateState(channel, (p29cur.feature7) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature7))); } break; case EASYTOUCH_FEATURE8: if (p29 == null || (p29.feature8 != p29cur.feature8)) { - updateState(channel, (p29cur.feature8) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((p29cur.feature8))); } break; case EASYTOUCH_POOLTEMP: diff --git a/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairIntelliFloHandler.java b/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairIntelliFloHandler.java index b0f3b74ca4..bf470efe9a 100644 --- a/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairIntelliFloHandler.java +++ b/bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairIntelliFloHandler.java @@ -146,7 +146,7 @@ public class PentairIntelliFloHandler extends PentairBaseThingHandler { switch (channel) { case INTELLIFLO_RUN: if (pps == null || (pps.run != ppscur.run)) { - updateState(channel, (ppscur.run) ? OnOffType.ON : OnOffType.OFF); + updateState(channel, OnOffType.from((ppscur.run))); } break; case INTELLIFLO_MODE: diff --git a/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/handler/AbstractAvrHandler.java b/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/handler/AbstractAvrHandler.java index c90f45ab1a..584058b486 100644 --- a/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/handler/AbstractAvrHandler.java +++ b/bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/handler/AbstractAvrHandler.java @@ -297,7 +297,7 @@ public abstract class AbstractAvrHandler extends BaseThingHandler * @param response */ private void managePowerStateUpdate(AvrResponse response) { - OnOffType state = PowerStateValues.ON_VALUE.equals(response.getParameterValue()) ? OnOffType.ON : OnOffType.OFF; + OnOffType state = OnOffType.from(PowerStateValues.ON_VALUE.equals(response.getParameterValue())); // When a Power ON state update is received, call the onPowerOn method. if (OnOffType.ON == state) { @@ -329,7 +329,7 @@ public abstract class AbstractAvrHandler extends BaseThingHandler */ private void manageMuteStateUpdate(AvrResponse response) { updateState(getChannelUID(PioneerAvrBindingConstants.MUTE_CHANNEL, response.getZone()), - response.getParameterValue().equals(MuteStateValues.OFF_VALUE) ? OnOffType.OFF : OnOffType.ON); + OnOffType.from(!response.getParameterValue().equals(MuteStateValues.OFF_VALUE))); } /** diff --git a/bundles/org.openhab.binding.pjlinkdevice/src/main/java/org/openhab/binding/pjlinkdevice/internal/PJLinkDeviceHandler.java b/bundles/org.openhab.binding.pjlinkdevice/src/main/java/org/openhab/binding/pjlinkdevice/internal/PJLinkDeviceHandler.java index 9d48d3c059..3501f01d52 100644 --- a/bundles/org.openhab.binding.pjlinkdevice/src/main/java/org/openhab/binding/pjlinkdevice/internal/PJLinkDeviceHandler.java +++ b/bundles/org.openhab.binding.pjlinkdevice/src/main/java/org/openhab/binding/pjlinkdevice/internal/PJLinkDeviceHandler.java @@ -188,9 +188,9 @@ public class PJLinkDeviceHandler extends BaseThingHandler { // refresh both video and audio mute, as it's one request MuteQueryResponseValue muteStatus = device.getMuteStatus(); updateState(PJLinkDeviceBindingConstants.CHANNEL_AUDIO_MUTE, - muteStatus.isAudioMuted() ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(muteStatus.isAudioMuted())); updateState(PJLinkDeviceBindingConstants.CHANNEL_VIDEO_MUTE, - muteStatus.isVideoMuted() ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(muteStatus.isVideoMuted())); } else { if (isAudioMute) { logger.trace("Received audio mute command {}", command); @@ -226,8 +226,7 @@ public class PJLinkDeviceHandler extends BaseThingHandler { try { LampState lampState = lampStates.get(lampNumber - 1); if (isLampActiveChannel) { - updateState(lampChannel.getUID(), - lampState.isActive() ? OnOffType.ON : OnOffType.OFF); + updateState(lampChannel.getUID(), OnOffType.from(lampState.isActive())); } if (isLampHoursChannel) { updateState(lampChannel.getUID(), new DecimalType(lampState.getLampHours())); diff --git a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDigitalHandler.java b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDigitalHandler.java index f7fbe1f807..206f5aeeeb 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDigitalHandler.java +++ b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDigitalHandler.java @@ -313,7 +313,7 @@ public class PLCDigitalHandler extends PLCCommonHandler { updateState(channelUID, value ? OpenClosedType.CLOSED : OpenClosedType.OPEN); logger.debug("Channel {} accepting {} was set to {}.", channelUID, type, value); } else if (DIGITAL_OUTPUT_ITEM.equalsIgnoreCase(type)) { - updateState(channelUID, value ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(value)); logger.debug("Channel {} accepting {} was set to {}.", channelUID, type, value); } else { logger.debug("Channel {} will not accept {} items.", channelUID, type); diff --git a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCMemoryHandler.java b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCMemoryHandler.java index be4b9c85a8..1847e55d5b 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCMemoryHandler.java +++ b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCMemoryHandler.java @@ -88,7 +88,7 @@ public class PLCMemoryHandler extends PLCCommonHandler { if (result == 0) { if (DIGITAL_OUTPUT_ITEM.equalsIgnoreCase(type) && MEMORY_BYTE.equalsIgnoreCase(kind)) { boolean value = S7.GetBitAt(buffer, address, getBit(name)); - updateState(channelUID, value ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(value)); logger.debug("Channel {} accepting {} was set to {}.", channelUID, type, value); } else if (ANALOG_ITEM.equalsIgnoreCase(type) && MEMORY_BYTE.equalsIgnoreCase(kind)) { int value = buffer[address]; @@ -172,7 +172,7 @@ public class PLCMemoryHandler extends PLCCommonHandler { if (DIGITAL_OUTPUT_ITEM.equalsIgnoreCase(type) && kind.equalsIgnoreCase(MEMORY_BYTE)) { OnOffType state = (OnOffType) getOldValue(name); - OnOffType value = S7.GetBitAt(data, address, getBit(name)) ? OnOffType.ON : OnOffType.OFF; + OnOffType value = OnOffType.from(S7.GetBitAt(data, address, getBit(name))); if ((state == null) || (value != state) || force) { updateState(channelUID, value); logger.debug("Channel {} accepting {} was set to {}.", channelUID, type, value); diff --git a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCPulseHandler.java b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCPulseHandler.java index 46cb2cd419..328cb84b0c 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCPulseHandler.java +++ b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCPulseHandler.java @@ -329,7 +329,7 @@ public class PLCPulseHandler extends PLCCommonHandler { updateState(channelUID, value ? OpenClosedType.CLOSED : OpenClosedType.OPEN); logger.debug("Channel {} accepting {} was set to {}.", channelUID, type, value); } else if (DIGITAL_OUTPUT_ITEM.equalsIgnoreCase(type)) { - updateState(channelUID, value ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(value)); logger.debug("Channel {} accepting {} was set to {}.", channelUID, type, value); } else { logger.debug("Channel {} will not accept {} items.", channelUID, type); diff --git a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/AbstractSleepingEndDeviceHandler.java b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/AbstractSleepingEndDeviceHandler.java index 8026d74307..9063d1bab9 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/AbstractSleepingEndDeviceHandler.java +++ b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/AbstractSleepingEndDeviceHandler.java @@ -64,7 +64,7 @@ public abstract class AbstractSleepingEndDeviceHandler extends AbstractPlugwiseT } protected void handleBroadcastGroupSwitchResponseMessage(BroadcastGroupSwitchResponseMessage message) { - updateState(CHANNEL_TRIGGERED, message.getPowerState() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_TRIGGERED, OnOffType.from(message.getPowerState())); } protected void handleInformationResponse(InformationResponseMessage message) { diff --git a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseRelayDeviceHandler.java b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseRelayDeviceHandler.java index e290c21abb..e4cc01105e 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseRelayDeviceHandler.java +++ b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseRelayDeviceHandler.java @@ -368,7 +368,7 @@ public class PlugwiseRelayDeviceHandler extends AbstractPlugwiseThingHandler { private void handleInformationResponse(InformationResponseMessage message) { recentLogAddress = message.getLogAddress(); - OnOffType powerState = message.getPowerState() ? OnOffType.ON : OnOffType.OFF; + OnOffType powerState = OnOffType.from(message.getPowerState()); PendingPowerStateChange change = pendingPowerStateChange; if (change != null) { diff --git a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseSwitchHandler.java b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseSwitchHandler.java index ed56c31dd1..2663657abf 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseSwitchHandler.java +++ b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseSwitchHandler.java @@ -93,9 +93,9 @@ public class PlugwiseSwitchHandler extends AbstractSleepingEndDeviceHandler { @Override protected void handleBroadcastGroupSwitchResponseMessage(BroadcastGroupSwitchResponseMessage message) { if (message.getPortMask() == 1) { - updateState(CHANNEL_LEFT_BUTTON_STATE, message.getPowerState() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_LEFT_BUTTON_STATE, OnOffType.from(message.getPowerState())); } else if (message.getPortMask() == 2) { - updateState(CHANNEL_RIGHT_BUTTON_STATE, message.getPowerState() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_RIGHT_BUTTON_STATE, OnOffType.from(message.getPowerState())); } } diff --git a/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/handler/PowermaxThingHandler.java b/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/handler/PowermaxThingHandler.java index cc45d78c85..1b44c9d278 100644 --- a/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/handler/PowermaxThingHandler.java +++ b/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/handler/PowermaxThingHandler.java @@ -202,7 +202,7 @@ public class PowermaxThingHandler extends BaseThingHandler implements PowermaxPa int num = getConfigAs(PowermaxX10Configuration.class).deviceNumber; Boolean status = state.getPGMX10DeviceStatus(num); if (channel.equals(X10_STATUS) && (status != null)) { - updateState(X10_STATUS, status ? OnOffType.ON : OnOffType.OFF); + updateState(X10_STATUS, OnOffType.from(status)); } } } diff --git a/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/state/PowermaxState.java b/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/state/PowermaxState.java index bcd97afdd0..73448ec65f 100644 --- a/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/state/PowermaxState.java +++ b/bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/state/PowermaxState.java @@ -65,7 +65,7 @@ public class PowermaxState extends PowermaxStateContainer { if (isArmed == null) { return UnDefType.NULL; } - return isArmed ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(isArmed); }); public DynamicValue panelMode = new DynamicValue<>(this, MODE, () -> { @@ -101,7 +101,7 @@ public class PowermaxState extends PowermaxStateContainer { if (status == null) { return UnDefType.NULL; } - return status ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(status); }); private PowermaxPanelSettings panelSettings; diff --git a/bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/handler/QbusBistabielHandler.java b/bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/handler/QbusBistabielHandler.java index 306e6bab0f..0337ee1e80 100644 --- a/bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/handler/QbusBistabielHandler.java +++ b/bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/handler/QbusBistabielHandler.java @@ -195,7 +195,7 @@ public class QbusBistabielHandler extends QbusGlobalHandler { public void handleStateUpdate(QbusBistabiel qBistabiel) { Integer bistabielState = qBistabiel.getState(); if (bistabielState != null) { - updateState(CHANNEL_SWITCH, (bistabielState == 0) ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_SWITCH, OnOffType.from(bistabielState != 0)); } } diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java index 88eacc09c4..018619e836 100644 --- a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java +++ b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java @@ -573,7 +573,7 @@ public class RemoteopenhabBridgeHandler extends BaseBridgeHandler break; case CoreItemFactory.SWITCH: if (checkStateType(itemName, stateType, "OnOff")) { - channelState = "ON".equals(state) ? OnOffType.ON : OnOffType.OFF; + channelState = OnOffType.from("ON".equals(state)); } break; case CoreItemFactory.CONTACT: diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComHomeConfortMessage.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComHomeConfortMessage.java index b602aeee92..d2f643a554 100644 --- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComHomeConfortMessage.java +++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComHomeConfortMessage.java @@ -130,7 +130,7 @@ public class RFXComHomeConfortMessage extends RFXComDeviceMessageImpl(info.getStatus().getDistance(), SIUnits.METRE)); updateState(CHANNEL_STATUS_HOURS, new QuantityType<>(info.getStatus().getHours(), Units.HOUR)); updateState(CHANNEL_STATUS_MODE, new StringType(info.getStatus().getMode().name())); - updateState(CHANNEL_MOWER_START, info.getStatus().isStopped() ? OnOffType.OFF : OnOffType.ON); + updateState(CHANNEL_MOWER_START, OnOffType.from(!info.getStatus().isStopped())); if (info.getHealth() != null) { updateState(CHANNEL_HEALTH_TEMP, new QuantityType<>(info.getHealth().getTemperature(), SIUnits.CELSIUS)); @@ -255,7 +255,7 @@ public class RobonectHandler extends BaseThingHandler { updateState(CHANNEL_TIMER_STATUS, new StringType(info.getTimer().getStatus().name())); } updateState(CHANNEL_WLAN_SIGNAL, new DecimalType(info.getWlan().getSignal())); - updateState(CHANNEL_JOB, robonectClient.isJobRunning() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_JOB, OnOffType.from(robonectClient.isJobRunning())); } else { logger.error("Could not retrieve mower info. Robonect error response message: {}", info.getErrorMessage()); } diff --git a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/system/RioSystemProtocol.java b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/system/RioSystemProtocol.java index 6970d0538d..aeca47f9a4 100644 --- a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/system/RioSystemProtocol.java +++ b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/system/RioSystemProtocol.java @@ -124,7 +124,7 @@ class RioSystemProtocol extends AbstractRioProtocol { * Refresh the system status */ void refreshSystemAllOn() { - stateChanged(RioConstants.CHANNEL_SYSALLON, allOn.get() ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_SYSALLON, OnOffType.from(allOn.get())); } /** @@ -216,7 +216,7 @@ class RioSystemProtocol extends AbstractRioProtocol { stateChanged(RioConstants.CHANNEL_SYSLANG, new StringType(value)); break; case SYS_STATUS: - stateChanged(RioConstants.CHANNEL_SYSSTATUS, "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_SYSSTATUS, OnOffType.from("ON".equals(value))); break; default: diff --git a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/zone/RioZoneProtocol.java b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/zone/RioZoneProtocol.java index a379889f13..d9dececde1 100644 --- a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/zone/RioZoneProtocol.java +++ b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/zone/RioZoneProtocol.java @@ -748,8 +748,7 @@ class RioZoneProtocol extends AbstractRioProtocol break; case ZONE_LOUDNESS: - stateChanged(RioConstants.CHANNEL_ZONELOUDNESS, - "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_ZONELOUDNESS, OnOffType.from("ON".equals(value))); break; case ZONE_TURNONVOLUME: @@ -770,16 +769,14 @@ class RioZoneProtocol extends AbstractRioProtocol break; case ZONE_STATUS: - stateChanged(RioConstants.CHANNEL_ZONESTATUS, - "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_ZONESTATUS, OnOffType.from("ON".equals(value))); break; case ZONE_MUTE: - stateChanged(RioConstants.CHANNEL_ZONEMUTE, "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_ZONEMUTE, OnOffType.from("ON".equals(value))); break; case ZONE_SHAREDSOURCE: - stateChanged(RioConstants.CHANNEL_ZONESHAREDSOURCE, - "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_ZONESHAREDSOURCE, OnOffType.from("ON".equals(value))); break; case ZONE_LASTERROR: @@ -787,7 +784,7 @@ class RioZoneProtocol extends AbstractRioProtocol break; case ZONE_PAGE: - stateChanged(RioConstants.CHANNEL_ZONEPAGE, "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_ZONEPAGE, OnOffType.from("ON".equals(value))); break; case ZONE_SLEEPTIMEREMAINING: @@ -800,8 +797,7 @@ class RioZoneProtocol extends AbstractRioProtocol break; case ZONE_ENABLED: - stateChanged(RioConstants.CHANNEL_ZONEENABLED, - "ON".equals(value) ? OnOffType.ON : OnOffType.OFF); + stateChanged(RioConstants.CHANNEL_ZONEENABLED, OnOffType.from("ON".equals(value))); break; case ZONE_VOLUME: diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java index 9ebf0fa002..220b1456f5 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java @@ -125,7 +125,7 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen public void channelLinked(ChannelUID channelUID) { logger.trace("channelLinked: {}", channelUID); - updateState(POWER, getPowerState() ? OnOffType.ON : OnOffType.OFF); + updateState(POWER, OnOffType.from(getPowerState())); for (SamsungTvService service : services) { service.clearCache(); diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MediaRendererService.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MediaRendererService.java index 12a1f33238..cc86d2a75a 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MediaRendererService.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MediaRendererService.java @@ -208,7 +208,7 @@ public class MediaRendererService implements UpnpIOParticipant, SamsungTvService case "CurrentMute": State newState = UnDefType.UNDEF; if (value != null) { - newState = "true".equals(value) ? OnOffType.ON : OnOffType.OFF; + newState = OnOffType.from("true".equals(value)); } listener.valueReceived(MUTE, newState); break; diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/RemoteControllerService.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/RemoteControllerService.java index 054324ec91..859c983143 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/RemoteControllerService.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/RemoteControllerService.java @@ -472,11 +472,11 @@ public class RemoteControllerService implements SamsungTvService, RemoteControll for (EventListener listener : listeners) { // order of state updates is important to prevent extraneous transitions in overall state if (on) { - listener.valueReceived(POWER, on ? OnOffType.ON : OnOffType.OFF); - listener.valueReceived(ART_MODE, artmode ? OnOffType.ON : OnOffType.OFF); + listener.valueReceived(POWER, OnOffType.from(on)); + listener.valueReceived(ART_MODE, OnOffType.from(artmode)); } else { - listener.valueReceived(ART_MODE, artmode ? OnOffType.ON : OnOffType.OFF); - listener.valueReceived(POWER, on ? OnOffType.ON : OnOffType.OFF); + listener.valueReceived(ART_MODE, OnOffType.from(artmode)); + listener.valueReceived(POWER, OnOffType.from(on)); } } } diff --git a/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelThingHandler.java b/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelThingHandler.java index 85a9b81d99..16cead87dc 100644 --- a/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelThingHandler.java +++ b/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelThingHandler.java @@ -108,7 +108,7 @@ public abstract class SatelThingHandler extends BaseThingHandler implements Sate * @param switchOn if true the channel is updated with ON state, with OFF state otherwise */ protected void updateSwitch(ChannelUID channelUID, boolean switchOn) { - State state = switchOn ? OnOffType.ON : OnOffType.OFF; + State state = OnOffType.from(switchOn); updateState(channelUID, state); } diff --git a/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java b/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java index 5ac7403604..195c9bd5ee 100644 --- a/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java +++ b/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java @@ -399,7 +399,7 @@ public class SenecHomeHandler extends BaseThingHandler { } logger.debug("Updating power limitation state {}", status); - updateState(channel.getUID(), status ? OnOffType.ON : OnOffType.OFF); + updateState(channel.getUID(), OnOffType.from(status)); } protected void updateGridPowerValues(BigDecimal gridTotalValue) { diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTProtocol.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTProtocol.java index d37a39ed2d..e56a9de2ac 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTProtocol.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTProtocol.java @@ -89,8 +89,7 @@ public class Shelly1CoIoTProtocol { toQuantityType(s.value, DIGITS_PERCENT, Units.PERCENT)); break; case "m" /* Motion */: - updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_MOTION, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_MOTION, OnOffType.from(s.value == 1)); break; case "l": // Luminosity + updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_LUX, @@ -123,11 +122,11 @@ public class Shelly1CoIoTProtocol { break; case "flood": updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_FLOOD, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(s.value == 1)); break; case "vibration": // DW with FW1.6.5+ updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_VIBRATION, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(s.value == 1)); if (s.value == 1) { thingHandler.triggerChannel(CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_ALARM_STATE, EVENT_TYPE_VIBRATION); @@ -138,7 +137,7 @@ public class Shelly1CoIoTProtocol { break; case "charger": // Sense updateChannel(updates, CHANNEL_GROUP_DEV_STATUS, CHANNEL_DEVST_CHARGER, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(s.value == 1)); break; // RGBW2/Bulb case "red": @@ -193,7 +192,7 @@ public class Shelly1CoIoTProtocol { int idx = getSensorNumber(sen.desc, sen.id) - 1; String iGroup = profile.getInputGroup(idx); String iChannel = CHANNEL_INPUT + profile.getInputSuffix(idx); - updateChannel(updates, iGroup, iChannel, s.value == 0 ? OnOffType.OFF : OnOffType.ON); + updateChannel(updates, iGroup, iChannel, OnOffType.from(s.value != 0)); } protected void handleInputEvent(CoIotDescrSen sen, String type, int count, int serial, Map updates) { @@ -270,7 +269,7 @@ public class Shelly1CoIoTProtocol { } } if (power != -1) { - updateChannel(updates, group, channel + "$Switch", power == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, group, channel + "$Switch", OnOffType.from(power == 1)); } if (brightness != -1) { updateChannel(updates, group, channel + "$Value", @@ -278,15 +277,14 @@ public class Shelly1CoIoTProtocol { } } else if (profile.hasRelays) { group = profile.numRelays <= 1 ? CHANNEL_GROUP_RELAY_CONTROL : CHANNEL_GROUP_RELAY_CONTROL + id; - updateChannel(updates, group, CHANNEL_OUTPUT, s.value == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, group, CHANNEL_OUTPUT, OnOffType.from(s.value == 1)); } else if (profile.isSensor) { // Sensor state if (profile.isDW) { // Door Window has item type Contact updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_STATE, s.value != 0 ? OpenClosedType.OPEN : OpenClosedType.CLOSED); } else { - updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_STATE, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_STATE, OnOffType.from(s.value == 1)); } } } diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion1.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion1.java index 4f4e602057..fd93dbf158 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion1.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion1.java @@ -174,7 +174,7 @@ public class Shelly1CoIoTVersion1 extends Shelly1CoIoTProtocol implements Shelly break; case "flood": updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_FLOOD, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(s.value == 1)); break; case "tilt": // DW with FW1.6.5+ //+ updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_TILT, @@ -184,7 +184,7 @@ public class Shelly1CoIoTVersion1 extends Shelly1CoIoTProtocol implements Shelly if (profile.isMotion) { // handle as status updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_VIBRATION, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(s.value == 1)); } else if (s.value == 1) { // handle as event thingHandler.triggerChannel(CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_ALARM_STATE, diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion2.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion2.java index 5a599811f6..7b0c457c46 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion2.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion2.java @@ -351,14 +351,12 @@ public class Shelly1CoIoTVersion2 extends Shelly1CoIoTProtocol implements Shelly thingHandler.postEvent("ROLLER_" + reason.toUpperCase(), true); } case "6106": // A, flood, 0/1, -1 - updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_FLOOD, - value == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_FLOOD, OnOffType.from(value == 1)); break; case "6107": // A, motion, 0/1, -1 // {"I":6107,"T":"A","D":"motion","R":["0/1","-1"],"L":1}, - updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_MOTION, - value == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_MOTION, OnOffType.from(value == 1)); break; case "3119": // Motion timestamp (timestamp os GMT, not adapted to the adapted timezone) // {"I":3119,"T":"S","D":"timestamp","U":"s","R":["U32","-1"],"L":1}, @@ -377,8 +375,7 @@ public class Shelly1CoIoTVersion2 extends Shelly1CoIoTProtocol implements Shelly updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_ALARM_STATE, getStringType(s.valueStr)); break; case "6110": // A, vibration, 0/1, -1=unknown - updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_VIBRATION, - s.value == 1 ? OnOffType.ON : OnOffType.OFF); + updateChannel(updates, CHANNEL_GROUP_SENSOR, CHANNEL_SENSOR_VIBRATION, OnOffType.from(s.value == 1)); if (s.value == 1) { // post event thingHandler.triggerChannel(CHANNEL_GROUP_DEV_STATUS, CHANNEL_DEVST_ALARM, EVENT_TYPE_VIBRATION); diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java index 0daed7b48a..018d3ad2a0 100755 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java @@ -920,7 +920,7 @@ public abstract class ShellyBaseHandler extends BaseThingHandler case SHELLY_EVENT_FLOOD_DETECTED: case SHELLY_EVENT_FLOOD_GONE: updateChannel(group, CHANNEL_SENSOR_FLOOD, - event.equalsIgnoreCase(SHELLY_EVENT_FLOOD_DETECTED) ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(event.equalsIgnoreCase(SHELLY_EVENT_FLOOD_DETECTED))); break; case SHELLY_EVENT_CLOSE: // DW 1.7 @@ -949,7 +949,7 @@ public abstract class ShellyBaseHandler extends BaseThingHandler } if (!onoff.isEmpty()) { - updateChannel(group, onoff, event.toLowerCase().contains("_on") ? OnOffType.ON : OnOffType.OFF); + updateChannel(group, onoff, OnOffType.from(event.toLowerCase().contains("_on"))); } if (!payload.isEmpty()) { // Pass event to trigger channel @@ -1211,7 +1211,7 @@ public abstract class ShellyBaseHandler extends BaseThingHandler if (status.input != null) { // RGBW2: a single int rather than an array return updateChannel(profile.getControlGroup(0), CHANNEL_INPUT, - getInteger(status.input) == 0 ? OnOffType.OFF : OnOffType.ON); + OnOffType.from(getInteger(status.input) != 0)); } } return updated; diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java index b9a901612b..c98575e516 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java @@ -172,8 +172,7 @@ public class ShellyLightHandler extends ShellyBaseHandler { logger.debug("{}: Changing brightness from {} to {}", thingName, oldCol.brightness, value); col.setBrightness(value); } - updateChannel(CHANNEL_GROUP_LIGHT_CONTROL, CHANNEL_LIGHT_POWER, - value > 0 ? OnOffType.ON : OnOffType.OFF); + updateChannel(CHANNEL_GROUP_LIGHT_CONTROL, CHANNEL_LIGHT_POWER, OnOffType.from(value > 0)); break; case CHANNEL_COLOR_TEMP: diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java index 6d51d4b296..1fdc36b6c3 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java @@ -246,7 +246,7 @@ public class ShellyUtils { } public static OnOffType getOnOff(@Nullable Boolean value) { - return (value != null && value ? OnOffType.ON : OnOffType.OFF); + return OnOffType.from(value != null && value); } public static OpenClosedType getOpenClosed(@Nullable Boolean value) { @@ -254,7 +254,7 @@ public class ShellyUtils { } public static OnOffType getOnOff(int value) { - return value == 0 ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(value != 0); } public static State toQuantityType(@Nullable Double value, int digits, Unit unit) { diff --git a/bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQDualBedHandler.java b/bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQDualBedHandler.java index b3e23e4230..54bdf97a8d 100644 --- a/bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQDualBedHandler.java +++ b/bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQDualBedHandler.java @@ -249,7 +249,7 @@ public class SleepIQDualBedHandler extends BaseThingHandler implements BedStatus BedStatus localPreviousStatus = previousStatus; BedSideStatus left = status.getLeftSide(); - updateState(CHANNEL_LEFT_IN_BED, left.isInBed() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_LEFT_IN_BED, OnOffType.from(left.isInBed())); updateState(CHANNEL_LEFT_SLEEP_NUMBER, new DecimalType(left.getSleepNumber())); updateState(CHANNEL_LEFT_PRESSURE, new DecimalType(left.getPressure())); updateState(CHANNEL_LEFT_LAST_LINK, new StringType(left.getLastLink().toString())); @@ -260,7 +260,7 @@ public class SleepIQDualBedHandler extends BaseThingHandler implements BedStatus } BedSideStatus right = status.getRightSide(); - updateState(CHANNEL_RIGHT_IN_BED, right.isInBed() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_RIGHT_IN_BED, OnOffType.from(right.isInBed())); updateState(CHANNEL_RIGHT_SLEEP_NUMBER, new DecimalType(right.getSleepNumber())); updateState(CHANNEL_RIGHT_PRESSURE, new DecimalType(right.getPressure())); updateState(CHANNEL_RIGHT_LAST_LINK, new StringType(right.getLastLink().toString())); diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/converter/SmartthingsConverter.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/converter/SmartthingsConverter.java index d6d363d018..9a4041e465 100644 --- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/converter/SmartthingsConverter.java +++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/converter/SmartthingsConverter.java @@ -183,7 +183,7 @@ public abstract class SmartthingsConverter { case "String": return new StringType((String) deviceValue); case "Switch": - return "on".equals(deviceValue) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from("on".equals(deviceValue)); // Vector3 can't be triggered now but keep it to handle acceleration device case "Vector3": diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaMyfoxCameraHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaMyfoxCameraHandler.java index faf7822965..040d9841b6 100644 --- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaMyfoxCameraHandler.java +++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaMyfoxCameraHandler.java @@ -46,7 +46,7 @@ public class SomfyTahomaMyfoxCameraHandler extends SomfyTahomaBaseThingHandler { if (ch != null) { // we need to covert opened/closed values to ON/OFF boolean open = "opened".equals(state.getValue()); - updateState(ch.getUID(), open ? OnOffType.ON : OnOffType.OFF); + updateState(ch.getUID(), OnOffType.from(open)); } } else if (CLOUD_DEVICE_STATUS_STATE.equals(state.getName())) { Channel ch = thing.getChannel(CLOUD_STATUS); diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java index be6a5ca099..dc77a0725a 100644 --- a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java +++ b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java @@ -281,7 +281,7 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve try { logger.debug("handlePowerCommand RefreshType {}", zone); Boolean result = powerCache[zone].getValue(); - updateState(channelUID, result ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(result)); } catch (CompletionException ex) { throw new IOException(ex.getCause()); } @@ -363,7 +363,7 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve logger.debug("handleMuteCommand RefreshType {}", zone); SonyAudioConnection.SonyAudioVolume result = volumeCache[zone].getValue(); if (result != null) { - updateState(channelUID, result.mute ? OnOffType.ON : OnOffType.OFF); + updateState(channelUID, OnOffType.from(result.mute)); } } catch (CompletionException ex) { throw new IOException(ex.getCause()); @@ -534,23 +534,23 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve switch (zone) { case 0: updateState(SonyAudioBindingConstants.CHANNEL_VOLUME, new PercentType(volume.volume)); - updateState(SonyAudioBindingConstants.CHANNEL_MUTE, volume.mute ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_MUTE, OnOffType.from(volume.mute)); break; case 1: updateState(SonyAudioBindingConstants.CHANNEL_ZONE1_VOLUME, new PercentType(volume.volume)); - updateState(SonyAudioBindingConstants.CHANNEL_ZONE1_MUTE, volume.mute ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE1_MUTE, OnOffType.from(volume.mute)); break; case 2: updateState(SonyAudioBindingConstants.CHANNEL_ZONE2_VOLUME, new PercentType(volume.volume)); - updateState(SonyAudioBindingConstants.CHANNEL_ZONE2_MUTE, volume.mute ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE2_MUTE, OnOffType.from(volume.mute)); break; case 3: updateState(SonyAudioBindingConstants.CHANNEL_ZONE3_VOLUME, new PercentType(volume.volume)); - updateState(SonyAudioBindingConstants.CHANNEL_ZONE3_MUTE, volume.mute ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE3_MUTE, OnOffType.from(volume.mute)); break; case 4: updateState(SonyAudioBindingConstants.CHANNEL_ZONE4_VOLUME, new PercentType(volume.volume)); - updateState(SonyAudioBindingConstants.CHANNEL_ZONE4_MUTE, volume.mute ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE4_MUTE, OnOffType.from(volume.mute)); break; } } @@ -560,20 +560,20 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve powerCache[zone].invalidateValue(); switch (zone) { case 0: - updateState(SonyAudioBindingConstants.CHANNEL_POWER, power ? OnOffType.ON : OnOffType.OFF); - updateState(SonyAudioBindingConstants.CHANNEL_MASTER_POWER, power ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_POWER, OnOffType.from(power)); + updateState(SonyAudioBindingConstants.CHANNEL_MASTER_POWER, OnOffType.from(power)); break; case 1: - updateState(SonyAudioBindingConstants.CHANNEL_ZONE1_POWER, power ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE1_POWER, OnOffType.from(power)); break; case 2: - updateState(SonyAudioBindingConstants.CHANNEL_ZONE2_POWER, power ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE2_POWER, OnOffType.from(power)); break; case 3: - updateState(SonyAudioBindingConstants.CHANNEL_ZONE3_POWER, power ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE3_POWER, OnOffType.from(power)); break; case 4: - updateState(SonyAudioBindingConstants.CHANNEL_ZONE4_POWER, power ? OnOffType.ON : OnOffType.OFF); + updateState(SonyAudioBindingConstants.CHANNEL_ZONE4_POWER, OnOffType.from(power)); break; } } diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java index 542164d150..db392ff909 100644 --- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java +++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java @@ -399,7 +399,7 @@ public abstract class SonyProjectorConnector { * @throws SonyProjectorException in case of any problem */ public OnOffType getPictureMuting() throws SonyProjectorException { - return Arrays.equals(getSetting(SonyProjectorItem.PICTURE_MUTING), PICTURE_ON) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(Arrays.equals(getSetting(SonyProjectorItem.PICTURE_MUTING), PICTURE_ON)); } /** @@ -462,7 +462,7 @@ public abstract class SonyProjectorConnector { throw new SonyProjectorException("Unavailable item " + SonyProjectorItem.OVERSCAN.getName() + " for projector model " + model.getName()); } - return Arrays.equals(getSetting(SonyProjectorItem.OVERSCAN), OVERSCAN_ON) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(Arrays.equals(getSetting(SonyProjectorItem.OVERSCAN), OVERSCAN_ON)); } /** @@ -853,7 +853,7 @@ public abstract class SonyProjectorConnector { throw new SonyProjectorException("Unavailable item " + SonyProjectorItem.XVCOLOR.getName() + " for projector model " + model.getName()); } - return Arrays.equals(getSetting(SonyProjectorItem.XVCOLOR), XVCOLOR_ON) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(Arrays.equals(getSetting(SonyProjectorItem.XVCOLOR), XVCOLOR_ON)); } /** diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java index bf3765f6e8..7f8f9cdb6d 100644 --- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java +++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java @@ -548,7 +548,7 @@ public class SonyProjectorHandler extends BaseThingHandler { } catch (SonyProjectorException e) { logger.debug("Get Status Power failed: {}", e.getMessage()); } - updateChannelStateAndCache(CHANNEL_POWER, on ? OnOffType.ON : OnOffType.OFF); + updateChannelStateAndCache(CHANNEL_POWER, OnOffType.from(on)); updateChannelStateAndCache(CHANNEL_POWERSTATE, state); return on; } @@ -627,7 +627,7 @@ public class SonyProjectorHandler extends BaseThingHandler { try { switch (channel) { case CHANNEL_POWER: - state = connector.getStatusPower().isOn() ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(connector.getStatusPower().isOn()); break; case CHANNEL_POWERSTATE: state = new StringType(connector.getStatusPower().name()); diff --git a/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/handler/SqueezeBoxPlayerHandler.java b/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/handler/SqueezeBoxPlayerHandler.java index 263dab869f..d9f64e40fd 100644 --- a/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/handler/SqueezeBoxPlayerHandler.java +++ b/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/handler/SqueezeBoxPlayerHandler.java @@ -346,7 +346,7 @@ public class SqueezeBoxPlayerHandler extends BaseThingHandler implements Squeeze @Override public void powerChangeEvent(String mac, boolean power) { - updateChannel(mac, CHANNEL_POWER, power ? OnOffType.ON : OnOffType.OFF); + updateChannel(mac, CHANNEL_POWER, OnOffType.from(power)); if (!power && isMe(mac)) { playing = false; } @@ -355,8 +355,8 @@ public class SqueezeBoxPlayerHandler extends BaseThingHandler implements Squeeze @Override public synchronized void modeChangeEvent(String mac, String mode) { updateChannel(mac, CHANNEL_CONTROL, "play".equals(mode) ? PlayPauseType.PLAY : PlayPauseType.PAUSE); - updateChannel(mac, CHANNEL_PLAY_PAUSE, "play".equals(mode) ? OnOffType.ON : OnOffType.OFF); - updateChannel(mac, CHANNEL_STOP, "stop".equals(mode) ? OnOffType.ON : OnOffType.OFF); + updateChannel(mac, CHANNEL_PLAY_PAUSE, OnOffType.from("play".equals(mode))); + updateChannel(mac, CHANNEL_STOP, OnOffType.from("stop".equals(mode))); if (isMe(mac)) { playing = "play".equalsIgnoreCase(mode); } @@ -389,7 +389,7 @@ public class SqueezeBoxPlayerHandler extends BaseThingHandler implements Squeeze @Override public void muteChangeEvent(String mac, boolean mute) { - updateChannel(mac, CHANNEL_MUTE, mute ? OnOffType.ON : OnOffType.OFF); + updateChannel(mac, CHANNEL_MUTE, OnOffType.from(mute)); } @Override diff --git a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiHandler.java b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiHandler.java index 891d18a705..0128c90b52 100644 --- a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiHandler.java +++ b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiHandler.java @@ -258,7 +258,7 @@ public class TACmiHandler extends BaseThingHandler { updateState(channel.getUID(), new DecimalType(value.value)); } else { final boolean state = ((DigitalMessage) message).getPortState(channelConfig.output); - updateState(channel.getUID(), state ? OnOffType.ON : OnOffType.OFF); + updateState(channel.getUID(), OnOffType.from(state)); } return; } @@ -380,7 +380,7 @@ public class TACmiHandler extends BaseThingHandler { updateState(channel.getUID(), newState); } else { final boolean state = ((DigitalMessage) message).getPortState(output); - updateState(channel.getUID(), state ? OnOffType.ON : OnOffType.OFF); + updateState(channel.getUID(), OnOffType.from(state)); } } } diff --git a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/ApiPageParser.java b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/ApiPageParser.java index 6d13c9f75f..d6f8567c02 100644 --- a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/ApiPageParser.java +++ b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/ApiPageParser.java @@ -323,7 +323,7 @@ public class ApiPageParser extends AbstractSimpleMarkupHandler { switch (this.fieldType) { case BUTTON: type = Type.SWITCH_BUTTON; - state = this.buttonValue == ButtonValue.ON ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(this.buttonValue == ButtonValue.ON); ctuid = TACmiBindingConstants.CHANNEL_TYPE_SCHEME_SWITCH_RW_UID; channelType = "Switch"; break; @@ -333,7 +333,7 @@ public class ApiPageParser extends AbstractSimpleMarkupHandler { boolean isOn = "ON".equals(vs) || "EIN".equals(vs); // C.M.I. mixes up languages... if (isOn || "OFF".equals(vs) || "AUS".equals(vs)) { channelType = "Switch"; - state = isOn ? OnOffType.ON : OnOffType.OFF; + state = OnOffType.from(isOn); if (this.fieldType == FieldType.READ_ONLY || this.address == null) { ctuid = TACmiBindingConstants.CHANNEL_TYPE_SCHEME_SWITCH_RO_UID; type = Type.READ_ONLY_SWITCH; diff --git a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoHomeHandler.java b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoHomeHandler.java index faa86f2f7d..76d07e19cc 100644 --- a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoHomeHandler.java +++ b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoHomeHandler.java @@ -161,7 +161,7 @@ public class TadoHomeHandler extends BaseBridgeHandler { public void updateHomeState() { try { updateState(TadoBindingConstants.CHANNEL_HOME_PRESENCE_MODE, - getHomeState().getPresence() == PresenceState.HOME ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(getHomeState().getPresence() == PresenceState.HOME)); } catch (IOException | ApiException e) { logger.debug("Error accessing tado server: {}", e.getMessage(), e); } diff --git a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoMobileDeviceHandler.java b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoMobileDeviceHandler.java index 6a73b1ad94..ddf1adf93d 100644 --- a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoMobileDeviceHandler.java +++ b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoMobileDeviceHandler.java @@ -108,7 +108,7 @@ public class TadoMobileDeviceHandler extends BaseHomeThingHandler { try { MobileDevice device = getMobileDevice(); updateState(TadoBindingConstants.CHANNEL_MOBILE_DEVICE_AT_HOME, - device.getLocation().isAtHome() ? OnOffType.ON : OnOffType.OFF); + OnOffType.from(device.getLocation().isAtHome())); } catch (IOException | ApiException e) { logger.debug("Status update of mobile device with id {} failed: {}", configuration.id, e.getMessage()); } diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/TapoUtils.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/TapoUtils.java index c87d2e30c4..f4a3276439 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/TapoUtils.java +++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/TapoUtils.java @@ -263,7 +263,7 @@ public class TapoUtils { * @param boolVal */ public static OnOffType getOnOffType(@Nullable Boolean boolVal) { - return (boolVal != null ? boolVal ? OnOffType.ON : OnOffType.OFF : OnOffType.OFF); + return boolVal != null ? OnOffType.from(boolVal) : OnOffType.OFF; } /** @@ -272,7 +272,7 @@ public class TapoUtils { * @param intVal */ public static OnOffType getOnOffType(Integer intVal) { - return intVal == 0 ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(intVal != 0); } /** diff --git a/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java b/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java index 36a242078a..3ec8769493 100644 --- a/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java +++ b/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java @@ -333,7 +333,7 @@ public class TiVoHandler extends BaseThingHandler { newStatusData.getChannelNum() + "." + newStatusData.getSubChannelNum())); } } - updateState(CHANNEL_TIVO_IS_RECORDING, newStatusData.isRecording() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_TIVO_IS_RECORDING, OnOffType.from(newStatusData.isRecording())); } // Now set the pubToUI flag to false, as we have already published this status diff --git a/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/LightState.java b/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/LightState.java index 2802e42f43..953e54eb0d 100644 --- a/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/LightState.java +++ b/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/LightState.java @@ -53,7 +53,7 @@ public class LightState extends ErrorResponse { } public OnOffType getOnOff() { - return onOff == 1 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(onOff == 1); } public PercentType getSaturation() { diff --git a/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/Sysinfo.java b/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/Sysinfo.java index 523e475ec7..d7691b5033 100644 --- a/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/Sysinfo.java +++ b/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/Sysinfo.java @@ -79,7 +79,7 @@ public class Sysinfo extends ErrorResponse { } public OnOffType getRelayStatus() { - return "ON".equals(relayStatus) ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from("ON".equals(relayStatus)); } } @@ -105,7 +105,7 @@ public class Sysinfo extends ErrorResponse { } public OnOffType getState() { - return state == 1 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(state == 1); } } @@ -220,7 +220,7 @@ public class Sysinfo extends ErrorResponse { } public OnOffType getRelayState() { - return relayState == 1 ? OnOffType.ON : OnOffType.OFF; + return OnOffType.from(relayState == 1); } public int getBrightness() { @@ -245,7 +245,7 @@ public class Sysinfo extends ErrorResponse { } public OnOffType getLedOff() { - return ledOff == 1 ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(ledOff != 1); } public double getLatitude() { @@ -277,7 +277,7 @@ public class Sysinfo extends ErrorResponse { } public OnOffType getLedStatus() { - return "ON".equals(ledStatus) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!"ON".equals(ledStatus)); } public Plug getPlug() { diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java index 48b36bb78d..a95b5a9d9e 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java @@ -138,7 +138,7 @@ public class SOAPValueConverter { // map rawValue to State switch (dataType) { case "boolean" -> { - return "0".equals(rawValue) ? OnOffType.OFF : OnOffType.ON; + return OnOffType.from(!"0".equals(rawValue)); } case "string" -> { return new StringType(rawValue); diff --git a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/handler/TradfriPlugHandler.java b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/handler/TradfriPlugHandler.java index 5cf4ec779f..134082c1a4 100644 --- a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/handler/TradfriPlugHandler.java +++ b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/handler/TradfriPlugHandler.java @@ -48,7 +48,7 @@ public class TradfriPlugHandler extends TradfriThingHandler { TradfriPlugData state = new TradfriPlugData(data); updateStatus(state.getReachabilityStatus() ? ThingStatus.ONLINE : ThingStatus.OFFLINE); - updateState(CHANNEL_POWER, state.getOnOffState() ? OnOffType.ON : OnOffType.OFF); + updateState(CHANNEL_POWER, OnOffType.from(state.getOnOffState())); updateDeviceProperties(state); } } diff --git a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java index d5d83d2cc3..826a9e2587 100644 --- a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java +++ b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java @@ -167,7 +167,7 @@ public class TradfriAirPurifierData extends TradfriDeviceData { QuantityType