]> git.basschouten.com Git - openhab-addons.git/commitdiff
Use `OnOffType.from` to reduce code (#16101)
authorWouter Born <github@maindrain.net>
Sat, 23 Dec 2023 18:06:21 +0000 (19:06 +0100)
committerGitHub <noreply@github.com>
Sat, 23 Dec 2023 18:06:21 +0000 (19:06 +0100)
You can create an `OnOffType` using a boolean nowadays which reduces the amount of code.

Signed-off-by: Wouter Born <github@maindrain.net>
239 files changed:
bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/handler/RFZoneHandler.java
bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/handler/AllPlayHandler.java
bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java
bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiGroupHandler.java
bundles/org.openhab.binding.amplipi/src/main/java/org/openhab/binding/amplipi/internal/AmpliPiZoneHandler.java
bundles/org.openhab.binding.anthem/src/main/java/org/openhab/binding/anthem/internal/handler/AnthemCommandParser.java
bundles/org.openhab.binding.asuswrt/src/main/java/org/openhab/binding/asuswrt/internal/helpers/AsuswrtUtils.java
bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java
bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/Powerline546EHandler.java
bundles/org.openhab.binding.benqprojector/src/main/java/org/openhab/binding/benqprojector/internal/handler/BenqProjectorHandler.java
bundles/org.openhab.binding.bigassfan/src/main/java/org/openhab/binding/bigassfan/internal/handler/BigAssFanHandler.java
bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DaikinMadokaHandler.java
bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java
bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/cameranotification/CameraNotificationState.java
bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/privacymode/PrivacyModeState.java
bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/silentmode/dto/SilentModeServiceState.java
bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
bundles/org.openhab.binding.bsblan/src/main/java/org/openhab/binding/bsblan/internal/helper/BsbLanParameterConverter.java
bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/handler/SmartherModuleHandler.java
bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java
bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPartition.java
bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerZone.java
bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/handler/CBusLightHandler.java
bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/ChromecastStatusUpdater.java
bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java
bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnit.java
bundles/org.openhab.binding.denonmarantz/src/main/java/org/openhab/binding/denonmarantz/internal/DenonMarantzState.java
bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/DmxChannel.java
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/SmartPlugHandler.java
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseBridgeHandler.java
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PartitionThingHandler.java
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/ZoneThingHandler.java
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsData.java
bundles/org.openhab.binding.echonetlite/src/main/java/org/openhab/binding/echonetlite/internal/StateCodec.java
bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeUtils.java
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java
bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceCxsmAlarm.java
bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceEntrySensor.java
bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceGenericAlarm.java
bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceMotionSensor.java
bundles/org.openhab.binding.elroconnects/src/main/java/org/openhab/binding/elroconnects/internal/devices/ElroConnectsDeviceTemperatureSensor.java
bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_01.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_02.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_08/A5_08.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_10/A5_10.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_11/A5_11_04.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_13/A5_13_01.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_14/A5_14_0A.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/Base/PTM200Message.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_01/D2_01.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_14/D2_14_30.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/profiles/RockerSwitchActionToggleSwitchProfile.java
bundles/org.openhab.binding.epsonprojector/src/main/java/org/openhab/binding/epsonprojector/internal/handler/EpsonProjectorHandler.java
bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/handler/FeicanHandler.java
bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java
bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetSensorHandler.java
bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/FoldingClientHandler.java
bundles/org.openhab.binding.folding/src/main/java/org/openhab/binding/folding/internal/handler/SlotHandler.java
bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxHandler.java
bundles/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/handler/FreeboxThingHandler.java
bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/handler/FSInternetRadioHandler.java
bundles/org.openhab.binding.gce/src/main/java/org/openhab/binding/gce/internal/handler/Ipx800v3Handler.java
bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandGetstate.java
bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/command/CommandSetstate.java
bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerHandler.java
bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerV2Handler.java
bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerTriggerSwitchProfile.java
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java
bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/HaywardThingHandler.java
bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java
bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java
bundles/org.openhab.binding.herzborg/src/main/java/org/openhab/binding/herzborg/internal/CurtainHandler.java
bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/OnOffTypeConverter.java
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java
bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseLocalHandler.java
bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/handler/HyperionNgHandler.java
bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/OnOffTypeWSBooleanValueConverter.java
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/OnOffTypeWSIntegerValueConverter.java
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/profiles/PushButtonToCommandProfile.java
bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java
bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisHomeHandler.java
bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java
bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java
bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronOasisHandler.java
bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java
bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java
bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java
bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java
bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java
bundles/org.openhab.binding.konnected/src/main/java/org/openhab/binding/konnected/internal/handler/KonnectedHandler.java
bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/converter/InversionConverter.java
bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleKeyLockTableSubHandler.java
bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRelaySubHandler.java
bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionColorProfile.java
bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionDimmerProfile.java
bundles/org.openhab.binding.leapmotion/src/main/java/org/openhab/binding/leapmotion/internal/LeapMotionSwitchProfile.java
bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/responses/OnOffResponse.java
bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/PowerControlPower.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/PowerState.java
bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlJalousie.java
bundles/org.openhab.binding.loxone/src/test/java/org/openhab/binding/loxone/internal/controls/LxControlJalousieTest.java
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgProtocolHandler.java
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/CcoHandler.java
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/SwitchHandler.java
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/handler/PhantomButtonHandler.java
bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java
bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/device/Device.java
bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java
bundles/org.openhab.binding.melcloud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudHeatpumpDeviceHandler.java
bundles/org.openhab.binding.meteostick/src/main/java/org/openhab/binding/meteostick/internal/handler/MeteostickSensorHandler.java
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeHandler.java
bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiActorPlugHandler.java
bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch1Handler.java
bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/handler/XiaomiAqaraActorSwitch2Handler.java
bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
bundles/org.openhab.binding.mikrotik/src/main/java/org/openhab/binding/mikrotik/internal/util/StateUtil.java
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatHeaterHandler.java
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatRoomHandler.java
bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftPlayerHandler.java
bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftServerHandler.java
bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftSignHandler.java
bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromBulbHandler.java
bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromPlugHandler.java
bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/model/State.java
bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/handler/NeatoHandler.java
bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/NeeoRoomProtocol.java
bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java
bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SirenChannelHelper.java
bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java
bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java
bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusSwitchModuleHandler.java
bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/handler/NikoHomeControlActionHandler.java
bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/DigitalIoConfig.java
bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java
bundles/org.openhab.binding.opengarage/src/main/java/org/openhab/binding/opengarage/internal/OpenGarageHandler.java
bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java
bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPartitionHandler.java
bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxZoneHandler.java
bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairEasyTouchHandler.java
bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairIntelliFloHandler.java
bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/handler/AbstractAvrHandler.java
bundles/org.openhab.binding.pjlinkdevice/src/main/java/org/openhab/binding/pjlinkdevice/internal/PJLinkDeviceHandler.java
bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDigitalHandler.java
bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCMemoryHandler.java
bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCPulseHandler.java
bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/AbstractSleepingEndDeviceHandler.java
bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseRelayDeviceHandler.java
bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseSwitchHandler.java
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/handler/PowermaxThingHandler.java
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/state/PowermaxState.java
bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/handler/QbusBistabielHandler.java
bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComHomeConfortMessage.java
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting4Message.java
bundles/org.openhab.binding.robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java
bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/system/RioSystemProtocol.java
bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/zone/RioZoneProtocol.java
bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java
bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MediaRendererService.java
bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/RemoteControllerService.java
bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelThingHandler.java
bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTProtocol.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion1.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoIoTVersion2.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java
bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQDualBedHandler.java
bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/converter/SmartthingsConverter.java
bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaMyfoxCameraHandler.java
bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java
bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java
bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java
bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/handler/SqueezeBoxPlayerHandler.java
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiHandler.java
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/ApiPageParser.java
bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoHomeHandler.java
bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoMobileDeviceHandler.java
bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/TapoUtils.java
bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java
bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/LightState.java
bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/model/Sysinfo.java
bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/handler/TradfriPlugHandler.java
bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java
bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriWirelessDeviceData.java
bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java
bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusRelayHandler.java
bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusSensorWithAlarmClockHandler.java
bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusVMBGPOHandler.java
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/bridge/VeluxBridgeLANConfig.java
bundles/org.openhab.binding.ventaair/src/main/java/org/openhab/binding/ventaair/internal/VentaThingHandler.java
bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/VolvoOnCallHandlerFactory.java
bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/handler/VehicleHandler.java
bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/wrapper/VehiclePositionWrapper.java
bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/link/TypeConverters.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/InsightParser.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoCoffeeHandler.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoDimmerHandler.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoLightHandler.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoMakerHandler.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoMotionHandler.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoSwitchHandler.java
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/LEDStateDTO.java
bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUtils.java
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaBridgeHandler.java
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaZoneThingHandler.java
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightCeilingWithAmbientHandler.java
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightCeilingWithNightHandler.java
bundles/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmMonitorHandler.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/AbstractHomekitAccessoryImpl.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/BooleanItemReader.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitIrrigationSystemImpl.java
bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/dto/HueStatePlug.java
bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java

index f224a0e711eba0219d204aa9dffde01824f42142..1d1defb978f9ac1a9f022c25a3dfa958c1968323 100644 (file)
@@ -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);
index 49c2d6a7035bf048cbe33dd16739f259d6efcd86..ea93b1c04b4dfb9770b8783329ed93fed98198b5 100644 (file)
@@ -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
index e39879903942eaa711e6d346806600aa44f2c9fc..2ec69eb17d8207b4032ec669d8227eaaf86597b6 100644 (file)
@@ -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) {
index 6c5f863a365cab2dfaa1d61716f601ecfab12a86..963f27d13ffdf7d4f97c75f41d143a4aca11d1b4 100644 (file)
@@ -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));
     }
index 1cba6138edf4b607cb9c2f54e05fb2699b974dbf..1ceab0a0d20c6e0cc20878e386b1a7a5fe5729c5 100644 (file)
@@ -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));
     }
index c40e56313c16785f50beb42256603aabee572d59..164ddfecd74b65e0bb23602dc3133e8375d8ecf1 100644 (file)
@@ -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);
             }
index 613797fac7897d348a309c0141b79655cfb0aa22..47f64ac7e3dd676e9af6bc277151ad2f876a7bbd 100644 (file)
@@ -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);
     }
 
     /**
index dda1a52b8a7bac03c7aa9c55d63e9e1876a5e7fc..7d667a6c4b333c6d48d378ba18a66fe9b776be68 100644 (file)
@@ -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)));
     }
 
     /**
index f2ededc240a2aff22f9fcde65f8dcbf8cc3bf73c..6fdf0098a756d610d690a6f7d6d0e4ddc2b9a587 100644 (file)
@@ -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);
         }
index 1b2d5f6f31e7256c39193a248e5a958a075e323f..f70439d083da11aec1d68ca7320d7bbdec0f7d8f 100644 (file)
@@ -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)));
         }
     }
 
index 01106f3c53608b6771f8611e6482960c05b0201c..440bc30e949810d16feba2acbcfd6d494a0ffc94 100644 (file)
@@ -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)));
             }
         }
     }
index aefbdb995968a7f38e95ac8fb7826a93bd898832..607a2e2abfc0cb38da82de83567e4227b1917e58 100644 (file)
@@ -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:
index 3b6dc9e1974b11bef12c3fb8f389f50aacc278a6..a5fa0b388a67bcff9c3c3c7a299319efd8191e39 100644 (file)
@@ -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);
         }
index 6787f83704924592d9b10dba5787b9e0d1eb9286..e8f8a91249dba5f92ad081e56f71e56fd91723bc 100644 (file)
@@ -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);
 
index d0846decbfb6f638ad28b61e7f00e9384e659e06..b3a54ac414990c29efa222077955445fc1a230aa 100644 (file)
@@ -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));
 
index a8191319fbaac64f909219dcc7ff6c5a36a565b7..dd30908dd803d30e1a00a8046645356cfee8e2aa 100644 (file)
@@ -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);
     }
 }
index 29a145a26fa1d9ceefa332cc5f26cd2b3f3b0c1c..0db6d1dfb98f5b36b4e722c421841cb6102836a0 100644 (file)
@@ -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);
     }
 }
index fc50d008bcc9bb1333e459e5a7c0fa8ec8954027..82ae302bcfb2f61d4f90439e843ef935d36cc485 100644 (file)
@@ -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);
     }
 }
index ffdee6b057381099a314b6b893ae17ee4b61855e..4af1986d6de28dc42a1fe8e426ecb272cb8aa8b4 100644 (file)
@@ -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;
index 711735fa0c301e5e1f0ba32e368c37593ab44f34..91f3fe5d84528cf094cd0747f84b4d6600bb1934 100644 (file)
@@ -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));
     }
 
     /**
index 921d69452c633fe7287f3e4ccbd3f3ea66c04f3c..98ab8b6c10b3b69c28c069f6af3b9d305e6e7958 100644 (file)
@@ -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,
index d6165848b7f9b663eceafa1df955ca9c36d9fa31..15e0625adbad2aac3b9308ff256810f8872cd5fc 100644 (file)
@@ -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);
         }
     }
index ea041e09753aa0fcb0825c42bf07f97591d0c295..d9edcc7416d7061321f6d23c59152101fb069ced 100644 (file)
@@ -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);
         }
     }
index 079ec8145d87cc5a3574057f66ccaaec92290e50..43726aef6540fa0d8b538b1c756b3129706d9fc3 100644 (file)
@@ -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);
index 745812169072153ba808d8e5afb7606129f9580f..6431e1528c1d398db341de70953cc1604d1b7c19 100644 (file)
@@ -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,
index e03bd86c3474d12aed94edb13b2f70dc53dd214d..007f566c9f61b0ce0e173608ac8a263bd66e56dd 100644 (file)
@@ -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) {
index 9b52212acda1135b5d1d20d574c9ec49677b35aa..c256eef46def1b67ad3001908ba0d080ba6305ae 100644 (file)
@@ -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
index 91d5a97b2fe5e63735afb2708f73b712280fc303..058ff1517ceaf7e6917f312cf4a69667c6e2958c 100644 (file)
@@ -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<Dimensionless> 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 {
index 40d2d90d440071ad4c8751e186be880cecb95f6b..95f2a229c49fc2db64573b581486b66b979bcf89 100644 (file)
@@ -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);
index b24d598c54be17846b22a76ddc5972247559c68b..f9552bbfbac39ce4df0480a88a5feb80248c8f1c 100644 (file)
@@ -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<ChannelUID, DmxThingHandler> listener : onOffListeners.entrySet()) {
                     (listener.getValue()).updateSwitchState(listener.getKey(), state);
                     logger.trace("sending ONOFF={} (raw={}), status update to listener {}", state, value,
index a4d3d229cb786071530c62bae5967ce49e16a69c..780fc858604481700eaef33d99e32e76896e48cd 100644 (file)
@@ -114,7 +114,7 @@ public class SmartPlugHandler extends DraytonWiserThingHandler<SmartPlugData> {
     }
 
     private State getZigbeeConnected() {
-        return getData().device.getLqi() == null ? OnOffType.OFF : OnOffType.ON;
+        return OnOffType.from(getData().device.getLqi() != null);
     }
 
     private State getDeviceLocked() {
index db93d232d3ff2ac9ce0dd9dc683ced440493107f..026163aead21ad699d8c4abb53a786f1894bb320 100644 (file)
@@ -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));
     }
 
     /**
index b677d2bb684c82c6c5fd3a602ddfe0cba4871372..ca19dc47648ad4fa9aa011e1e6002a589dadcdb0 100644 (file)
@@ -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:
index a749146ab2e15dd2be5fe1fa7336518cb8c3eb5c..e467b289aa938c1624def295d7953586d9104a86 100644 (file)
@@ -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:
index d2dd43a682b23b0caf654b776f437de8e7d16cd4..2c3a3d5018c8ae26a5446ac30a21a84cf2333aae 100644 (file)
@@ -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:
index 750102cb9be23cc396a72d4d7b2dadaf9139f1ae..de4e7be27ff3b060b9ce04aea2144be9f7589401 100644 (file)
@@ -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) {
index 44f857d13a9aa3224fb6fdd054be3d51c2149712..56823f92a6f76a4ddf29c90c196401db10497ff8 100644 (file)
@@ -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
index 54603c7c056981abfa3eab63cae4a492b2788c87..5f39abf28242c11433c4b121b82cefa139c910b0 100644 (file)
@@ -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) {
index 128afa340900ed500c3758251bbd6165463e1292..6aaaacbdd8171081ae8a3e51ad8e8cc8b523b798 100644 (file)
@@ -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<CleanLogRecord> 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());
index e13b5ee70231e24a2855ab4f4dd22b051f24ebbd..4b3ead3f644c833f79d3523eb26c5ceabccab633 100644 (file)
@@ -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);
         }
     }
index 37da7dd3cc2e0a0d9a0c34d00f1b0bb2ca4096ea..7354d1c3291a213a1cde91598467a84e9fd39692 100644 (file)
@@ -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);
         }
     }
index 12830098d75b2069675d8620e927a701289fc9f3..3ef12990f0040db3b0a248352ae42c85fe40e808 100644 (file)
@@ -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);
         }
     }
index d7f005e5d0bb9acc94fae571e1116ca74d220cfe..a8a5330d0303a2c8ab77be8bed457a3524489034 100644 (file)
@@ -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);
         }
     }
index fec1afe3dc98e7f2ee8d1f7d459a4204bfa7175c..5e9524967f350712580fc532e67d63b7f42c9c85 100644 (file)
@@ -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);
index d5735fb0544373376188e7e70d5464a6be61ff0f..6ea1d7325299b6e1cf6f300139ccbd57f07af138 100644 (file)
@@ -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) {
index 3555d6438e895738ad16d72e7ebe78a593f85601..bb3ac148824e0b5fbbab3000bcb99a6133ae09c9 100644 (file)
@@ -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
index 98b0723574bcdc5a08e96c4f5539b78c45da33a5..028fc4b5ccc0537fdd4547ad77de69a0704b683d 100644 (file)
@@ -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
index 13630dc2f353993ef27976c5413284e6d816c643..86d2a349ad0e8a1d965871f32eb3972574750b52 100644 (file)
@@ -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;
index d60f7e84729994632411fb1f34d8c09649fba56a..8fb3dc61ee0b2399437ac5ee6f5ec8afc4dd0d95 100644 (file)
@@ -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);
index 05b5297180ebb55bbc622bbf71b56f0b1f8c842f..0458c89fa8f6b0f01e0fe9e439a8e0f672632131 100644 (file)
@@ -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() {
index d86109c62a348a4dd366c9ec2431377b950b1a0c..be14ca9d3b9f8751d80fbc54c576e5c1320ccb12 100644 (file)
@@ -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
index c52e3d5efa88289d9fd3639315c0479a3ad149b7..21b1c9850e4bdf8fdc64b664ed62060bccecd72d 100644 (file)
@@ -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
index 9aa7bf154c2aff4418fa2bee81ac01506f99fc21..78704471728a2400c9f6cb63599d7b7038bf3311 100644 (file)
@@ -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() {
index 40a850a623f041ebc7c5fdfea8b1f074a224708d..78b220529b308896d0458ab9d508f1df5844ecd4 100644 (file)
@@ -60,7 +60,7 @@ public class PTM200Message extends _RPSMessage {
             Function<String, @Nullable State> 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:
index 3775eff16d60ed6cd00f7f905e36c9029517b121..6ca827b6f52c027308e9e9a2903a7b4aa6264958 100644 (file)
@@ -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;
index d8a58c7c29dbf84cfdca7e3982a37c27bc08aa5b..a90b89a0a9d83054c4411c94ef93571213abf018 100644 (file)
@@ -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));
             }
         }
 
index 2674a27a3727e150e352403ffd4346b6240c4ad2..63190f82e5e09ead2de3079d906e16626e4ca4e7 100644 (file)
@@ -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:
index b8feccd0a3f81232400b900c706ae45802ab89d4..e84a7387c8a387c082ee9072d08845b266c31c02 100644 (file)
@@ -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) {
index 124255021577c71aa3f4520dc144a7533761f1b4..c05fa9df3efd5a1ddce62010b69a654becf84492 100644 (file)
@@ -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;
         }
index 9f77f353859ca38442a9448ac5c5adefe8db1bca..f088739021bdb16ba8956c20ad9fb9b8dea45389 100644 (file)
@@ -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;
index 66a64a839299bd15bf0c4c8b5ecd8e98dd226bd9..d447cdb2608a3b55d7dd9714cde8e65bc2abea98 100644 (file)
@@ -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)));
     }
 
     /**
index 68c43b97721642f0f7db52ca6b9dbc003e6c0812..56f6586b49eeedf3dace07bbb9e4cb2d6b9644d5 100644 (file)
@@ -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]);
index ce63a97c261cbcd6737d66f9a9e9032eca363df9..7d480d6eb96b30ab56829a4880e2e26deb54bb3f 100644 (file)
@@ -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,
index 8641ba9f189d05152f0e9d64db3102137d2ff74e..f47f199264c2110a592037e71015b6a4a3a78434 100644 (file)
@@ -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() {
index dc87c23ea49e6e4fc5a2d0ad3ac24303c564f2bd..54a080b1606573ad983bf1d93c01af7c62eb1e85 100644 (file)
@@ -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));
     }
 }
index db210bfd20610baa218273b8a8d65a9d22363c6f..bd769221d9f6216967816fe567fe16c819b10e03 100644 (file)
@@ -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) {
index 532d1486ad4231ca4adaac3829e2d6bfea94d6b7..6489ac4f7830ac84aafb9a6ef15413097e4ee12d 100644 (file)
@@ -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) {
index ae0c0d715683e1be7f24c44c76e8811b6a5828dd..ecedab33e524cc1232401a544b030c4189f4f703 100644 (file)
@@ -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
index 79a0217fef23648a2e2a574e1e678a5b527efe9a..c2e5e98ae5f6905cefe43afde2fc845142f06fcc 100644 (file)
@@ -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);
index 2f92c20c990a518bf074463db7baa688c5cbb973..8ad9273cafebb9bd38d87295adf32290770dcc6c 100644 (file)
@@ -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) {
index 07fc4045bfc1140de7c3e6cfe971c799beb49ca5..c39442998804288574300c85414006d8182754fc 100644 (file)
@@ -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;
             }
         }
index 6d2bdb26972857a5d0e255edff12320c0cfb07dc..346f96c11a6d37e47be89ec462a3ccd8dc808c4a 100644 (file)
@@ -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;
index b48a93fbf13e95c7519ca39dc70bc3d727a5b954..7b71bd2a40314bd286d8e0ed28b9571c09b43cb6 100644 (file)
@@ -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
index 67b4485401d3c8dc05e9cd8f8345752a1dfb02c7..8ffe43b1a33c856427a862d7b18614ed679da926 100644 (file)
@@ -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);
         }
index 6e809b4efd11c742d314e329fec05c30eac99fed..b9eeb1fa36527391d3a18fb7e32f353ffce9307a 100644 (file)
@@ -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;
     }
index 69587785f301fc38c03b4e85d9cc89d954b5d11a..47d1a8bb558958a3a968cdd3e380e935a023399a 100644 (file)
@@ -159,7 +159,7 @@ public class GroheOndusSenseGuardHandler<T, M> extends GroheOndusBaseHandler<App
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "@text/error.notsenseguard");
             return null;
         }
-        return ((ApplianceCommand) commandOptional.get()).getCommand().getValveOpen() ? OnOffType.ON : OnOffType.OFF;
+        return OnOffType.from(((ApplianceCommand) commandOptional.get()).getCommand().getValveOpen());
     }
 
     @Override
index fab42aa6c89b5b1d18bd7a1b7cde96440ac0a126..ddb9bad19b8b74394d534a3f42093a3bf3a1f469 100644 (file)
@@ -67,7 +67,7 @@ public abstract class HaywardThingHandler extends BaseThingHandler {
             case "Number":
                 return new DecimalType(value);
             case "Switch":
-                return Integer.parseInt(value) > 0 ? OnOffType.ON : OnOffType.OFF;
+                return OnOffType.from(Integer.parseInt(value) > 0);
             case "Number:Dimensionless":
                 switch (channelID) {
                     case HaywardBindingConstants.CHANNEL_CHLORINATOR_AVGSALTLEVEL:
index f688e371d9d65cec1e0c85011aa2b98e04a22e86..19478d033e9ce7afdda9ddabc1008893e853b504 100644 (file)
@@ -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));
         }
     }
 
index 5da73ab1e79f5e9e804c78dcaeec2c6f09fa88da..787d98c8e9ca60ab2884a473557dac4383f8ea2e 100644 (file)
@@ -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));
     }
 
index fc706c934ccc044f50fcc11619df040a3b275380..bca0b9cf6c13ce1e915380dbc2826901d7602108 100644 (file)
@@ -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)));
         }
 
index 514dccf03099a55305fdc38ab65b3f18098c7830..f065ce8e6d775004fd4a47db8d25007b68bee8cb 100644 (file)
@@ -42,7 +42,7 @@ public class OnOffTypeConverter extends AbstractTypeConverter<OnOffType> {
 
     @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));
     }
 
     /**
index 9f274be669d01e52602073dbcada5736f1590ad4..846643bf22cfb5fe70af090484707e72d9126644 100644 (file)
@@ -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) {
index 5ac1407f75ef96affae586354e3ba06a81eefd2c..c55f09fd9ddc51d8d6cb0a42b9aeb7471db50a04 100644 (file)
@@ -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));
         }
     }
 }
index b6c0156f5d15bdf70ad87bbaed995b797cb68f97..57ac315b45bfbde6a3bf7e896b63bfa822789ae3 100644 (file)
@@ -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)) {
index 39caa20297866acf568892439346087896f7544e..f61a0f06e575629f5d20966c8cafc036e4c58a48 100644 (file)
@@ -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)) {
index 2653fee464d0ce2a9d2d43c79abc5bae2da9bd92..bfe14b1dcb27f75070becb2dd112ee138e99ee73 100644 (file)
@@ -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,
index 7fb078bf638e18b954347588d78faf1632562d1d..54f5b2424279bed87dfed4245acac2ac256486b3 100644 (file)
@@ -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()));
         });
     }
 
index 9fc4942309355c6efbca2889aed76833a455b3a3..7610ad25d377660711a29b2502297e7e2db03303 100644 (file)
@@ -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);
index 3c854a353a326cd04e02fb4a245c33a79805a918..ae7cc2622abb3d8637be7ec389e09822232860d7 100644 (file)
@@ -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);
             }
index 7ce10106d5e4de6a3276837f8f8a2041a393a601..033c521c7194a4452cfc5dd54c29349d2e7c7ca5 100644 (file)
@@ -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) {
index 8a09be0a790d1db88e2781afc7886544643017f9..905538b7cf9fd190783fdf765e46fe8f8f477c6b 100644 (file)
@@ -27,7 +27,7 @@ public class OnOffTypeWSBooleanValueConverter implements Converter<WSBooleanValu
     @Override
     public OnOffType convertFromResourceValue(@NonNull WSBooleanValue from,
             @NonNull ConverterAdditionalInfo convertData) throws ConversionException {
-        return from.value ^ convertData.getInverted() ? OnOffType.ON : OnOffType.OFF;
+        return OnOffType.from(from.value ^ convertData.getInverted());
     }
 
     @Override
index 02258531dcbe80f96cb8907ac4ac1c56f13f1881..3082a0f223c3c7339b3b000ac3422af9b7eb90cc 100644 (file)
@@ -28,7 +28,7 @@ public class OnOffTypeWSIntegerValueConverter implements Converter<WSIntegerValu
     @Override
     public OnOffType convertFromResourceValue(@NonNull WSIntegerValue from,
             @NonNull ConverterAdditionalInfo convertData) throws ConversionException {
-        return from.value > 0 ^ convertData.getInverted() ? OnOffType.ON : OnOffType.OFF;
+        return OnOffType.from(from.value > 0 ^ convertData.getInverted());
     }
 
     @Override
index a312479bd6eaf51fcd71bfacb9e9354f27d72a32..e8a6914ce3ab5d949806ae4aea37355655fee240 100644 (file)
@@ -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())
index 8a34a975d5ee544be14233261e41a892dffc357c..530b5b69efda247bebfe64be5bd98da98af9f40d 100644 (file)
@@ -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;
     }
index 829de516730955a4f988d8ee4676c62c2d2d4931..3a04cb9867c2a392a4e49ce6722f6ff7410bf40e 100644 (file)
@@ -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);
index 7599997f7b7cc458fcda08cbb0be031f63b9a573..2b9d1e0a4cb1ce3f1028e0eb7fdbc11b86d03fb5 100644 (file)
@@ -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)));
index 298521a856e1671ed2adf2463d5b7a231c88cef3..2ba986ddd44aec98973efa6fe0e9b0d86539b776 100644 (file)
@@ -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 {
index 397f9e2939b0839bbeab284a4d1fc9c630dd72f3..62520edead0e80dec7c6f84ce9e2546874569135 100644 (file)
@@ -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());
             }
index 3d315b4e670a60bcb2830f674669e19b737eb3f2..d04f43ae894440655f2a6143dfa7ae8f66a5829e 100644 (file)
@@ -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);
index 82f69ab5265a97708d6087ce5d2e9c88352586d8..3b7060280a087403545a4b9fbbf325104dc284ab 100644 (file)
@@ -133,8 +133,8 @@ public class LaCrosseTemperatureSensorHandler extends JeeLinkSensorHandler<LaCro
                                 reading.getHumidity(), reading.isBatteryNew(), reading.isBatteryLow());
                         updateState(TEMPERATURE_CHANNEL, new QuantityType<>(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,
index 3260b4c2009d3c293bc72e9203d032914fd6cd98..a9f6fb8d1840f73edd224fb38dd8939ffbfd9e15 100644 (file)
@@ -55,8 +55,8 @@ public class Tx22SensorHandler extends JeeLinkSensorHandler<Tx22Reading> {
                     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);
index a386c3a49f79cfc7906fca6da9d7f7281d521d93..6febc5533d9ee64cefa16176136116368858cd1f 100644 (file)
@@ -103,7 +103,7 @@ public class Pca301SensorHandler extends JeeLinkSensorHandler<Pca301Reading> {
                     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));
index ffab4046bd8abb2253cf45d12b4f4a331579c2c3..4b5943bb17d4b7d1f77d43dd6047b5cccaba8f9f 100644 (file)
@@ -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"));
index 98123eddbf8ff5f2fdf32073ad9e00172baa1745..5ef248974d9aca6f7b52ad8e7b8ed7d27d70cf96 100644 (file)
@@ -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);
             }
index d3f347a41531f7d9b6fd719b9a2d6d20ae723404..8e7fd73d3af85c8d283d8ca62c935bd24a1b3d5f 100644 (file)
@@ -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)) {
index f0a8c4011281425121e8cd20871ee35bee14f8dd..34cb5448eda3e15621ac0344c2ca42d6a3e01093 100644 (file)
@@ -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;
         }
index db831f7c45c2fc91e4f95a7356988ac2fe66a74b..5f93ee242b35a4aa7fa7ae6876776f54aa8d80f9 100644 (file)
@@ -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());
index a948ea74883949f0560914b998c5ee34a298d657..b2cbca5f88dfed5a404a6f7cae753293e05deaf1 100644 (file)
@@ -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
index 114d9ab1f7525a5b0046c6893c6e05eef187a0ab..0764a061b89238bc75b71f5cc692f9e1712c2796 100644 (file)
@@ -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);
index d309bbc44769f2f49bf7cff151bae5cc953fd955..4171b9645fc06d3d2d5b760db5c739b33457cdeb 100644 (file)
@@ -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())));
index 029160c4fb7f17f3b4ef3373c49444c9d27cdb98..b247a43df647151417ad7f0baa4761b445850b33 100644 (file)
@@ -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));
         }
     }
 }
index ea8905f9efae17b3afc5be870632bd2240db4c6a..07303cad818d43fcfdc12641dc98743dd80fbc98 100644 (file)
@@ -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);
         }
index eda9b69cc059152c5d7948ec54caf63b023c3b33..9da535f3c259f91c12b066818dcac26e6a2c13e9 100644 (file)
@@ -49,7 +49,7 @@ public class PowerControlPower extends BaseChannelHandler<CommandConfirmation> {
     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:
index f4e4c513140867a7b65cdcf9b777f62280a68637..f2ee975738c89df78a12a75456ecad86a7a96441 100644 (file)
@@ -52,6 +52,6 @@ public enum PowerState {
     }
 
     public OnOffType toOnOffType() {
-        return this == ON ? OnOffType.ON : OnOffType.OFF;
+        return OnOffType.from(this == ON);
     }
 }
index a759c19e9259fb4ee28f2098c8dd8aa026112c47..9554d93814a6ea90718dd44c9885dfd7831297a2 100644 (file)
@@ -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;
     }
index 1c96531c33ba63c965e34e99022bf5aa7c216e01..d5667f652cd54758e51289673ed141bd91b03fd5 100644 (file)
@@ -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);
index 25ed07ed8a2946bcb333a180d7680648b2aa8a32..af90382d837f34ba0d94750c4e0845305f779424 100644 (file)
@@ -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);
             }
index 06410f9924bf767d89cdf05c65b8793560302c6b..5c353d2552352078cc689af2cfad66f252041c2c 100644 (file)
@@ -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);
index 0ff04075efa29dc8ec21ef1dc746eb3c1946382e..8a59367dc67c5ec11559e86404560e4b25decebe 100644 (file)
@@ -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));
         }
     }
 
index dbe622406ce1b4ad3ce18667dc2e9259b050108b..e0f1045b194c8b54b4df5b313dbf2070ec420ec3 100644 (file)
@@ -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));
     }
 }
index 28ef252d156da20b674d0c36b45b4c957cbb6eed..e2634498a31bd865729039d2bb7ca634cbd81522 100644 (file)
@@ -120,7 +120,7 @@ public class ChannelUpdaterJob implements SchedulerRunnable, Runnable {
     private @Nullable State convertValueToState(Integer rawValue, Class<? extends Item> 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) {
index 70242098c334ab27e7932a3e164a107c71a390f7..7b90f259cd81a022103cbbb77415bfb082e07cd9 100644 (file)
@@ -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() {
index 02159dfa4edb89abb07980ded424195c40aa0c85..68f0aadf7a38208a3b50170b6fbcb5a833cdaae6 100644 (file)
@@ -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()));
index 2dc8b0f742fd16dc0e69f4d4fe46b578aa2523c5..29cdb2057762d86f275f67b98dc2f1f6b784fb96 100644 (file)
@@ -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;
         }
     }
index bb62e1dd7b09bd1586e93c9539bfb8d2881b01b3..b23baebba62a96b4d8b0ef0c508c11090a445242 100644 (file)
@@ -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);
     }
index 4d4f110f5720dc5c5b018c0ef5cb9abea48ac3e8..e91bb4780771a94937b72c3373a7150f681c7d80 100644 (file)
@@ -121,7 +121,7 @@ public class FridgeHandler extends MieleApplianceHandler<FridgeChannelSelector>
 
         // 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);
     }
index a613ce27c29660861a39573bda117147fb84bd90..fca487927ca9b2621cd29dea296cce18a5dd543a 100644 (file)
@@ -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));
index b8763b2f03a83f3dbdaaaa36ce2348a619dbe44c..f2fadcd5e90d335583209bd8489830c54e6ebe00 100644 (file)
@@ -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));
         }
     }
 }
index be6f23b4733b49a8c4974946b02c226fd323a449..53b6a9f80392e798c8ed33bbcfbd2fac5ba9ddb6 100644 (file)
@@ -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));
         }
     }
 }
index 126c8db6ba4039e6fef74b0028b2f9d30d87f7c3..a6821ebb67f709e253886f1064c0f69985715fef 100644 (file)
@@ -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(),
index 34138c50935534c43038d97a7baca91993e43134..fc58127011ca40cbfb1a7a46af4e4b9b433e0353 100644 (file)
@@ -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) {
index 5841c88f7d2be8a04419ea420fcc8842afd8be81..18b67d95aa21282f0b12c15acb8fab6ebfe800e9 100644 (file)
@@ -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 {
index 97b6d4bd4247361218f0ec2f1c19b47ccc88ecab..80919568fa94782652eb1e6c525652e2df92c821 100644 (file)
@@ -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 {}",
index 784d6401314cacb88b043359ca30bbc8593eb5b0..b1f7c5efe9635ae35aa51d2ba51c51be62ddf80d 100644 (file)
@@ -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));
index 15f7dcbdf6639ec71701474a4157d80d82a5f9b8..b50984e44578cc5830aed9813fdb0e6d697a830a 100644 (file)
@@ -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);
     }
 
index 6316dffadc726c5c3e411a969ee065445bfb4420..5a66fdd10cdd56992c7bb31033078a660ed69306 100644 (file)
@@ -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);
     }
 
index e0db7bcb37a0d911583b52162097390f8e438852..80daa8761e76c8bd0c50ed2094ac74e34ad13da2 100644 (file)
@@ -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":
index f81fc521718e0866222ae76d32281e8dd4808867..994bb22022902e536a54dd75f54acb12ee554de5 100644 (file)
@@ -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 {
index 9187ca06f2fec684ad01f799c775c399797b7150..025fe6c1918f6ebc9a51c83178b8f52af48cfa62 100644 (file)
@@ -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));
index 0d2a64e15d515615bff4ba7d9f1f34f7c70a6402..f678e9b527f68698b2694df742a97046efa425fe 100644 (file)
@@ -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));
index 304f9f62ab65b119bfc8865b8a69e14ec7ec0570..5cce6d642b7af941aa23ebfac6f27f637f419be6 100644 (file)
@@ -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())) {
index c121b55963dd8b69160fb1ac4a17e598163af480..5bbdc14658968fc3f80f7b6b2a78c38ff7aee77f 100644 (file)
@@ -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) {
index 49166b6319790d78891f56915e69f292db740aed..8ccbe584c822cf88b1eff5b8093e14afbdd285f7 100644 (file)
@@ -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();
index a5a9d26b69e254b317f157f69199972ae844343f..fe255eb8d64328836f83a889b5736dcb3550dde7 100644 (file)
@@ -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()));
         }
     }
 
index aa3a94d453fd18ff57af093baee65fcf23d39c5c..b067f3f65d64c9168efb848a7baa231bd0e3ddd4 100644 (file)
@@ -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())));
         }
index 3a17c2f668655ddf4921de6aec864df3720282de..e53b00d54d15521b4306f55844b1f53ed5c9bc7c 100644 (file)
@@ -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;
             };
         }
index 4151ec3a6d7430b55cbfd0a053697a20d8097683..ee6dbf110a3816abb110ab4301c6c78f0bfe739f 100644 (file)
@@ -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:
index a2b5b94afc8d35e30dbe122187b45abf41c37896..81ac5c75aa68d9d23b5ca14c9655ee9787bf0e4a 100644 (file)
@@ -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);
index 5d1c95a95d1a442d812ea6b31e46d6247fc1d86a..c489ebac6c217824ea559c8615434f4f042f54ed 100644 (file)
@@ -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);
     }
 }
index 520d9a5e4fa71e7bda2f32837f5657026b7a9303..ff1f7a4cf302b9e65e3565deec267e7c080e9714 100644 (file)
@@ -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:
index 7ef3a7d2f1d494c764927d1a0b21097797ca68e6..e026716a1bf3e5c50541e3a5b6d3b25d66862cda 100644 (file)
@@ -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;
index cbedac149375762d3f890e08bc889a912c4f1d7a..5eff7e499f68bba04075e318c97948f38610a20a 100644 (file)
@@ -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);
         }
     }
 
index 4b2570efcec0df312f677877cd381546f01e1762..00fbe7ed034ad68656ae54c97ee69ca8014d03a3 100644 (file)
@@ -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);
index dab22dbce5e4c65153e28f91468a34b1e312f2fa..ce01f317aa571968518f3912badab8fc7fd4f79d 100644 (file)
@@ -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;
 
index 7deadd0c52ee964b5cd3db2fcd74c4b8e72094f4..89cbfbb0cc8ab32dc72b73e532163a14b3b3816c 100644 (file)
@@ -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:
index d0a7aadd7fc01c553919746ecc9330653a3d15d3..c07e8fea7adaaa05300f976b3e074ed0143105cd 100644 (file)
@@ -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;
index 2f20e03b5cbbb3bdd688ecaa070b1d5313c72e97..d16bc6472208ee9b9d4b6323fd1af613bf172d14 100644 (file)
@@ -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)));
     }
 }
index 8ca6ed97a5f4b0e7a06428269d1fb17d35ae5560..a70c4a80628c1f4d36f0f3bdb95ac7b7026c5ae3 100644 (file)
@@ -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
index b9e620216dda1a2de4d544c4f268819fda6e481e..4d980675ee337bff0c6f95eb16997f53717225a2 100644 (file)
@@ -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
index f66877d0969713bf6de6e6f9685c899f4b825223..50b7a5d40991977b59b9139ac11299aa756a3df8 100644 (file)
@@ -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:
index b0f3b74ca4611f9e065ceab6310281c150811a54..bf470efe9a0d3ac4e072681070ed1aca48a752ef 100644 (file)
@@ -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:
index c90f45ab1a47a8f9511ab611d5365cf9b2ab9794..584058b48670057d91829ed0a788c70dcc6032f1 100644 (file)
@@ -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)));
     }
 
     /**
index 9d48d3c059c3b34db829cdedbafa0f86c8ca9452..3501f01d527023041926df0f5fbc93ff4e6ce8b1 100644 (file)
@@ -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()));
index f7fbe1f807b4da721a7c990568227f27738032e4..206f5aeeeb26338102c7e2e24f86f38096598cf9 100644 (file)
@@ -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);
index be4b9c85a8fa17912d47c2e9aad8a39d9c235c8b..1847e55d5b86a2af0725f0b001b75b3bbee1cacd 100644 (file)
@@ -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);
index 46cb2cd419746edf47f1b3d99726eb33bcc56cd7..328cb84b0ca67c80382c885d8a3c37329985d2de 100644 (file)
@@ -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);
index 8026d743076f181382318765742139d56f4dd314..9063d1bab948a4b1d9b9c9d9324e65406ae64498 100644 (file)
@@ -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) {
index e290c21abbff9e6047fa3e33ddb3d5ef51a0e005..e4cc01105e24f167e8ab0c94bc69ad3139bd2bfe 100644 (file)
@@ -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) {
index ed56c31dd157a155ac728fdfb7636834b6479a35..2663657abf159c1e6d7947c9ac2596d0b77c3700 100644 (file)
@@ -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()));
         }
     }
 
index cc45d78c8549f30b952e8844855b8655007b0ebd..1b44c9d2788d8591d7dc1add7172cd4f6ce40ad8 100644 (file)
@@ -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));
             }
         }
     }
index bcd97afdd0eae34e157c00b2303cac9c3551515d..73448ec65f49aad1f38d7aab9f0e968abc22a2de 100644 (file)
@@ -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<String> 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;
index 306e6bab0fda1d0a2e52d271ae2dcb9f0d9979c4..0337ee1e805a1febade7c02954b6e59f810b3189 100644 (file)
@@ -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));
         }
     }
 
index 88eacc09c497c3f823e3ef6b85b0de069e93aaa2..018619e8367b9afa8d94a9107238867037d47c5b 100644 (file)
@@ -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:
index b602aeee92ca0f2cc9d43d3b8c97b6c534bba9a4..d2f643a554e00fbb1471ff93679b1392645d6b2d 100644 (file)
@@ -130,7 +130,7 @@ public class RFXComHomeConfortMessage extends RFXComDeviceMessageImpl<RFXComHome
     public State convertToState(String channelId, RFXComDeviceConfiguration config, DeviceState deviceState)
             throws RFXComUnsupportedChannelException, RFXComInvalidStateException {
         if (channelId.equals(CHANNEL_COMMAND)) {
-            return (command == Commands.OFF || command == Commands.GROUP_OFF ? OnOffType.OFF : OnOffType.ON);
+            return OnOffType.from(command != Commands.OFF && command != Commands.GROUP_OFF);
         } else {
             return super.convertToState(channelId, config, deviceState);
         }
index 86ea19cdba86c1062756ad4ea932a2bb36c10b46..d7d7dc0a04cf467c6e1054c5275bc330271ba259 100644 (file)
@@ -183,7 +183,7 @@ public class RFXComLighting4Message extends RFXComDeviceMessageImpl<RFXComLighti
                 }
                 // Deprecated if statement - to be removed in a future release
                 if (config.onCommandId == null && config.offCommandId == null) {
-                    return ON_COMMAND_IDS.contains(commandId) ? OnOffType.ON : OnOffType.OFF;
+                    return OnOffType.from(ON_COMMAND_IDS.contains(commandId));
                 }
                 throw new RFXComInvalidStateException(channelId, Integer.toString(commandId),
                         "Device not configured for received commandId");
index ceb0da5d024f44df115d4a3108ad4cf906e8e3eb..f47aaa5a22a9e3586d7243479a661fd6236d5359 100644 (file)
@@ -242,7 +242,7 @@ public class RobonectHandler extends BaseThingHandler {
             updateState(CHANNEL_STATUS_DISTANCE, new QuantityType<>(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());
         }
index 6970d0538d460d89ebd2db449fceb7b5e7e7d45a..aeca47f9a42fac17116a698ae7ac731eb2c305cd 100644 (file)
@@ -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:
index a379889f1379dac1bcd40a6a2047dcb93e6913cf..d9dececde17968598ca2038245ea71f06d3e0aa6 100644 (file)
@@ -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:
index 9ebf0fa002bf3b4ee8bd66853d751c529c61feac..220b1456f556f42fe90aafb39189fb2c80734d7f 100644 (file)
@@ -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();
index 12a1f332388161a5883af8808339d8a5a60ef372..cc86d2a75aace44b367040ec964595115d42c6b1 100644 (file)
@@ -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;
index 054324ec910cd0623e7082f92cd67282c38c3aa1..859c9831439435d14269cd0aa86bac762c9189c2 100644 (file)
@@ -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));
             }
         }
     }
index 85a9b81d99b7182a088c9cc997b7948b3cb3d704..16cead87dca4da6635647a603cb802622fb3309a 100644 (file)
@@ -108,7 +108,7 @@ public abstract class SatelThingHandler extends BaseThingHandler implements Sate
      * @param switchOn if <code>true</code> 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);
     }
 
index 5ac74036047bc7ed78c4a22760340d679359254c..195c9bd5ee58eb4213fd04ec73a4994974bb6fb2 100644 (file)
@@ -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) {
index d37a39ed2d60b549cc37d5b89382c0d11356dd90..e56a9de2ac58027a19378762ac5b58bb93afd104 100644 (file)
@@ -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<String, State> 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));
             }
         }
     }
index 4f4e6020576eb8e5a3a085adf67f9750232f1896..fd93dbf158600beec81a85a398256739e1d23cfb 100644 (file)
@@ -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,
index 5a599811f6416331fb420da869e1880b829e6d26..7b0c457c46e3d1c7c31f0639810611088f4515b0 100644 (file)
@@ -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);
index 0daed7b48a0cdf7d8efbe78a5006c0f3cf1590f6..018d3ad2a0db2c38a5b656cfcd80eaa1721bd889 100755 (executable)
@@ -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;
index b9a901612bb6d1352226f6b03896aa4ec4ca0ba3..c98575e51628897eeba387283d99fe87e4e02e4c 100644 (file)
@@ -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:
index 6d51d4b2961d07eb82cf7893b03642ee2030f44b..1fdc36b6c3cb3f9993b0bcc028c7cfb5c3a797e8 100644 (file)
@@ -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) {
index b3e23e4230819b176f3abb13b5109231c211f032..54bdf97a8da9499d7a78eaaa310a402a1c2ab9b4 100644 (file)
@@ -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()));
index d6d363d0184b5a1305bd9056654582f003e83910..9a4041e465393be73fb5dba8024860163ff86254 100644 (file)
@@ -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":
index faf78229650b9e46a3fef43e9cac8cac2dd6c0f8..040d9841b682ddcb484c6e8607b99a6c3ebcad6a 100644 (file)
@@ -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);
index be6a5ca099d706cfb9ab56606c8cd72ed0b30850..dc77a0725acc879a8ca9c4b2571b686d401dc21d 100644 (file)
@@ -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;
         }
     }
index 542164d15098fe5430e4881eb625c425c684b87f..db392ff90982fb462544c9e8d99fad94b09360c9 100644 (file)
@@ -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));
     }
 
     /**
index bf3765f6e88443d87b9fa3a68a0127b5d47e8804..7f8f9cdb6d6baec7093fb2b25fbd91443de24cc4 100644 (file)
@@ -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());
index 263dab869fc0b161f53896ede6c24967d14702c5..d9f64e40fdeae78d50720318e04eadfd43840ac3 100644 (file)
@@ -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
index 891d18a7057dd126cb922ed82e6f0071a104d531..0128c90b52f2dafa588f01b967128bc37286b93f 100644 (file)
@@ -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));
             }
         }
     }
index 6d13c9f75f9ca5ec8a154bf65947058f878bbfb3..d6f8567c02e9f5f81ce6f775a905c99138ce0024 100644 (file)
@@ -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;
index faa86f2f7d91ab7071c677730c8eadda35ab2a1e..76d07e19ccc3886011771ded3a542fb9fb8f591f 100644 (file)
@@ -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);
         }
index 6a73b1ad94e801e7604e868b1cdace5a19b0d06f..ddf1adf93d2744a9ce19d0f442554c9d9782aa77 100644 (file)
@@ -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());
         }
index c87d2e30c437ec75542b6860090cef40c0154d3e..f4a32764394a02b709a9a44e3448e9bc9d1caf28 100644 (file)
@@ -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);
     }
 
     /**
index 36a242078a3eee62d15dce2fd51d2277fed7d1c9..3ec87694936205fef3d8cf6dbcb978d6b4589faa 100644 (file)
@@ -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
index 2802e42f43698139facfc3faf6f3e6808d6b19eb..953e54eb0dcd3e450240b3c7257c1e7252f297af 100644 (file)
@@ -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() {
index 523e475ec720a9aaa1bc2217f4910d22e831951b..d7691b503330dc38076a03bcae6aeb4baa2270ca 100644 (file)
@@ -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() {
index 48b36bb78d488ed8b0f29ddccc9ee36848f3e2d4..a95b5a9d9ea1e231cfeb9ae051848dbed74d41c6 100644 (file)
@@ -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);
index 5cf4ec779f00839c317ba07b8bd90f3544a0d9fe..134082c1a4c1c24b76e7bf6eade452528a1d3119 100644 (file)
@@ -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);
         }
     }
index d5d83d2cc3e74ec2280b8638e3e56e51a896f35e..826a9e2587dc1e6bb722e00bdea68ee088a5c3fb 100644 (file)
@@ -167,7 +167,7 @@ public class TradfriAirPurifierData extends TradfriDeviceData {
         QuantityType<Time> ttl = getNextFilterCheckTTL();
         if (ttl != null) {
             int ttlValue = ttl.intValue();
-            return ttlValue < 0 ? OnOffType.ON : OnOffType.OFF;
+            return OnOffType.from(ttlValue < 0);
         } else {
             return null;
         }
index 9f36fc713c2b9461b001284e22e2e25747e65dc4..b6a469a2cc64af134fa320520bbd38653be8596e 100644 (file)
@@ -47,7 +47,7 @@ public abstract class TradfriWirelessDeviceData extends TradfriDeviceData {
 
     public @Nullable OnOffType getBatteryLow() {
         if (generalInfo.get(DEVICE_BATTERY_LEVEL) != null) {
-            return generalInfo.get(DEVICE_BATTERY_LEVEL).getAsInt() <= 10 ? OnOffType.ON : OnOffType.OFF;
+            return OnOffType.from(generalInfo.get(DEVICE_BATTERY_LEVEL).getAsInt() <= 10);
         } else {
             return null;
         }
index 1acf87403921e8ee6b37db2e8cc073da6dbc03dc..6191153f59dc444c9bc50d22ba1f9a4a503c9c86 100644 (file)
@@ -1125,16 +1125,14 @@ public class UpnpRendererHandler extends UpnpHandler {
     private void onValueReceivedMute(String variable, @Nullable String value) {
         if (value != null && !value.isEmpty()) {
             String upnpChannel = variable.replace("Mute", "mute").replace("Master", "");
-            updateState(upnpChannel,
-                    ("1".equals(value) || "true".equals(value.toLowerCase())) ? OnOffType.ON : OnOffType.OFF);
+            updateState(upnpChannel, OnOffType.from("1".equals(value) || "true".equalsIgnoreCase(value)));
         }
     }
 
     private void onValueReceivedLoudness(String variable, @Nullable String value) {
         if (value != null && !value.isEmpty()) {
             String upnpChannel = variable.replace("Loudness", "loudness").replace("Master", "");
-            updateState(upnpChannel,
-                    ("1".equals(value) || "true".equals(value.toLowerCase())) ? OnOffType.ON : OnOffType.OFF);
+            updateState(upnpChannel, OnOffType.from("1".equals(value) || "true".equalsIgnoreCase(value)));
         }
     }
 
index 13931d71c7483a6d1673883ec89bfb0f930d0102..9d9d00788b588e04ec23d7a0c9f0ee6e33eb29de 100644 (file)
@@ -91,7 +91,7 @@ public class VelbusRelayHandler extends VelbusThingHandler {
                 boolean on = packet[7] != 0x00;
 
                 VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address, channel);
-                OnOffType state = on ? OnOffType.ON : OnOffType.OFF;
+                OnOffType state = OnOffType.from(on);
                 updateState(getModuleAddress().getChannelId(velbusChannelIdentifier), state);
             }
         }
index 364411c1d725b7c1b789283c08bf676791ab07ac..e56e249c2be0238f1a5dc99ed26d8fc72a176a5d 100644 (file)
@@ -290,7 +290,7 @@ public class VelbusSensorWithAlarmClockHandler extends VelbusSensorHandler {
                     VelbusClockAlarm alarmClock1 = this.alarmClockConfiguration.getAlarmClock1();
                     alarmClock1.setEnabled(alarmClock1Enabled);
                     alarmClock1.setLocal(alarmClock1IsLocal);
-                    updateState(clockAlarm1Enabled, alarmClock1.isEnabled() ? OnOffType.ON : OnOffType.OFF);
+                    updateState(clockAlarm1Enabled, OnOffType.from(alarmClock1.isEnabled()));
                     updateState(clockAlarm1Type, alarmClock1.isLocal() ? ALARM_TYPE_LOCAL : ALARM_TYPE_GLOBAL);
 
                     boolean alarmClock2Enabled = (alarmAndProgramSelection & 0x10) > 0;
@@ -298,7 +298,7 @@ public class VelbusSensorWithAlarmClockHandler extends VelbusSensorHandler {
                     VelbusClockAlarm alarmClock2 = this.alarmClockConfiguration.getAlarmClock2();
                     alarmClock2.setEnabled(alarmClock2Enabled);
                     alarmClock2.setLocal(alarmClock2IsLocal);
-                    updateState(clockAlarm2Enabled, alarmClock2.isEnabled() ? OnOffType.ON : OnOffType.OFF);
+                    updateState(clockAlarm2Enabled, OnOffType.from(alarmClock2.isEnabled()));
                     updateState(clockAlarm2Type, alarmClock2.isLocal() ? ALARM_TYPE_LOCAL : ALARM_TYPE_GLOBAL);
                 }
             }
@@ -319,13 +319,13 @@ public class VelbusSensorWithAlarmClockHandler extends VelbusSensorHandler {
                 alarmClock1.setEnabled((data & ALARM_1_ENABLED_MASK) > 0);
                 alarmClock1.setLocal((data & ALARM_1_TYPE_MASK) > 0);
 
-                updateState(clockAlarm1Enabled, alarmClock1.isEnabled() ? OnOffType.ON : OnOffType.OFF);
+                updateState(clockAlarm1Enabled, OnOffType.from(alarmClock1.isEnabled()));
                 updateState(clockAlarm1Type, alarmClock1.isLocal() ? ALARM_TYPE_LOCAL : ALARM_TYPE_GLOBAL);
 
                 alarmClock2.setEnabled((data & ALARM_2_ENABLED_MASK) > 0);
                 alarmClock2.setLocal((data & ALARM_2_TYPE_MASK) > 0);
 
-                updateState(clockAlarm2Enabled, alarmClock2.isEnabled() ? OnOffType.ON : OnOffType.OFF);
+                updateState(clockAlarm2Enabled, OnOffType.from(alarmClock2.isEnabled()));
                 updateState(clockAlarm2Type, alarmClock2.isLocal() ? ALARM_TYPE_LOCAL : ALARM_TYPE_GLOBAL);
                 break;
             case 1:
index 46942aca0cfbe31168b9869067c861ba39a29d9f..8c56fda8ce8af617644724d092af7c1b77c37f7c 100644 (file)
@@ -95,7 +95,7 @@ public class VelbusVMBGPOHandler extends VelbusMemoHandler {
 
                     if ((memoryAddress + i) == MODULESETTINGS_MEMORY_ADDRESS) {
                         this.moduleSettings = data[i];
-                        OnOffType state = ((this.moduleSettings & 0x80) != 0x00) ? OnOffType.ON : OnOffType.OFF;
+                        OnOffType state = OnOffType.from((this.moduleSettings & 0x80) != 0x00);
                         updateState(screensaverChannel, state);
                     }
                 }
index ec934c8e1f23f0b5e9f01ad8bc1b8580cccd4410..a9150bfe07b7cfb1ae8b51da3b23d601891aa51d 100644 (file)
@@ -103,7 +103,7 @@ public class VeluxBridgeLANConfig {
             channel.openHABipAddress = new StringType(bcp.getLANConfig().getIpAddress());
             channel.openHABsubnetMask = new StringType(bcp.getLANConfig().getSubnetMask());
             channel.openHABdefaultGW = new StringType(bcp.getLANConfig().getDefaultGW());
-            channel.openHABenabledDHCP = bcp.getLANConfig().getDHCP() ? OnOffType.ON : OnOffType.OFF;
+            channel.openHABenabledDHCP = OnOffType.from(bcp.getLANConfig().getDHCP());
             channel.isRetrieved = true;
         } else {
             channel.isRetrieved = false;
index 21b27c74003d15633672423ba721a1a2d6f660d1..8ede92a57418b7fe66bc170eda6c4ba4df961566 100644 (file)
@@ -308,7 +308,7 @@ public class VentaThingHandler extends BaseThingHandler {
                 updateState(VentaAirBindingConstants.CHANNEL_CLEANING_TIME, cleaningHoursState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_CLEANING_TIME, cleaningHoursState);
 
-                OnOffType cleanModeState = info.isCleanMode() ? OnOffType.ON : OnOffType.OFF;
+                OnOffType cleanModeState = OnOffType.from(info.isCleanMode());
                 updateState(VentaAirBindingConstants.CHANNEL_CLEAN_MODE, cleanModeState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_CLEAN_MODE, cleanModeState);
 
index a7cf6af52a6c4865e8c5056d833f0e8be599fc66..eefc9e6c330ace771efe40018e0f2396588d14c3 100644 (file)
@@ -70,8 +70,8 @@ public class VolvoOnCallHandlerFactory extends BaseThingHandlerFactory {
                                 jsonDeserializationContext) -> json.getAsBoolean() ? OpenClosedType.OPEN
                                         : OpenClosedType.CLOSED)
                 .registerTypeAdapter(OnOffType.class,
-                        (JsonDeserializer<OnOffType>) (json, type,
-                                jsonDeserializationContext) -> json.getAsBoolean() ? OnOffType.ON : OnOffType.OFF)
+                        (JsonDeserializer<OnOffType>) (json, type, jsonDeserializationContext) -> OnOffType
+                                .from(json.getAsBoolean()))
                 .registerTypeAdapter(StringType.class, (JsonDeserializer<StringType>) (json, type,
                         jsonDeserializationContext) -> StringType.valueOf(json.getAsString()))
                 .create();
index ec6194fdc99872e9bb262fa00645b3b73d50c847..439103bf086e1cb7b832bd03fe9fc37ab344d10d 100644 (file)
@@ -448,7 +448,7 @@ public class VehicleHandler extends BaseThingHandler {
             case SERVICE_WARNING:
                 return new StringType(status.serviceWarningStatus);
             case BULB_FAILURE:
-                return status.aFailedBulb() ? OnOffType.ON : OnOffType.OFF;
+                return OnOffType.from(status.aFailedBulb());
             case REMOTE_HEATER:
             case PRECLIMATIZATION:
                 return status.getHeater().map(heater -> getHeaterValue(channelId, heater)).orElse(UnDefType.NULL);
@@ -491,7 +491,7 @@ public class VehicleHandler extends BaseThingHandler {
                 return status.averageFuelConsumption != UNDEFINED ? new DecimalType(status.averageFuelConsumption / 10)
                         : UnDefType.UNDEF;
             case FUEL_ALERT:
-                return status.distanceToEmpty < 100 ? OnOffType.ON : OnOffType.OFF;
+                return OnOffType.from(status.distanceToEmpty < 100);
         }
         return UnDefType.UNDEF;
     }
index fdbc23b472cd4a23afc75db60a120b41b96a12e1..b71d55d54d07211a8832eeaa22ee6bc77728847e 100644 (file)
@@ -73,11 +73,11 @@ public class VehiclePositionWrapper {
     }
 
     public State isCalculated() {
-        return position.map(pos -> isCalculated ? (State) OnOffType.ON : OnOffType.OFF).orElse(UnDefType.UNDEF);
+        return position.map(pos -> (State) OnOffType.from(isCalculated)).orElse(UnDefType.UNDEF);
     }
 
     public State isHeading() {
-        return position.map(pos -> pos.isHeading() ? (State) OnOffType.ON : OnOffType.OFF).orElse(UnDefType.UNDEF);
+        return position.map(pos -> (State) OnOffType.from(pos.isHeading())).orElse(UnDefType.UNDEF);
     }
 
     public State getTimestamp() {
index 03f63382d57c3913f26a6be23138de2a0b5a3207..0965c7ecf0bdd10ff459cd5a209f7d375ad9c313 100644 (file)
@@ -102,7 +102,7 @@ class TypeConverters {
 
         @Override
         public Command toStateCommand(Object propertyValue) {
-            return toBoolean(propertyValue) ? OnOffType.ON : OnOffType.OFF;
+            return OnOffType.from(toBoolean(propertyValue));
         }
 
         @Override
index 156b95e97d729793c799eb228abf975672ed73a8..1b256aaa2a7208002cac0b33b5400253d30b6117 100644 (file)
@@ -105,7 +105,7 @@ public class InsightParser {
     }
 
     private State getOnOff(String value) {
-        return "0".equals(value) ? OnOffType.OFF : OnOffType.ON;
+        return OnOffType.from(!"0".equals(value));
     }
 
     private State getDateTime(String value) {
index 541934f2f4112e43104101c484df61b2d1a86774..0ccbbcffef564a30eb59a24be66eb16a451e9eb2 100644 (file)
@@ -305,11 +305,11 @@ public class WemoCoffeeHandler extends WemoBaseThingHandler {
                             updateState(CHANNEL_WATER_LEVEL_REACHED, newAttributeValue);
                             break;
                         case "CleanAdvise":
-                            newAttributeValue = "0".equals(attributeValue) ? OnOffType.OFF : OnOffType.ON;
+                            newAttributeValue = OnOffType.from(!"0".equals(attributeValue));
                             updateState(CHANNEL_CLEAN_ADVISE, newAttributeValue);
                             break;
                         case "FilterAdvise":
-                            newAttributeValue = "0".equals(attributeValue) ? OnOffType.OFF : OnOffType.ON;
+                            newAttributeValue = OnOffType.from(!"0".equals(attributeValue));
                             updateState(CHANNEL_FILTER_ADVISE, newAttributeValue);
                             break;
                         case "Brewed":
index 609d960302ccc499dbb4cb6270690beb375d1cfa..d32c4f3b850d81c8ac9a810ee785d6335c3abe14 100644 (file)
@@ -355,7 +355,7 @@ public class WemoDimmerHandler extends WemoBaseThingHandler {
             switch (variable) {
                 case "BinaryState":
                     if (oldBinaryState == null || !oldBinaryState.equals(value)) {
-                        State state = "0".equals(value) ? OnOffType.OFF : OnOffType.ON;
+                        State state = OnOffType.from(!"0".equals(value));
                         logger.debug("State '{}' for device '{}' received", state, getThing().getUID());
                         updateState(CHANNEL_BRIGHTNESS, state);
                         if (state.equals(OnOffType.OFF)) {
@@ -386,7 +386,7 @@ public class WemoDimmerHandler extends WemoBaseThingHandler {
                         updateState(CHANNEL_FADER_COUNT_DOWN_TIME, faderMinutes);
                     }
                     if (splitFader[1] != null) {
-                        State isTimerRunning = "-1".equals(splitFader[1]) ? OnOffType.OFF : OnOffType.ON;
+                        State isTimerRunning = OnOffType.from(!"-1".equals(splitFader[1]));
                         logger.debug("isTimerRunning '{}' for device '{}' received", isTimerRunning,
                                 getThing().getUID());
                         updateState(CHANNEL_TIMER_START, isTimerRunning);
@@ -395,14 +395,14 @@ public class WemoDimmerHandler extends WemoBaseThingHandler {
                         }
                     }
                     if (splitFader[2] != null) {
-                        State isFaderEnabled = "0".equals(splitFader[1]) ? OnOffType.OFF : OnOffType.ON;
+                        State isFaderEnabled = OnOffType.from(!"0".equals(splitFader[1]));
                         logger.debug("isFaderEnabled '{}' for device '{}' received", isFaderEnabled,
                                 getThing().getUID());
                         updateState(CHANNEL_FADER_ENABLED, isFaderEnabled);
                     }
                     break;
                 case "nightMode":
-                    State nightModeState = "0".equals(value) ? OnOffType.OFF : OnOffType.ON;
+                    State nightModeState = OnOffType.from(!"0".equals(value));
                     currentNightModeState = value;
                     logger.debug("nightModeState '{}' for device '{}' received", nightModeState, getThing().getUID());
                     updateState(CHANNEL_NIGHT_MODE, nightModeState);
index db5d386e8dffe078ccd7b82b08a29d55e3851434..790472f3194cb14db42c3dd52ede48cc1d99991b 100644 (file)
@@ -256,7 +256,7 @@ public class WemoLightHandler extends WemoBaseThingHandler {
                     wemoHttpCaller.executeCall(wemoURL, soapHeader, content);
                     if ("10008".equals(capability)) {
                         OnOffType binaryState = null;
-                        binaryState = "0".equals(value) ? OnOffType.OFF : OnOffType.ON;
+                        binaryState = OnOffType.from(!"0".equals(value));
                         updateState(CHANNEL_STATE, binaryState);
                     }
                     updateStatus(ThingStatus.ONLINE);
@@ -308,7 +308,7 @@ public class WemoLightHandler extends WemoBaseThingHandler {
             String[] splitResponse = response.split(",");
             if (splitResponse[0] != null) {
                 OnOffType binaryState = null;
-                binaryState = "0".equals(splitResponse[0]) ? OnOffType.OFF : OnOffType.ON;
+                binaryState = OnOffType.from(!"0".equals(splitResponse[0]));
                 updateState(CHANNEL_STATE, binaryState);
             }
             if (splitResponse[1] != null) {
@@ -338,7 +338,7 @@ public class WemoLightHandler extends WemoBaseThingHandler {
         switch (capabilityId) {
             case "10006":
                 OnOffType binaryState = null;
-                binaryState = "0".equals(newValue) ? OnOffType.OFF : OnOffType.ON;
+                binaryState = OnOffType.from(!"0".equals(newValue));
                 updateState(CHANNEL_STATE, binaryState);
                 break;
             case "10008":
index 61b3d413c285c530e2ed0976acde8bd6b3474786..f6e68ce38c4eb2a9fce0ea4890a2c8f99fe15fdf 100644 (file)
@@ -204,13 +204,13 @@ public class WemoMakerHandler extends WemoBaseThingHandler {
 
                     switch (attributeName) {
                         case "Switch":
-                            State relayState = "0".equals(attributeValue) ? OnOffType.OFF : OnOffType.ON;
+                            State relayState = OnOffType.from(!"0".equals(attributeValue));
                             logger.debug("New relayState '{}' for device '{}' received", relayState,
                                     getThing().getUID());
                             updateState(CHANNEL_RELAY, relayState);
                             break;
                         case "Sensor":
-                            State sensorState = "1".equals(attributeValue) ? OnOffType.OFF : OnOffType.ON;
+                            State sensorState = OnOffType.from(!"1".equals(attributeValue));
                             logger.debug("New sensorState '{}' for device '{}' received", sensorState,
                                     getThing().getUID());
                             updateState(CHANNEL_SENSOR, sensorState);
index e1bc7eb116db33d1ce3a964003c5a2ca168b9800..1219296090daf35dc19827166cdedd1124ed2a30 100644 (file)
@@ -71,7 +71,7 @@ public class WemoMotionHandler extends WemoHandler {
             String binaryState = stateMap.get("BinaryState");
             if (binaryState != null) {
                 if (oldValue == null || !oldValue.equals(binaryState)) {
-                    State state = "0".equals(binaryState) ? OnOffType.OFF : OnOffType.ON;
+                    State state = OnOffType.from(!"0".equals(binaryState));
                     logger.debug("State '{}' for device '{}' received", state, getThing().getUID());
                     updateState(WemoBindingConstants.CHANNEL_MOTION_DETECTION, state);
                     if (OnOffType.ON.equals(state)) {
index 62f283678f32feee6df4bae0f4231daaf0e73b26..30a97e21390f3793926e6680e6632703b0c0fc9a 100644 (file)
@@ -70,7 +70,7 @@ public class WemoSwitchHandler extends WemoHandler {
             String binaryState = stateMap.get("BinaryState");
             if (binaryState != null) {
                 if (oldValue == null || !oldValue.equals(binaryState)) {
-                    State state = "0".equals(binaryState) ? OnOffType.OFF : OnOffType.ON;
+                    State state = OnOffType.from(!"0".equals(binaryState));
                     logger.debug("State '{}' for device '{}' received", state, getThing().getUID());
                     updateState(WemoBindingConstants.CHANNEL_STATE, state);
                 }
index 3741f1ad519812de3ee48ba87edd1194c3ef24db..299f6f9b69389e9dd88e9fbfb8f39f4c44a22800 100644 (file)
@@ -84,7 +84,7 @@ public class LEDStateDTO {
 
     public static LEDStateDTO valueOf(int state, int program, int programSpeed, int red, int green, int blue, int white,
             int white2) {
-        OnOffType power = (state & 0x01) != 0 ? OnOffType.ON : OnOffType.OFF;
+        OnOffType power = OnOffType.from((state & 0x01) != 0);
 
         float[] hsv = new float[3];
         Color.RGBtoHSB(red, green, blue, hsv);
index 24a86673f9bada06abeb39bad837999a43c6685e..192b2b1ca8043d0d9172ca12ccb4b07bdabf58c6 100644 (file)
@@ -59,7 +59,7 @@ public final class WolfSmartsetUtils {
      * 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) {
index 81dc9642fcd1ba3878944db738cc03bf2fb3244c..60a7bc7ba20b26065495410aea21aba092625919 100644 (file)
@@ -188,10 +188,10 @@ public class YamahaBridgeHandler extends BaseBridgeHandler
         // Might be extended in the future, therefore a switch statement
         switch (channelUID.getId()) {
             case CHANNEL_POWER:
-                updateState(channelUID, systemControlState.power ? OnOffType.ON : OnOffType.OFF);
+                updateState(channelUID, OnOffType.from(systemControlState.power));
                 break;
             case CHANNEL_PARTY_MODE:
-                updateState(channelUID, systemControlState.partyMode ? OnOffType.ON : OnOffType.OFF);
+                updateState(channelUID, OnOffType.from(systemControlState.partyMode));
                 break;
             case CHANNEL_PARTY_MODE_MUTE:
             case CHANNEL_PARTY_MODE_VOLUME:
@@ -412,7 +412,7 @@ public class YamahaBridgeHandler extends BaseBridgeHandler
         boolean needsCompleteRefresh = msg.power && !systemControlState.power;
         systemControlState = msg;
 
-        updateState(CHANNEL_POWER, systemControlState.power ? OnOffType.ON : OnOffType.OFF);
+        updateState(CHANNEL_POWER, OnOffType.from(systemControlState.power));
         if (needsCompleteRefresh) {
             updateAllZoneInformation();
         }
index 011252dea6ec5ea4e5533a2f46f7fd2d9943c718..4b8fa3fb42aeca0e4fda705335897d49dfbd4a95 100644 (file)
@@ -481,14 +481,14 @@ public class YamahaZoneThingHandler extends BaseThingHandler
         String id = channelUID.getId();
 
         if (id.equals(grpZone(CHANNEL_POWER))) {
-            updateState(channelUID, zoneState.power ? OnOffType.ON : OnOffType.OFF);
+            updateState(channelUID, OnOffType.from(zoneState.power));
 
         } else if (id.equals(grpZone(CHANNEL_VOLUME_DB))) {
             updateState(channelUID, new DecimalType(zoneState.volumeDB));
         } else if (id.equals(grpZone(CHANNEL_VOLUME))) {
             updateState(channelUID, new PercentType((int) zoneConfig.getVolumePercentage(zoneState.volumeDB)));
         } else if (id.equals(grpZone(CHANNEL_MUTE))) {
-            updateState(channelUID, zoneState.mute ? OnOffType.ON : OnOffType.OFF);
+            updateState(channelUID, OnOffType.from(zoneState.mute));
         } else if (id.equals(grpZone(CHANNEL_INPUT))) {
             updateState(channelUID, new StringType(zoneState.inputID));
         } else if (id.equals(grpZone(CHANNEL_SURROUND))) {
@@ -498,9 +498,9 @@ public class YamahaZoneThingHandler extends BaseThingHandler
         } else if (id.equals(grpZone(CHANNEL_DIALOGUE_LEVEL))) {
             updateState(channelUID, new DecimalType(zoneState.dialogueLevel));
         } else if (id.equals(grpZone(CHANNEL_HDMI1OUT))) {
-            updateState(channelUID, zoneState.hdmi1Out ? OnOffType.ON : OnOffType.OFF);
+            updateState(channelUID, OnOffType.from(zoneState.hdmi1Out));
         } else if (id.equals(grpZone(CHANNEL_HDMI2OUT))) {
-            updateState(channelUID, zoneState.hdmi2Out ? OnOffType.ON : OnOffType.OFF);
+            updateState(channelUID, OnOffType.from(zoneState.hdmi2Out));
 
         } else if (id.equals(grpPlayback(CHANNEL_PLAYBACK))) {
             updateState(channelUID, new StringType(playInfoState.playbackMode));
@@ -539,15 +539,15 @@ public class YamahaZoneThingHandler extends BaseThingHandler
 
         updateStatus(ThingStatus.ONLINE);
 
-        updateState(grpZone(CHANNEL_POWER), zoneState.power ? OnOffType.ON : OnOffType.OFF);
+        updateState(grpZone(CHANNEL_POWER), OnOffType.from(zoneState.power));
         updateState(grpZone(CHANNEL_INPUT), new StringType(zoneState.inputID));
         updateState(grpZone(CHANNEL_SURROUND), new StringType(zoneState.surroundProgram));
         updateState(grpZone(CHANNEL_VOLUME_DB), new DecimalType(zoneState.volumeDB));
         updateState(grpZone(CHANNEL_VOLUME), new PercentType((int) zoneConfig.getVolumePercentage(zoneState.volumeDB)));
-        updateState(grpZone(CHANNEL_MUTE), zoneState.mute ? OnOffType.ON : OnOffType.OFF);
+        updateState(grpZone(CHANNEL_MUTE), OnOffType.from(zoneState.mute));
         updateState(grpZone(CHANNEL_DIALOGUE_LEVEL), new DecimalType(zoneState.dialogueLevel));
-        updateState(grpZone(CHANNEL_HDMI1OUT), zoneState.hdmi1Out ? OnOffType.ON : OnOffType.OFF);
-        updateState(grpZone(CHANNEL_HDMI2OUT), zoneState.hdmi2Out ? OnOffType.ON : OnOffType.OFF);
+        updateState(grpZone(CHANNEL_HDMI1OUT), OnOffType.from(zoneState.hdmi1Out));
+        updateState(grpZone(CHANNEL_HDMI2OUT), OnOffType.from(zoneState.hdmi2Out));
 
         // If the input changed
         if (inputChanged) {
index f1b0017aa8e22c77cd853cfb08740adce4e35b4c..57ee522bb853d444ea8686403fa9540292a26788 100644 (file)
@@ -54,6 +54,6 @@ public class YeelightCeilingWithAmbientHandler extends YeelightCeilingHandler {
         }
 
         updateState(YeelightBindingConstants.CHANNEL_NIGHTLIGHT,
-                (status.getActiveMode() == ActiveMode.MOONLIGHT_MODE) ? OnOffType.ON : OnOffType.OFF);
+                OnOffType.from((status.getActiveMode() == ActiveMode.MOONLIGHT_MODE)));
     }
 }
index 159fa8eefc55930013ccb18825a5a712b36cd6c2..8a387e4442abe5429761f7e29a1572117386e819 100644 (file)
@@ -35,6 +35,6 @@ public class YeelightCeilingWithNightHandler extends YeelightCeilingHandler {
         super.updateUI(status);
 
         updateState(YeelightBindingConstants.CHANNEL_NIGHTLIGHT,
-                (status.getActiveMode() == ActiveMode.MOONLIGHT_MODE) ? OnOffType.ON : OnOffType.OFF);
+                OnOffType.from((status.getActiveMode() == ActiveMode.MOONLIGHT_MODE)));
     }
 }
index b0b341b112fef713ccd1315ce5101cca76f36e7d..cabfce3ad44cd0f994d07d7af50f716be9e1722b 100644 (file)
@@ -185,7 +185,7 @@ public class ZmMonitorHandler extends BaseThingHandler {
         updateChannelState(CHANNEL_ID, new StringType(m.getId()));
         updateChannelState(CHANNEL_NAME, new StringType(m.getName()));
         updateChannelState(CHANNEL_FUNCTION, new StringType(m.getFunction()));
-        updateChannelState(CHANNEL_ENABLE, m.isEnabled() ? OnOffType.ON : OnOffType.OFF);
+        updateChannelState(CHANNEL_ENABLE, OnOffType.from(m.isEnabled()));
         updateChannelState(CHANNEL_HOUR_EVENTS, new DecimalType(m.getHourEvents()));
         updateChannelState(CHANNEL_DAY_EVENTS, new DecimalType(m.getDayEvents()));
         updateChannelState(CHANNEL_WEEK_EVENTS, new DecimalType(m.getWeekEvents()));
@@ -193,10 +193,10 @@ public class ZmMonitorHandler extends BaseThingHandler {
         updateChannelState(CHANNEL_TOTAL_EVENTS, new DecimalType(m.getTotalEvents()));
         updateChannelState(CHANNEL_IMAGE_URL, new StringType(m.getImageUrl()));
         updateChannelState(CHANNEL_VIDEO_URL, new StringType(m.getVideoUrl()));
-        updateChannelState(CHANNEL_ALARM, m.isAlarm() ? OnOffType.ON : OnOffType.OFF);
+        updateChannelState(CHANNEL_ALARM, OnOffType.from(m.isAlarm()));
         updateChannelState(CHANNEL_STATE, new StringType(m.getState().toString()));
         if (!m.isAlarm()) {
-            updateChannelState(CHANNEL_TRIGGER_ALARM, m.isAlarm() ? OnOffType.ON : OnOffType.OFF);
+            updateChannelState(CHANNEL_TRIGGER_ALARM, OnOffType.from(m.isAlarm()));
         }
         Event event = m.getMostRecentCompletedEvent();
         if (event == null) {
index a34284eadd7a6d110bb96ca8e01bd51b12e5cbf3..1bb86b73fc1a8765a2c3e3b9e791e627627baa96 100644 (file)
@@ -394,7 +394,7 @@ public abstract class AbstractHomekitAccessoryImpl implements HomekitAccessory {
             BigDecimal trueThreshold, boolean invertThreshold) throws IncompleteAccessoryException {
         final HomekitTaggedItem taggedItem = getCharacteristic(characteristicType)
                 .orElseThrow(() -> new IncompleteAccessoryException(characteristicType));
-        return new BooleanItemReader(taggedItem.getItem(), taggedItem.isInverted() ? OnOffType.OFF : OnOffType.ON,
+        return new BooleanItemReader(taggedItem.getItem(), OnOffType.from(!taggedItem.isInverted()),
                 taggedItem.isInverted() ? OpenClosedType.CLOSED : OpenClosedType.OPEN, trueThreshold, invertThreshold);
     }
 
@@ -410,7 +410,7 @@ public abstract class AbstractHomekitAccessoryImpl implements HomekitAccessory {
             throws IncompleteAccessoryException {
         final HomekitTaggedItem taggedItem = getCharacteristic(characteristicType)
                 .orElseThrow(() -> new IncompleteAccessoryException(characteristicType));
-        return new BooleanItemReader(taggedItem.getItem(), taggedItem.isInverted() ? OnOffType.OFF : OnOffType.ON,
+        return new BooleanItemReader(taggedItem.getItem(), OnOffType.from(!taggedItem.isInverted()),
                 taggedItem.isInverted() ? OpenClosedType.CLOSED : OpenClosedType.OPEN);
     }
 
index e4886776ab22fe1d3ad3fd445504fc6b7cff86ec..36e4809fd1d111214c02655920f025575ea75e0f 100644 (file)
@@ -114,7 +114,7 @@ public class BooleanItemReader {
     }
 
     private OnOffType getOffValue(OnOffType onValue) {
-        return onValue == OnOffType.ON ? OnOffType.OFF : OnOffType.ON;
+        return OnOffType.from(onValue != OnOffType.ON);
     }
 
     void setValue(Boolean value) {
index ab61a87fbbe1b47fe6e10366f880878f459f38ca..f328db3208fba3e0246c5c858b521a5bc91271dc 100644 (file)
@@ -583,7 +583,7 @@ public class HomekitCharacteristicFactory {
         BigDecimal lowThreshold = taggedItem.getConfiguration(HomekitTaggedItem.BATTERY_LOW_THRESHOLD,
                 BigDecimal.valueOf(20));
         BooleanItemReader lowBatteryReader = new BooleanItemReader(taggedItem.getItem(),
-                taggedItem.isInverted() ? OnOffType.OFF : OnOffType.ON,
+                OnOffType.from(!taggedItem.isInverted()),
                 taggedItem.isInverted() ? OpenClosedType.CLOSED : OpenClosedType.OPEN, lowThreshold, true);
         return new StatusLowBatteryCharacteristic(
                 () -> CompletableFuture.completedFuture(
@@ -1210,10 +1210,10 @@ public class HomekitCharacteristicFactory {
     private static MuteCharacteristic createMuteCharacteristic(HomekitTaggedItem taggedItem,
             HomekitAccessoryUpdater updater) {
         BooleanItemReader muteReader = new BooleanItemReader(taggedItem.getItem(),
-                taggedItem.isInverted() ? OnOffType.OFF : OnOffType.ON,
+                OnOffType.from(!taggedItem.isInverted()),
                 taggedItem.isInverted() ? OpenClosedType.CLOSED : OpenClosedType.OPEN);
         return new MuteCharacteristic(() -> CompletableFuture.completedFuture(muteReader.getValue()),
-                (value) -> taggedItem.send(value ? OnOffType.ON : OnOffType.OFF),
-                getSubscriber(taggedItem, MUTE, updater), getUnsubscriber(taggedItem, MUTE, updater));
+                (value) -> taggedItem.send(OnOffType.from(value)), getSubscriber(taggedItem, MUTE, updater),
+                getUnsubscriber(taggedItem, MUTE, updater));
     }
 }
index 0a61ab3b37a5c2d9faa4feef73ddd6e630ca019b..33aa55e39cc9914a29b3e7d6aac31eba566085f0 100644 (file)
@@ -82,7 +82,7 @@ public class HomekitIrrigationSystemImpl extends AbstractHomekitAccessoryImpl im
     @Override
     public CompletableFuture<Void> setActive(ActiveEnum value) {
         getCharacteristic(HomekitCharacteristicType.ACTIVE).ifPresent(tItem -> {
-            tItem.send(value == ActiveEnum.ACTIVE ? OnOffType.ON : OnOffType.OFF);
+            tItem.send(OnOffType.from(value == ActiveEnum.ACTIVE));
         });
         return CompletableFuture.completedFuture(null);
     }
index cf31b2e44ecac73c821ff0d39debe5c80d55cd41..fd15834dffb72016d2a636a25a83e0141818584a 100644 (file)
@@ -31,7 +31,7 @@ public class HueStatePlug extends AbstractHueState {
     }
 
     public OnOffType toOnOffType() {
-        return on ? OnOffType.ON : OnOffType.OFF;
+        return OnOffType.from(on);
     }
 
     @Override
index 83ed2ab04f3fb985fa884098ba7a0489236749b2..0ee3d2bc692a0328d8b5746b719f64b2a6abfde2 100644 (file)
@@ -421,7 +421,7 @@ public abstract class AbstractDynamoDBItem<T> implements DynamoDBItem<T> {
                         // % values have been stored as-is
                         return new PercentType(numberState);
                     } else if (item instanceof SwitchItem) {
-                        return numberState.compareTo(BigDecimal.ZERO) != 0 ? OnOffType.ON : OnOffType.OFF;
+                        return OnOffType.from(numberState.compareTo(BigDecimal.ZERO) != 0);
                     } else if (item instanceof ContactItem) {
                         return numberState.compareTo(BigDecimal.ZERO) != 0 ? OpenClosedType.OPEN
                                 : OpenClosedType.CLOSED;
index d6fb0fe55a1742803acb6d4b1ef82ad70d5acd51..f217635789ba01924c28414179c90e7bbd3b512b 100644 (file)
@@ -610,7 +610,7 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
         }
 
         if (item instanceof SwitchItem && !(item instanceof DimmerItem)) {
-            return value == 0.0d ? OnOffType.OFF : OnOffType.ON;
+            return OnOffType.from(value != 0.0d);
         } else if (item instanceof ContactItem) {
             return value == 0.0d ? OpenClosedType.CLOSED : OpenClosedType.OPEN;
         } else if (item instanceof DimmerItem || item instanceof RollershutterItem || item instanceof ColorItem) {