demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce SAT warnings (#17406)

Browse Source 
* Reduce SAT warnings

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich 2024-09-13 17:20:11 +02:00 committed by GitHub
parent 2d61ffc409
commit 54fd13b0c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
107 changed files with 146 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.airgradient/src/main/java/org/openhab/binding/airgradient/internal/handler/DynamicChannelHelper.java
View File

@ -38,7 +38,7 @@ public class DynamicChannelHelper {
private record ConfigurationChannel(String id, String typeId, String itemType) {
}
private final static List<ConfigurationChannel> channels = new ArrayList<ConfigurationChannel>() {
private static final List<ConfigurationChannel> CHANNELS = new ArrayList<ConfigurationChannel>() {
{
add(new ConfigurationChannel(CHANNEL_COUNTRY_CODE, CHANNEL_COUNTRY_CODE, "String"));
add(new ConfigurationChannel(CHANNEL_PM_STANDARD, CHANNEL_PM_STANDARD, "String"));
@ -58,10 +58,10 @@ public class DynamicChannelHelper {
}
};
private final static Logger logger = LoggerFactory.getLogger(DynamicChannelHelper.class);
private static final Logger logger = LoggerFactory.getLogger(DynamicChannelHelper.class);
public static ThingBuilder updateThingWithConfigurationChannels(Thing thing, ThingBuilder builder) {
for (ConfigurationChannel channel : channels) {
for (ConfigurationChannel channel : CHANNELS) {
addLocalConfigurationChannel(thing, builder, channel);
}

7
bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/SunHandler.java
View File

@ -21,7 +21,12 @@ import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.astro.internal.calc.SunCalc;
import org.openhab.binding.astro.internal.job.DailyJobSun;
import org.openhab.binding.astro.internal.job.Job;
import org.openhab.binding.astro.internal.model.*;
import org.openhab.binding.astro.internal.model.Planet;
import org.openhab.binding.astro.internal.model.Position;
import org.openhab.binding.astro.internal.model.Radiation;
import org.openhab.binding.astro.internal.model.Range;
import org.openhab.binding.astro.internal.model.Sun;
import org.openhab.binding.astro.internal.model.SunPhaseName;
import org.openhab.core.i18n.TimeZoneProvider;
import org.openhab.core.scheduler.CronScheduler;
import org.openhab.core.thing.Thing;

1
bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBridgeHandler.java
View File

@ -207,7 +207,6 @@ public class AwattarBridgeHandler extends BaseBridgeHandler {
// refresh then every 3 hours, if the last refresh was more than an hour ago
if (now.getHour() % 3 == 0 && lastRefresh.getEpochSecond() < now.minusHours(1).toEpochSecond()) {
// update the last refresh time
lastRefresh = Instant.now();

1
bundles/org.openhab.binding.awattar/src/test/java/org/openhab/binding/awattar/internal/handler/AwattarBridgeHandlerRefreshTest.java
View File

@ -73,7 +73,6 @@ class AwattarBridgeHandlerRefreshTest extends JavaTest {
@BeforeEach
public void setUp() throws IllegalArgumentException, IllegalAccessException {
when(timeZoneProviderMock.getTimeZone()).thenReturn(ZoneId.of("GMT+2"));
when(bridgeMock.getUID()).thenReturn(BRIDGE_UID);

1
bundles/org.openhab.binding.awattar/src/test/java/org/openhab/binding/awattar/internal/handler/AwattarBridgeHandlerTest.java
View File

@ -95,7 +95,6 @@ public class AwattarBridgeHandlerTest extends JavaTest {
@BeforeEach
public void setUp() throws IOException, IllegalArgumentException, IllegalAccessException, AwattarApiException {
// mock the API response
try (InputStream inputStream = AwattarBridgeHandlerTest.class.getResourceAsStream("api_response.json")) {
SortedSet<AwattarPrice> result = new TreeSet<>(Comparator.comparing(AwattarPrice::timerange));

2
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveGen1Handler.java
View File

@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
* The {@link AirthingsWaveGen1Handler} is responsible for handling commands, which are
* sent to one of the channels.
*
* @author Davy Wong - Added Airthings Wave Gen 1 support
* @author Davy Wong - initial contribution, added Airthings Wave Gen 1 support
*/
@NonNullByDefault
public class AirthingsWaveGen1Handler extends AbstractAirthingsHandler {

1
bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/MadokaValue.java
View File

@ -91,7 +91,6 @@ public class MadokaValue {
// unsupported
break;
}
}
return 0;
}

10
bundles/org.openhab.binding.bluetooth.generic/src/main/java/org/openhab/binding/bluetooth/generic/internal/BluetoothChannelUtils.java
View File

@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
/**
* The {@link BluetoothChannelUtils} contains utility functions used by the GattChannelHandler
*
* @author Vlad Kolotov - Original author
* @author Vlad Kolotov - Initial contribution
* @author Connor Petty - Modified for openHAB use
*/
@NonNullByDefault
@ -75,11 +75,11 @@ public class BluetoothChannelUtils {
case SINT:
case FLOAT_IEE754:
case FLOAT_IEE11073:
BluetoothUnit unit = BluetoothUnit.findByType(field.getUnit());
if (unit != null) {
// BluetoothUnit unit = BluetoothUnit.findByType(field.getUnit());
// if (unit != null) {
// TODO
// return "Number:" + unit.getUnit().getDimension();
}
// }
return "Number";
case UTF8S:
case UTF16S:
@ -208,7 +208,7 @@ public class BluetoothChannelUtils {
if (decimalType != null) {
try {
return field.getEnumeration(new BigInteger(decimalType.toString()));
} catch (NumberFormatException ex) {
} catch (NumberFormatException ignored) {
// do nothing
}
}

2
bundles/org.openhab.binding.bluetooth.generic/src/main/java/org/openhab/binding/bluetooth/generic/internal/CharacteristicChannelTypeProvider.java
View File

@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
/**
* {@link CharacteristicChannelTypeProvider} that provides channel types for dynamically discovered characteristics.
*
* @author Vlad Kolotov - Original author
* @author Vlad Kolotov - Initial contribution
* @author Connor Petty - Modified for openHAB use.
*/
@NonNullByDefault

2
bundles/org.openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java
View File

@ -47,7 +47,7 @@ import gnu.io.UnsupportedCommOperationException;
* Driver for the CM11 X10 interface.
*
*
* @author Anthony Green - Original code
* @author Anthony Green - Initial contribution
* @author Bob Raker - updates to setClock code, adapted code for use in openHAB2
* @see <a href="http://www.heyu.org/docs/protocol.txt">CM11 Protocol specification</a>
* @see <a href="http://www.rxtx.org">RXTX Serial API for Java</a>

1
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/discovery/SceneDiscoveryService.java
View File

@ -113,7 +113,6 @@ public class SceneDiscoveryService extends AbstractDiscoveryService {
.withBridge(bridgeUID).withLabel(scene.getSceneName()).build();
thingDiscovered(discoveryResult);
} else {
logger.debug("discovered unsupported scene: name '{}' with id {}", scene.getSceneName(),
scene.getID());

4
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/CircuitHandler.java
View File

@ -47,8 +47,8 @@ import org.slf4j.LoggerFactory;
* For that it uses the {@link BridgeHandler} to register this class as a {@link DeviceStatusListener} to get informed
* about changes from the accompanying {@link Circuit}.
*
* @author Michael Ochel
* @author Matthias Siegele
* @author Michael Ochel - Initial contribution
* @author Matthias Siegele - Initial contribution
*/
public class CircuitHandler extends BaseThingHandler implements DeviceStatusListener {

4
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/constants/JSONApiResponseKeysEnum.java
View File

@ -16,8 +16,8 @@ package org.openhab.binding.digitalstrom.internal.lib.serverconnection.constants
* The {@link JSONApiResponseKeysEnum} contains digitalSTROM-JSON response keys.
*
* @author Alexander Betker - Initial contribution
* @author Michael Ochel completely changed and updated only methods remained
* @author Matthias Siegele completely changed and updated only methods remained
* @author Michael Ochel - completely changed and updated only methods remained
* @author Matthias Siegele - completely changed and updated only methods remained
*/
public enum JSONApiResponseKeysEnum {

4
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/ControllerHandler.java
View File

@ -112,7 +112,7 @@ public class ControllerHandler extends DraytonWiserThingHandler<ControllerData>
}
private State getHeatChannel1Demand() {
return getData().heatingChannels.size() >= 1
return !getData().heatingChannels.isEmpty()
? new QuantityType<>(getData().heatingChannels.get(0).getPercentageDemand(), Units.PERCENT)
: UnDefType.UNDEF;
}
@ -124,7 +124,7 @@ public class ControllerHandler extends DraytonWiserThingHandler<ControllerData>
}
private State getHeatChannel1DemandState() {
return OnOffType.from(getData().heatingChannels.size() >= 1
return OnOffType.from(!getData().heatingChannels.isEmpty()
&& "ON".equalsIgnoreCase(getData().heatingChannels.get(0).getHeatingRelayState()));
}

4
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
View File

@ -110,7 +110,7 @@ public class HotWaterHandler extends DraytonWiserThingHandler<HotWaterData> {
}
private State getBoostedState() {
if (getData().hotWater.size() >= 1) {
if (!getData().hotWater.isEmpty()) {
final HotWaterDTO firstChannel = getData().hotWater.get(0);
if (firstChannel.getOverrideTimeoutUnixTime() != null
@ -125,7 +125,7 @@ public class HotWaterHandler extends DraytonWiserThingHandler<HotWaterData> {
}
private State getBoostRemainingState() {
if (getData().hotWater.size() >= 1) {
if (!getData().hotWater.isEmpty()) {
final HotWaterDTO firstChannel = getData().hotWater.get(0);
final Integer overrideTimeout = firstChannel.getOverrideTimeoutUnixTime();

1
bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/model/GenericResponseTransformer.java
View File

@ -121,7 +121,6 @@ public class GenericResponseTransformer {
// call the custom handler to handle specific / composite channels which do not map 1:1 to JSON
// fields.
result.putAll(customResponseTransformer.transform(channel, value, jsonData));
} catch (NumberFormatException | DateTimeParseException ex) {
logger.warn("caught exception while parsing data for channel {} (value '{}'). Exception: {}",
channel.getUID().getId(), value, ex.getMessage());

1
bundles/org.openhab.binding.emotiva/src/main/java/org/openhab/binding/emotiva/internal/EmotivaProcessorHandler.java
View File

@ -328,7 +328,6 @@ public class EmotivaProcessorHandler extends BaseThingHandler {
if (object instanceof EmotivaAckDTO answerDto) {
// Currently not supported to revert a failed command update, just used for logging for now.
logger.trace("Processing received '{}' with '{}'", EmotivaAckDTO.class.getSimpleName(), answerDto);
} else if (object instanceof EmotivaBarNotifyWrapper answerDto) {
logger.trace("Processing received '{}' with '{}'", EmotivaBarNotifyWrapper.class.getSimpleName(),
emotivaUdpResponse.answer());

4
bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml
View File

@ -438,14 +438,14 @@
</channel-type>
<channel-type id="autoOFF" advanced="true">
<item-type>Number:Duration</item-type>
<item-type>Number:Time</item-type>
<label>Auto Off</label>
<description>Automatically switch to off</description>
<state pattern="%d %unit%"/>
</channel-type>
<channel-type id="delayRadioOFF" advanced="true">
<item-type>Number:Duration</item-type>
<item-type>Number:Time</item-type>
<label>Delay Radio Off</label>
<description>Delay switch off by radio for given seconds</description>
<state pattern="%d %unit%"/>

1
bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/handler/EnvoyEntrezConnector.java
View File

@ -79,7 +79,6 @@ public class EnvoyEntrezConnector extends EnvoyConnector {
check(configuration.password, "Password parameter is empty"),
check(configuration.siteName, "siteName parameter is empty"))
.filter(s -> !s.isEmpty()).collect(Collectors.joining(", "));
}
if (!message.isEmpty()) {
return message;

4
bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/radio/FrontierSiliconRadio.java
View File

@ -22,8 +22,8 @@ import org.eclipse.jetty.client.HttpClient;
* Class representing an internet radio based on the frontier silicon chipset. Tested with "hama IR110" and Medion
* MD87180" internet radios.
*
* @author Rainer Ostendorf
* @author Patrick Koenemann
* @author Rainer Ostendorf - Initial contribution
* @author Patrick Koenemann - improvements
* @author Mihaela Memova - removed duplicated check for the percent value range
*/
public class FrontierSiliconRadio {

4
bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/radio/FrontierSiliconRadioApiResult.java
View File

@ -43,8 +43,8 @@ import org.xml.sax.SAXException;
*
* This class parses this XML data and provides functions for reading and casting typical fields.
*
* @author Rainer Ostendorf
* @author Patrick Koenemann
* @author Rainer Ostendorf - Initial contribution
* @author Patrick Koenemann - Improvements
*
*/
public class FrontierSiliconRadioApiResult {

5
bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/radio/FrontierSiliconRadioConnection.java
View File

@ -26,8 +26,8 @@ import org.slf4j.LoggerFactory;
/**
* This class holds the http-connection and session information for controlling the radio.
*
* @author Rainer Ostendorf
* @author Patrick Koenemann
* @author Rainer Ostendorf - Initial contribution
* @author Patrick Koenemann - improvements
* @author Svilen Valkanov - replaced Apache HttpClient with Jetty
* @author Mihaela Memova - changed the calling of the stopHttpClient() method, fixed the hardcoded URL path, fixed the
* for loop condition part
@ -110,7 +110,6 @@ public class FrontierSiliconRadioConnection {
isLoggedIn = true;
return true; // login successful :-)
}
} catch (Exception e) {
logger.debug("Fatal transport error: {}", e.toString());
throw new IOException(e);

2
bundles/org.openhab.binding.fsinternetradio/src/main/java/org/openhab/binding/fsinternetradio/internal/radio/FrontierSiliconRadioConstants.java
View File

@ -15,7 +15,7 @@ package org.openhab.binding.fsinternetradio.internal.radio;
/**
* Internal constants for the frontier silicon radio.
*
* @author Markus Rathgeb - Moved the constants to separate class
* @author Markus Rathgeb - Initial contribution, moved the constants to separate class
*/
public class FrontierSiliconRadioConstants {

2
bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
View File

@ -154,7 +154,6 @@ public class GroupePSAHandler extends BaseThingHandler {
this.onlineIntervalM = onlineIntervalM != null ? onlineIntervalM : DEFAULT_ONLINE_INTERVAL_M;
startGroupePSAPolling(pollingIntervalM);
}
} else {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_UNINITIALIZED);
}
@ -359,7 +358,6 @@ public class GroupePSAHandler extends BaseThingHandler {
Charging::getRemainingTime, x -> new BigDecimal(x.getSeconds()), Units.SECOND);
updateState(CHANNEL_ELECTRIC_CHARGING_NEXTDELAYEDTIME, energy, Energy::getCharging,
Charging::getNextDelayedTime, x -> new BigDecimal(x.getSeconds()), Units.SECOND);
}
}
}

1
bundles/org.openhab.binding.growatt/src/main/java/org/openhab/binding/growatt/internal/cloud/GrowattCloud.java
View File

@ -508,7 +508,6 @@ public class GrowattCloud implements AutoCloseable {
DeviceType deviceType = getDeviceTypeChecked(deviceId);
switch (deviceType) {
case MIX:
case SPA:
setTimeProgram(deviceId, deviceType,

2
bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/common/AuthenticationHandler.java
View File

@ -23,7 +23,7 @@ import org.openhab.core.i18n.ConfigurationException;
/**
* Handles the authentication to Homematic server.
*
* @author Christian Kittel
* @author Christian Kittel - Initial contribution
*/
@NonNullByDefault
public class AuthenticationHandler {

1
bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/discovery/HomematicDeviceDiscoveryService.java
View File

@ -123,7 +123,6 @@ public class HomematicDeviceDiscoveryService
thingHandler.getGateway().setInstallMode(false, 0);
}
}
} catch (Exception ex) {
logger.warn("Failed to disable Homematic controller's install mode", ex);
}

2
bundles/org.openhab.binding.homewizard/src/main/java/org/openhab/binding/homewizard/internal/HomeWizardDeviceHandler.java
View File

@ -103,7 +103,7 @@ public abstract class HomeWizardDeviceHandler extends BaseThingHandler {
*
* @param payload The data parsed from the data Json file
*/
abstract protected void handleDataPayload(DataPayload payload);
protected abstract void handleDataPayload(DataPayload payload);
/**
*

2
bundles/org.openhab.binding.homewizard/src/main/java/org/openhab/binding/homewizard/internal/HomeWizardStatefulDeviceHandler.java
View File

@ -47,7 +47,7 @@ public abstract class HomeWizardStatefulDeviceHandler extends HomeWizardDeviceHa
*
* @param payload The data parsed from the state Json file
*/
abstract protected void handleStatePayload(StatePayload payload);
protected abstract void handleStatePayload(StatePayload payload);
protected void pollState() {
final String stateResult;

3
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java
View File

@ -119,7 +119,7 @@ public class Clip2BridgeHandler extends BaseBridgeHandler {
private final Bundle bundle;
private final LocaleProvider localeProvider;
private final TranslationProvider translationProvider;
private final Map<String, Resource> automationsCache = new ConcurrentHashMap<>();;
private final Map<String, Resource> automationsCache = new ConcurrentHashMap<>();
private final Set<String> automationScriptIds = ConcurrentHashMap.newKeySet();
private final ChannelGroupUID automationChannelGroupUID;
@ -853,7 +853,6 @@ public class Clip2BridgeHandler extends BaseBridgeHandler {
Resource cachedAutomation = automationsCache.get(automation.getId());
return Objects.isNull(cachedAutomation) || !automation.getName().equals(cachedAutomation.getName());
})) {
synchronized (automationsCache) {
automationsCache.clear();
automationsCache.putAll(automations.stream().collect(Collectors.toMap(a -> a.getId(), a -> a)));

1
bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java
View File

@ -140,7 +140,6 @@ public class ICloudDeviceHandler extends BaseThingHandler implements ICloudDevic
if (channelId.equals(FIND_MY_PHONE)) {
if (command == OnOffType.ON) {
try {
if (deviceInformationRecord == null) {
this.logger
.debug("Can't send Find My Device request, because deviceInformationRecord is null!");

1
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/profiles/PushButtonToCommandProfile.java
View File

@ -117,7 +117,6 @@ public class PushButtonToCommandProfile implements TriggerProfile {
logger.warn("Parameter '{}' is not a valid command type, using default value '{}'", param, defValue);
retval = defValue;
}
} else {
logger.debug("Parameter '{}' is not of type String, using default value '{}'", param, defValue);
retval = defValue;

1
bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/Port.java
View File

@ -444,7 +444,6 @@ public class Port {
logger.trace("retransmitting msg: {}", msg);
ioStream.write(msg.getData());
}
}
// if rate limited, need to sleep now.
if (msg.getQuietTime() > 0) {

2
bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/Channels.xml
View File

@ -819,7 +819,7 @@
<state readOnly="true" pattern="%.0f %unit%"/>
</channel-type>
<channel-type id="device-local-battery-voltage">
<item-type>Number:ElectricalPotential</item-type>
<item-type>Number:ElectricPotential</item-type>
<label>Battery Voltage</label>
<description>Current battery voltage</description>
<category>Energy</category>

2
bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
View File

@ -194,7 +194,7 @@ public class CloudConnector {
try {
JsonObject homelistInfo = cl.getHomeList(country.trim().toLowerCase());
final HomeListDTO homelist = GSON.fromJson(homelistInfo, HomeListDTO.class);
if (homelist != null && homelist.getHomelist() != null && homelist.getHomelist().size() > 0) {
if (homelist != null && homelist.getHomelist() != null && !homelist.getHomelist().isEmpty()) {
homeLists.put(country, homelist);
}
} catch (JsonSyntaxException e) {

1
bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
View File

@ -323,7 +323,6 @@ public class ModbusDataThingHandler extends BaseThingHandler {
int writeStartRelative = writeStart - pollStart;
data = new ModbusRegisterArray(allMutatedBytes[writeStartRelative * 2],
allMutatedBytes[writeStartRelative * 2 + 1]);
} else {
data = ModbusBitUtilities.commandToRegisters(transformedCommand, writeValueType);
}

1
bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfile.java
View File

@ -157,7 +157,6 @@ public class ModbusGainOffsetProfile<Q extends Quantity<Q>> implements StateProf
result = applyGainTowardsItem(offsetted, gain);
} else {
result = applyGainTowardsHandler(quantityState, gain).subtract(pregainOffsetQt);
}
} catch (UnconvertibleException | UnsupportedOperationException e) {
logger.warn(

1
bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/ChannelState.java
View File

@ -364,7 +364,6 @@ public class ChannelState implements MqttMessageSubscriber {
// Only pass numeric value for QuantityType.
if (mqttCommandValue instanceof QuantityType<?> qtCommandValue) {
cValue = new DecimalType(qtCommandValue.toBigDecimal());
}
String commandString = mqttFormatter.getMQTTpublishValue(cValue, "%s");
Optional<String> transformedValue = outgoingTransformation.apply(commandString);

1
bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/java/org/openhab/binding/mqtt/ruuvigateway/internal/parser/GatewayPayloadParser.java
View File

@ -114,7 +114,6 @@ public class GatewayPayloadParser {
// below
// The payload length (might depend on format version ) is validated by parser.parse call
throw new IllegalArgumentException("Manufacturerer data is too short");
}
if ((bytes[4] & 0xff) != 0xff) {
logger.debug("Data is not representing manufacturer specific bluetooth advertisement: {}",

2
bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/auth/MyBMWTokenController.java
View File

@ -291,7 +291,7 @@ public class MyBMWTokenController {
UrlEncoded.decodeTo(encodedUrl, tokenMap, StandardCharsets.US_ASCII);
final StringBuilder codeFound = new StringBuilder();
tokenMap.forEach((key, value) -> {
if (value.size() > 0) {
if (!value.isEmpty()) {
String val = value.get(0);
if (key.endsWith(CODE) && (val != null)) {
codeFound.append(val.toString());

1
bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/utils/Utils.java
View File

@ -51,7 +51,6 @@ public class Utils {
int button = (address >> 21) & 0x07;
return leftPadWithZeros(Integer.toHexString(nikobusAddress), 6) + ":" + mapButton(button);
} catch (NumberFormatException e) {
return "[" + addressString + "]";
}

1
bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/api/NapierCityCouncil.java
View File

@ -48,7 +48,6 @@ public class NapierCityCouncil implements WaterWebService {
switch (region.toLowerCase()) {
case "napier":
return HOSTNAME + REGION_NAPIER;
}
return "";
}

4
bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV100.java
View File

@ -382,7 +382,7 @@ class OpenSprinklerHttpApiV100 implements OpenSprinklerApi {
ContentResponse response = null;
int retriesLeft = Math.max(1, config.retry);
boolean connectionSuccess = false;
while (connectionSuccess == false && retriesLeft > 0) {
while (!connectionSuccess && retriesLeft > 0) {
retriesLeft--;
try {
response = withGeneralProperties(httpClient.newRequest(location))
@ -393,7 +393,7 @@ class OpenSprinklerHttpApiV100 implements OpenSprinklerApi {
e.getMessage());
}
}
if (connectionSuccess == false) {
if (!connectionSuccess) {
throw new CommunicationApiException("Request to OpenSprinkler device failed");
}
if (response != null && response.getStatus() != HTTP_OK_CODE) {

1
bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCHandler.java
View File

@ -79,7 +79,6 @@ public class PHCHandler extends BaseThingHandler {
times[1] = (short) (((BigDecimal) getConfig().get(UP_DOWN_TIME_2)).shortValue() * 10);
times[2] = (short) (((BigDecimal) getConfig().get(UP_DOWN_TIME_3)).shortValue() * 10);
times[3] = (short) (((BigDecimal) getConfig().get(UP_DOWN_TIME_4)).shortValue() * 10);
} else if (getThing().getThingTypeUID().equals(THING_TYPE_DIM)) {
times[0] = (((BigDecimal) getConfig().get(DIM_TIME_1)).shortValue());
times[1] = (((BigDecimal) getConfig().get(DIM_TIME_2)).shortValue());

1
bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/PilightConnector.java
View File

@ -137,7 +137,6 @@ public class PilightConnector implements Runnable, Closeable {
connect();
}
}
} catch (InterruptedException e) {
logger.debug("Interrupting thread.");
Thread.currentThread().interrupt();

1
bundles/org.openhab.binding.pioneeravr/src/main/java/org/openhab/binding/pioneeravr/internal/protocol/serial/SerialAvrConnection.java
View File

@ -59,7 +59,6 @@ public class SerialAvrConnection extends StreamAvrConnection {
.collect(Collectors.joining(", "));
throw new IOException(
"Serial port with name " + portName + " does not exist. Available port names: " + availablePorts);
}
try {

1
bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/QbusBridgeHandler.java
View File

@ -123,7 +123,6 @@ public class QbusBridgeHandler extends BaseBridgeHandler {
bridgePending("Waiting for Qbus client to come online");
return;
}
}
}
}

4
bundles/org.openhab.binding.qbus/src/main/java/org/openhab/binding/qbus/internal/protocol/QbusCommunication.java
View File

@ -244,7 +244,6 @@ public final class QbusCommunication extends BaseThingHandler {
try {
while (!Thread.currentThread().isInterrupted() && ((qMessage = reader.readLine()) != null)) {
readMessage(qMessage);
}
} catch (IOException e) {
if (!listenerStopped) {
@ -301,7 +300,6 @@ public final class QbusCommunication extends BaseThingHandler {
}
if ((writer == null) || (writer.checkError())) {
logger.warn("Error resending message");
}
}
}
@ -551,7 +549,6 @@ public final class QbusCommunication extends BaseThingHandler {
throw new IOException("Cannot read from socket, reader not connected.");
}
readMessage(reader.readLine());
} else {
QbusBridgeHandler handler = bridgeCallBack;
if (handler != null) {
@ -584,7 +581,6 @@ public final class QbusCommunication extends BaseThingHandler {
if (handler != null) {
handler.bridgeOnline();
}
} else {
if (handler != null) {
handler.bridgeOffline(ThingStatusDetail.CONFIGURATION_ERROR, "No serial nr defined");

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComEnergyMessage.java
View File

@ -29,7 +29,7 @@ import org.openhab.core.types.Type;
* RFXCOM data class for energy message.
*
* @author Unknown - Initial contribution
* @author Pauli Anttila
* @author Pauli Anttila - Migrated to OH2
*/
public class RFXComEnergyMessage extends RFXComBatteryDeviceMessage<RFXComEnergyMessage.SubType> {

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComInterfaceControlMessage.java
View File

@ -19,7 +19,7 @@ import org.openhab.core.types.Type;
* RFXCOM data class for control message.
*
* @author Pauli Anttila - Initial contribution
* @author Mike Jagdis
* @author Mike Jagdis - Improvements
*/
public class RFXComInterfaceControlMessage extends RFXComBaseMessage {
private byte[] data = new byte[14];

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting1Message.java
View File

@ -33,7 +33,7 @@ import org.openhab.core.types.UnDefType;
* RFXCOM data class for lighting1 message. See X10, ARC, etc..
*
* @author Evert van Es, Cycling Engineer - Initial contribution
* @author Pauli Anttila
* @author Pauli Anttila - Migrated to OH2
*/
public class RFXComLighting1Message extends RFXComDeviceMessageImpl<RFXComLighting1Message.SubType> {

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting5Message.java
View File

@ -41,7 +41,7 @@ import org.openhab.core.types.UnDefType;
* RFXCOM data class for lighting5 message.
*
* @author Paul Hampson, Neil Renaud - Initial contribution
* @author Pauli Anttila
* @author Pauli Anttila - Migrated to OH2
* @author Martin van Wingerden - added support for IT and some other subtypes
*/
public class RFXComLighting5Message extends RFXComDeviceMessageImpl<RFXComLighting5Message.SubType> {

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComRawMessage.java
View File

@ -37,7 +37,7 @@ import org.openhab.core.util.HexUtils;
/**
* RFXCOM data class for raw messages.
*
* @author James Hewitt-Thomas - New addition to the PRO RFXCom firmware
* @author James Hewitt-Thomas - Initial contribution, new addition to the PRO RFXCom firmware
*/
public class RFXComRawMessage extends RFXComDeviceMessageImpl<RFXComRawMessage.SubType> {

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComSecurity1Message.java
View File

@ -32,7 +32,7 @@ import org.openhab.core.types.Type;
* (i.e. X10 Security, Visonic PowerCode, Meiantech, etc.)
*
* @author David Kalff - Initial contribution
* @author Pauli Anttila
* @author Pauli Anttila - Improvements
*/
public class RFXComSecurity1Message extends RFXComBatteryDeviceMessage<RFXComSecurity1Message.SubType> {

2
bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComUVMessage.java
View File

@ -29,7 +29,7 @@ import org.openhab.core.types.UnDefType;
/**
* RFXCOM data class for UV and temperature message.
*
* @author Damien Servant - OpenHAB1 version
* @author Damien Servant - Initial contribution, OpenHAB1 version
* @author Mike Jagdis - Initial contribution, OpenHAB2 version
*/
public class RFXComUVMessage extends RFXComBatteryDeviceMessage<RFXComUVMessage.SubType> {

2
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRawMessageTest.java
View File

@ -30,7 +30,7 @@ import org.openhab.core.util.HexUtils;
/**
* Test for RFXCom-binding
*
* @author James Hewitt-Thomas - New addition to the PRO RFXCom firmware
* @author James Hewitt-Thomas - Initial contribution, new addition to the PRO RFXCom firmware
*/
@NonNullByDefault
public class RFXComRawMessageTest {

2
bundles/org.openhab.binding.rme/src/main/java/org/openhab/binding/rme/internal/handler/SerialThingHandler.java
View File

@ -173,7 +173,6 @@ public abstract class SerialThingHandler extends BaseThingHandler implements Ser
availablePorts);
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, description);
return;
}
// initialize serial port
@ -322,7 +321,6 @@ public abstract class SerialThingHandler extends BaseThingHandler implements Ser
Thread.sleep(sleep);
} catch (InterruptedException e) {
}
}
} catch (InterruptedIOException e) {
Thread.currentThread().interrupt();

5
bundles/org.openhab.binding.salus/src/main/resources/OH-INF/thing/aws-salus-bridge.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="salus"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0
org.eclipse.smarthome.thing-description.xsd">
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<bridge-type id="salus-aws-bridge">
<label>AWS Salus Cloud</label>

5
bundles/org.openhab.binding.salus/src/main/resources/OH-INF/thing/salus-bridge.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="salus"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0
org.eclipse.smarthome.thing-description.xsd">
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<bridge-type id="salus-cloud-bridge">
<label>Salus Cloud</label>

2
bundles/org.openhab.binding.salus/src/main/resources/OH-INF/thing/thing-types.xml
View File

@ -84,7 +84,7 @@
<state readOnly="true"/>
</channel-type>
<channel-type id="generic-input-number-channel">
<item-type>Number:Dimensionsless</item-type>
<item-type>Number:Dimensionless</item-type>
<label>Generic Number Input</label>
<description>
This channel type represents a generic input.

33
bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java
View File

@ -86,7 +86,7 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen
private static final String HTTP_ENDPOINT_V2 = "/api/v2/";
// common Samsung TV remote control ports
private final static List<Integer> PORTS = List.of(55000, 1515, 7001, 15500);
private static final List<Integer> PORTS = List.of(55000, 1515, 7001, 15500);
private final Logger logger = LoggerFactory.getLogger(SamsungTvHandler.class);
@ -120,13 +120,13 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen
@NonNullByDefault({})
public class TVProperties {
class Device {
boolean FrameTVSupport;
boolean GamePadSupport;
boolean ImeSyncedSupport;
String OS;
String PowerState;
boolean TokenAuthSupport;
boolean VoiceSupport;
boolean frameTVSupport;
boolean gamePadSupport;
boolean imeSyncedSupport;
String oS;
String powerState;
boolean tokenAuthSupport;
boolean voiceSupport;
String countryCode;
String description;
String firmwareVersion;
@ -143,22 +143,22 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen
String isSupport;
public boolean getFrameTVSupport() {
return Optional.ofNullable(device).map(a -> a.FrameTVSupport).orElse(false);
return Optional.ofNullable(device).map(a -> a.frameTVSupport).orElse(false);
}
public boolean getTokenAuthSupport() {
return Optional.ofNullable(device).map(a -> a.TokenAuthSupport).orElse(false);
return Optional.ofNullable(device).map(a -> a.tokenAuthSupport).orElse(false);
}
public String getPowerState() {
if (!getOS().isBlank()) {
return Optional.ofNullable(device).map(a -> a.PowerState).orElse("on");
return Optional.ofNullable(device).map(a -> a.powerState).orElse("on");
}
return "off";
}
public String getOS() {
return Optional.ofNullable(device).map(a -> a.OS).orElse("");
return Optional.ofNullable(device).map(a -> a.oS).orElse("");
}
public String getWifiMac() {
@ -347,10 +347,10 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen
public String fetchPowerState() {
logger.trace("{}: fetching TV Power State", host);
TVProperties properties = fetchTVProperties(0, 2);
String PowerState = properties.getPowerState();
setPowerState("on".equals(PowerState));
logger.debug("{}: PowerState is: {}", host, PowerState);
return PowerState;
String powerState = properties.getPowerState();
setPowerState("on".equals(powerState));
logger.debug("{}: PowerState is: {}", host, powerState);
return powerState;
}
public boolean handleCommand(String channel, Command command, int ms) {
@ -638,7 +638,6 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen
* @return true if service restated or created, false otherwise
*/
private synchronized boolean createService(String type, String udn) {
Optional<SamsungTvService> service = findServiceInstance(type);
if (service.isPresent()) {

1
bundles/org.openhab.binding.sensibo/src/test/java/org/openhab/binding/sensibo/internal/SensiboModelTest.java
View File

@ -32,7 +32,6 @@ public class SensiboModelTest {
@Test
public void testCaseInsensitiveMacAddress() throws IOException {
final PodDetailsDTO rsp = wireHelper.deSerializeResponse("/get_pod_details_response.json", PodDetailsDTO.class);
SensiboSky sky = new SensiboSky(rsp);

1
bundles/org.openhab.binding.sensorcommunity/src/main/java/org/openhab/binding/sensorcommunity/internal/handler/HTTPHandler.java
View File

@ -73,7 +73,6 @@ public class HTTPHandler {
}
callback.onError(Objects.requireNonNullElse(failure, "Unknown error"));
} else {
callback.onResponse(Objects.requireNonNull(getContentAsString()));
}
}

7
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/TimeOfDayTypeConverter.java
View File

@ -73,8 +73,7 @@ public class TimeOfDayTypeConverter extends AbstractTypeConverter {
if ("----".equals(value.getAsString())) {
return new DateTimeType(ZonedDateTime.now(this.timeZoneProvider.getTimeZone()));
} else {
if (unit.equals("h:m")) {
if ("h:m".equals(unit)) {
String st = value.getAsString();
String[] parts = st.split(":");
int h = Integer.parseInt(parts[0]);
@ -83,7 +82,7 @@ public class TimeOfDayTypeConverter extends AbstractTypeConverter {
Unit<Time> targetUnit = Units.MINUTE;
return new QuantityType<>(h * 60 + m, targetUnit);
} else if (unit.equals("m:s")) {
} else if ("m:s".equals(unit)) {
String st = value.getAsString();
String[] parts = st.split(":");
int m = Integer.parseInt(parts[0]);
@ -92,7 +91,7 @@ public class TimeOfDayTypeConverter extends AbstractTypeConverter {
Unit<Time> targetUnit = Units.SECOND;
return new QuantityType<>(m * 60 + s, targetUnit);
} else if (unit.equals("h")) {
} else if ("h".equals(unit)) {
int val = Integer.parseInt(value.getAsString());
Unit<Time> targetUnit = Units.HOUR;

1
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/handler/SiemensHvacBridgeThingHandler.java
View File

@ -129,7 +129,6 @@ public class SiemensHvacBridgeThingHandler extends BaseBridgeHandler {
return df.format(dt);
}
}
} catch (Exception ex) {
}
return "unknown";

2
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/handler/SiemensHvacHandlerImpl.java
View File

@ -253,7 +253,6 @@ public class SiemensHvacHandlerImpl extends BaseThingHandler {
} catch (ConverterException ex) {
logger.warn("{}, for uid: {}, please check the item type", ex.getMessage(), uid);
}
}
}
@ -336,7 +335,6 @@ public class SiemensHvacHandlerImpl extends BaseThingHandler {
logger.trace("Write request response: {} ", response);
}
} else {
logger.debug("Failed to get converted state from datapoint '{}'", dp);
}

1
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/metadata/SiemensHvacMetadataDataPoint.java
View File

@ -186,7 +186,6 @@ public class SiemensHvacMetadataDataPoint extends SiemensHvacMetadata {
detailsResolved = true;
return;
}
}
if (desc != null) {

15
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/metadata/SiemensHvacMetadataRegistryImpl.java
View File

@ -431,9 +431,7 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
for (SiemensHvacMetadata child : childs) {
generateThingsType(child, groupTypes, menu);
}
}
}
tt = createThingType(device, groupTypes);
@ -511,7 +509,6 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
groupTypes.add(groupType);
}
}
}
}
@ -819,7 +816,6 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
}
idx++;
}
}
}
@ -839,10 +835,7 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
lcHvacConnector.resetSessionId(null, false);
lcHvacConnector.resetSessionId(null, true);
}
} catch (
Exception e) {
} catch (Exception e) {
logger.error("siemensHvac:ResolveDpt:Error during dp reading: {}", e.getLocalizedMessage());
// Reset sessionId so we redone _auth on error
}
@ -933,7 +926,6 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
lcDevices.add(deviceObj);
}
} catch (Exception e) {
logger.error("siemensHvac:ResolveDpt:Error during dp reading: {}", e.getLocalizedMessage());
// Reset sessionId so we redone _auth on error
@ -1161,14 +1153,12 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
child.setDptId(dptId);
}
}
}
}
}
}
});
}
}
}
@ -1213,7 +1203,6 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
}
} catch (IOException ioe) {
logger.warn("Couldn't read Siemens MetaData information from file '{}'.", file.getAbsolutePath());
}
}
@ -1238,10 +1227,8 @@ public class SiemensHvacMetadataRegistryImpl implements SiemensHvacMetadataRegis
os.flush();
}
}
} catch (IOException ioe) {
logger.warn("Couldn't write Siemens MetaData information to file '{}'.", file.getAbsolutePath());
}
}

3
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/network/SiemensHvacConnectorImpl.java
View File

@ -374,7 +374,6 @@ public class SiemensHvacConnectorImpl implements SiemensHvacConnector {
"Session request auth was unsuccessful in _doAuth(), please verify login parameters");
}
}
}
}
}
@ -469,7 +468,6 @@ public class SiemensHvacConnectorImpl implements SiemensHvacConnector {
return resultObj;
}
}
}
return null;
@ -541,7 +539,6 @@ public class SiemensHvacConnectorImpl implements SiemensHvacConnector {
} catch (SiemensHvacException ex) {
logger.debug("error unregistring handler: {}", handler);
}
}
}

1
bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/network/SiemensHvacRequestListener.java
View File

@ -228,7 +228,6 @@ public class SiemensHvacRequestListener extends BufferingResponseListener
mayRetry);
return;
}
} else {
logger.debug("error(5): invalid response from gateway, missing Result entry");
hvacConnector.onError(result.getRequest(), requestHandler, ErrorSource.ErrorBridge, mayRetry);

1
bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/SolarMaxHandler.java
View File

@ -132,7 +132,6 @@ public class SolarMaxHandler extends BaseThingHandler {
State state = solarMaxData.getDataDateTime();
logger.debug("Update channel state: {} - {}", channelId, state);
updateState(channel.getUID(), state);
} else {
// must be somthing to collect from the device, so...
if (solarMaxData.has(SolarMaxCommandKey.valueOf(channelId))) {

4
bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/thing/channels.xml
View File

@ -45,14 +45,14 @@
</channel-type>
<channel-type id="co2_concentration">
<item-type>Number:DimensionLess</item-type>
<item-type>Number:Dimensionless</item-type>
<label>CO2 concentration</label>
<description>A CO2 sensor carbon dioxide concentration in ppm</description>
<state readOnly="true" pattern="%d %unit%"/>
</channel-type>
<channel-type id="noise">
<item-type>Number:DimensionLess</item-type>
<item-type>Number:Dimensionless</item-type>
<label>Noise</label>
<description>A noise sensor noise in decibel</description>
<state readOnly="true" pattern="%d %unit%"/>

1
bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/discovery/SonyProjectorDiscoveryParticipant.java
View File

@ -73,7 +73,6 @@ public class SonyProjectorDiscoveryParticipant implements SddpDiscoveryParticipa
if (device.manufacturer.toUpperCase(Locale.ENGLISH).contains(SONY)
&& device.type.toUpperCase(Locale.ENGLISH).contains(TYPE_PROJECTOR) && !device.macAddress.isBlank()
&& !device.ipAddress.isBlank()) {
logger.debug("Sony projector with mac {} found at {}", device.macAddress, device.ipAddress);
return new ThingUID(THING_TYPE_ETHERNET, device.macAddress);
}

1
bundles/org.openhab.binding.synopanalyzer/src/main/java/org/openhab/binding/synopanalyzer/internal/synop/SynopLand.java
View File

@ -39,7 +39,6 @@ public class SynopLand extends Synop {
}
} catch (NumberFormatException ignore) {
}
}
}
}

1
bundles/org.openhab.binding.synopanalyzer/src/main/java/org/openhab/binding/synopanalyzer/internal/synop/WindDirections.java
View File

@ -44,7 +44,6 @@ public enum WindDirections {
* Returns the wind direction based on degree.
*/
public static WindDirections getWindDirection(int degree) {
double b = Math.floor((degree + (STEP / 2.0)) / STEP);
return values()[(int) (b % values().length)];
}

1
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiCoEBridgeHandler.java
View File

@ -130,7 +130,6 @@ public class TACmiCoEBridgeHandler extends BaseBridgeHandler {
}
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Error processing data: " + e.getMessage());
} catch (RuntimeException e) {
// we catch runtime exceptions here to prevent the receiving thread to stop accidentally if
// something like an IllegalStateException or NumberFormatExceptions are thrown. This indicates a

2
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/message/AnalogValue.java
View File

@ -19,7 +19,7 @@ import org.openhab.binding.tacmi.internal.TACmiMeasureType;
* This class handles analog values as used in the analog message.
*
* @author Timo Wendt - Initial contribution
* @author Wolfgang Klimt
* @author Wolfgang Klimt - Improvements
* @author Christian Niessner - Ported to OpenHAB2
*/
@NonNullByDefault

13
bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/swagger/codegen/api/client/HomeApi.java
View File

@ -61,7 +61,6 @@ public class HomeApi {
}
public void deleteZoneOverlay(Long homeId, Long zoneId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling deleteZoneOverlay");
@ -103,7 +102,6 @@ public class HomeApi {
}
public HomeState homeState(Long homeId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling homeState");
@ -142,7 +140,6 @@ public class HomeApi {
}
public List<MobileDevice> listMobileDevices(Long homeId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling listMobileDevices");
@ -181,7 +178,6 @@ public class HomeApi {
}
public List<Zone> listZones(Long homeId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling listZones");
@ -220,7 +216,6 @@ public class HomeApi {
}
public HomeInfo showHome(Long homeId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling showHome");
@ -259,7 +254,6 @@ public class HomeApi {
}
public User showUser() throws IOException, ApiException {
startHttpClient(CLIENT);
// create path and map variables
@ -293,7 +287,6 @@ public class HomeApi {
}
public GenericZoneCapabilities showZoneCapabilities(Long homeId, Long zoneId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling showZoneCapabilities");
@ -339,7 +332,6 @@ public class HomeApi {
}
public OverlayTemplate showZoneDefaultOverlay(Long homeId, Long zoneId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling showZoneDefaultOverlay");
@ -385,7 +377,6 @@ public class HomeApi {
}
public Zone showZoneDetails(Long homeId, Long zoneId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling showZoneDetails");
@ -431,7 +422,6 @@ public class HomeApi {
}
public Overlay showZoneOverlay(Long homeId, Long zoneId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling showZoneOverlay");
@ -477,7 +467,6 @@ public class HomeApi {
}
public ZoneState showZoneState(Long homeId, Long zoneId) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling showZoneState");
@ -522,7 +511,6 @@ public class HomeApi {
}
public void updatePresenceLock(Long homeId, HomePresence json) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling updatePresenceLock");
@ -565,7 +553,6 @@ public class HomeApi {
}
public Overlay updateZoneOverlay(Long homeId, Long zoneId, Overlay json) throws IOException, ApiException {
// verify the required parameter 'homeId' is set
if (homeId == null) {
throw new ApiException(400, "Missing the required parameter 'homeId' when calling updateZoneOverlay");

2
bundles/org.openhab.binding.teleinfo/README.md
View File

@ -105,7 +105,7 @@ Channel availability depends on the electricity connection (single or three-phas
| bbrhpjw | `Number:Energy` | Total consumed energy at high rate pricing on white days | All | Tempo |
| bbrhcjr | `Number:Energy` | Total consumed energy at low rate pricing on red days | All | Tempo |
| bbrhpjr | `Number:Energy` | Total consumed energy at high rate pricing on red days | All | Tempo |
| pejp | `Number:Duration` | Prior notice to EJP start | All | EJP |
| pejp | `Number:Time` | Prior notice to EJP start | All | EJP |
| demain | `String` | Following day color | All | Tempo |
### Standard TIC mode

1
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxBinding.java
View File

@ -93,7 +93,6 @@ public class VeluxBinding extends VeluxBridgeConfiguration {
this.isBulkRetrievalEnabled = uncheckedConfiguration.isBulkRetrievalEnabled;
this.isSequentialEnforced = uncheckedConfiguration.isSequentialEnforced;
this.isProtocolTraceEnabled = uncheckedConfiguration.isProtocolTraceEnabled;
}
logger.trace("VeluxBinding(constructor) done.");
}

2
bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java
View File

@ -131,7 +131,7 @@ public class VigiCruesHandler extends BaseThingHandler {
try {
HubEauResponse stationDetails = apiHandler.discoverStations(config.id);
List<StationData> stations = stationDetails.stations;
if (stations != null && stations.size() > 0) {
if (stations != null && !stations.isEmpty()) {
stationDetails.stations.stream().findFirst().ifPresent(station -> {
PointType stationLocation = new PointType(
String.format(Locale.US, "%f,%f", station.latitudeStation, station.longitudeStation));

2
bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/client/DescriptionLoader.java
View File

@ -67,7 +67,7 @@ public class DescriptionLoader {
}
var body = response.getContentAsString();
var description = gson.fromJson(body, WebThingDescription.class);
if ((description != null) && (description.properties != null) && (description.properties.size() > 0)) {
if ((description != null) && (description.properties != null) && !description.properties.isEmpty()) {
if ((description.contextKeyword == null) || description.contextKeyword.trim().length() == 0) {
description.contextKeyword = "https://webthings.io/schemas";
}

4
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/AbstractWiFiLEDDriver.java
View File

@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
* Abstract WiFi LED driver.
*
* @author Osman Basha - Initial contribution
* @author Stefan Endrullis
* @author Ries van Twisk
* @author Stefan Endrullis - Improvements
* @author Ries van Twisk - Improvements
*/
public abstract class AbstractWiFiLEDDriver {

2
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/ClassicWiFiLEDDriver.java
View File

@ -28,7 +28,7 @@ import org.openhab.core.library.types.StringType;
* It's used for sending color or program settings and also extracting the data out of the received telegrams.
*
* @author Osman Basha - Initial contribution
* @author Stefan Endrullis
* @author Stefan Endrullis - Improvements
* @author Ries van Twisk - Prevent flashes during classic driver color + white updates
*/
public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {

2
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/FadingWiFiLEDDriver.java
View File

@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* It utilizes color fading when changing colors or turning the light on of off.
*
* @author Stefan Endrullis - Initial contribution
* @author Ries van Twisk
* @author Ries van Twisk - Improvements
*/
public class FadingWiFiLEDDriver extends AbstractWiFiLEDDriver {

2
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/WiFiLEDHandler.java
View File

@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* sent to one of the channels.
*
* @author Osman Basha - Initial contribution
* @author Ries van Twisk
* @author Ries van Twisk - Improvements
*/
public class WiFiLEDHandler extends BaseThingHandler {

2
bundles/org.openhab.binding.wifiled/src/test/java/org/openhab/binding/wifiled/internal/handler/LEDStateDTOTest.java
View File

@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
/**
* Test for LEDStateDTO
*
* @author Ries van Twisk - Prevent flashes during classic driver color + white updates
* @author Ries van Twisk - Initial contribution, prevent flashes during classic driver color + white updates
*/
public class LEDStateDTOTest {

1
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceInformationXML.java
View File

@ -113,7 +113,6 @@ public class DeviceInformationXML implements DeviceInformation {
XMLConstants.FEATURE_BY_YNC_TAG
.forEach((name, feature) -> checkFeature(featureNode, name, feature, state.features));
} else {
// on older models (RX-V3900) the Feature_Existence element does not exist

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithTunerDABControlXML.java
View File

@ -41,7 +41,8 @@ import org.w3c.dom.Node;
* No state will be saved in here, but in {@link DabBandState}, {@link PresetInfoState} and {@link PlayInfoState}
* instead.
*
* @author Tomasz Maruszak - [yamaha] Tuner band selection and preset feature for dual band models (RX-S601D)
* @author Tomasz Maruszak - Initial contribution, [yamaha] Tuner band selection and preset feature for dual band models
* (RX-S601D)
*/
public class InputWithTunerDABControlXML extends AbstractInputControlXML
implements InputWithTunerBandControl, InputWithPresetControl {

1
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/XMLConnection.java
View File

@ -93,7 +93,6 @@ public class XMLConnection extends AbstractConnection {
}
return responseConsumer.apply(connection);
} finally {
if (connection != null) {
connection.disconnect();

9
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/ZoneControlXML.java
View File

@ -39,11 +39,11 @@ import org.w3c.dom.Node;
* The zone protocol class is used to control one zone of a Yamaha receiver with HTTP/xml.
* No state will be saved in here, but in {@link ZoneControlState} instead.
*
* @author Tomasz Maruszak - Initial contribution, refactoring, input mapping fix, added
* Straight surround, volume DB fix and config improvement.
* @author David Gräff - Refactored
* @author Eric Thill
* @author Ben Jones
* @author Tomasz Maruszak - Refactoring, input mapping fix, added Straight surround, volume DB fix and config
* improvement.
* @author Eric Thill - Unknown
* @author Ben Jones - Unknown
*/
public class ZoneControlXML implements ZoneControl {
@ -157,7 +157,6 @@ public class ZoneControlXML implements ZoneControl {
"Surr/Pgm_Sel/Straight");
logger.debug("Zone {} - adjusting command to: {}", getZone(), surroundSelStraight);
}
} catch (ReceivedMessageParseException | IOException e) {
logger.debug("Could not perform feature detection for RX-V3900");
}

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/state/DabBandState.java
View File

@ -17,7 +17,8 @@ import static org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingC
/**
* The band state for DAB tuners.
*
* @author Tomasz Maruszak - [yamaha] Tuner band selection and preset feature for dual band models (RX-S601D)
* @author Tomasz Maruszak - Initial contribution, [yamaha] Tuner band selection and preset feature for dual band models
* (RX-S601D)
*/
public class DabBandState implements Invalidateable {

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/state/DabBandStateListener.java
View File

@ -15,7 +15,8 @@ package org.openhab.binding.yamahareceiver.internal.state;
/**
* Listener for changes to {@link DabBandState}
*
* @author Tomasz Maruszak - [yamaha] Tuner band selection and preset feature for dual band models (RX-S601D)
* @author Tomasz Maruszak - Initial contribution, [yamaha] Tuner band selection and preset feature for dual band models
* (RX-S601D)
*/
public interface DabBandStateListener {
void dabBandUpdated(DabBandState msg);

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/state/Invalidateable.java
View File

@ -15,7 +15,8 @@ package org.openhab.binding.yamahareceiver.internal.state;
/**
* Represent object whose state can be invalidated.
*
* @author Tomasz Maruszak - [yamaha] Tuner band selection and preset feature for dual band models (RX-S601D)
* @author Tomasz Maruszak - Initial contribution, [yamaha] Tuner band selection and preset feature for dual band models
* (RX-S601D)
*/
public interface Invalidateable {

6
bundles/org.openhab.transform.basicprofiles/src/main/java/org/openhab/transform/basicprofiles/internal/profiles/StateFilterProfile.java
View File

@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
@NonNullByDefault
public class StateFilterProfile implements StateProfile {
private final static String OPERATOR_NAME_PATTERN = Stream.of(StateCondition.ComparisonType.values())
private static final String OPERATOR_NAME_PATTERN = Stream.of(StateCondition.ComparisonType.values())
.map(StateCondition.ComparisonType::name)
// We want to match the longest operator first, e.g. `GTE` before `GT`
.sorted(Comparator.comparingInt(String::length).reversed())
@ -63,13 +63,13 @@ public class StateFilterProfile implements StateProfile {
// so we can have conditions against input data without needing a leading space, e.g. `GTE 0`
.collect(Collectors.joining("|", "(?:(?<=\\S)\\s+|^\\s*)(?:", ")\\s"));
private final static String OPERATOR_SYMBOL_PATTERN = Stream.of(StateCondition.ComparisonType.values())
private static final String OPERATOR_SYMBOL_PATTERN = Stream.of(StateCondition.ComparisonType.values())
.map(StateCondition.ComparisonType::symbol)
// We want to match the longest operator first, e.g. `<=` before `<`
.sorted(Comparator.comparingInt(String::length).reversed()) //
.collect(Collectors.joining("|", "(?:", ")"));
private final static Pattern EXPRESSION_PATTERN = Pattern.compile(
private static final Pattern EXPRESSION_PATTERN = Pattern.compile(
// - Without the non-greedy operator in the first capture group,
// it will match `Item<` when encountering `Item<>X` condition
// - Symbols may be more prevalently used, so check them first

33
bundles/org.openhab.transform.basicprofiles/src/test/java/org/openhab/transform/basicprofiles/internal/profiles/StateFilterProfileTest.java
View File

@ -47,8 +47,18 @@ import org.openhab.core.items.GenericItem;
import org.openhab.core.items.Item;
import org.openhab.core.items.ItemNotFoundException;
import org.openhab.core.items.ItemRegistry;
import org.openhab.core.library.items.*;
import org.openhab.core.library.types.*;
import org.openhab.core.library.items.ContactItem;
import org.openhab.core.library.items.DimmerItem;
import org.openhab.core.library.items.NumberItem;
import org.openhab.core.library.items.RollershutterItem;
import org.openhab.core.library.items.StringItem;
import org.openhab.core.library.items.SwitchItem;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.OpenClosedType;
import org.openhab.core.library.types.PercentType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.types.StringType;
import org.openhab.core.library.unit.SIUnits;
import org.openhab.core.thing.link.ItemChannelLink;
import org.openhab.core.thing.profiles.ProfileCallback;
@ -178,14 +188,16 @@ public class StateFilterProfileTest {
return item;
}
private Item numberItemWithState(String itemType, String itemName, State value) {
NumberItem item = new NumberItem(itemType, itemName, null);
item.setState(value);
return item;
}
/*
* private Item numberItemWithState(String itemType, String itemName, State value) {
* NumberItem item = new NumberItem(itemType, itemName, null);
* item.setState(value);
* return item;
* }
*/
@Test
public void testMultipleCondition_AllMatch() throws ItemNotFoundException {
public void testMultipleConditionAllMatch() throws ItemNotFoundException {
when(mockContext.getConfiguration())
.thenReturn(new Configuration(Map.of("conditions", "ItemName eq 'Value', ItemName2 eq 'Value2'")));
when(mockItemRegistry.getItem("ItemName")).thenReturn(stringItemWithState("ItemName", "Value"));
@ -199,7 +211,7 @@ public class StateFilterProfileTest {
}
@Test
public void testMultipleCondition_SingleMatch() throws ItemNotFoundException {
public void testMultipleConditionSingleMatch() throws ItemNotFoundException {
when(mockContext.getConfiguration())
.thenReturn(new Configuration(Map.of("conditions", "ItemName eq Value, ItemName2 eq Value2")));
when(mockItemRegistry.getItem("ItemName")).thenReturn(stringItemWithState("ItemName", "Value"));
@ -266,7 +278,7 @@ public class StateFilterProfileTest {
StringType s_foo = StringType.valueOf("foo");
StringType s_NULL = StringType.valueOf("NULL");
StringType s_UNDEF = StringType.valueOf("UNDEF");
StringType s_OPEN = StringType.valueOf("OPEN");
// StringType s_OPEN = StringType.valueOf("OPEN");
return Stream.of( //
// We should be able to check item state is/isn't UNDEF/NULL
@ -595,7 +607,6 @@ public class StateFilterProfileTest {
@MethodSource
public void testComparingInputStateWithValue(GenericItem linkedItem, State inputState, String operator,
String value, boolean expected) throws ItemNotFoundException {
String linkedItemName = linkedItem.getName();
when(mockContext.getConfiguration()).thenReturn(new Configuration(Map.of("conditions", operator + value)));

4
bundles/org.openhab.voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleTTSVoice.java
View File

@ -83,9 +83,7 @@ public class GoogleTTSVoice implements Voice {
return this.label;
}
/**
* {@inheritDoc}
*/
// automatically inherit doc
@Override
public Locale getLocale() {
return this.locale;

6
bundles/org.openhab.voice.mactts/src/main/java/org/openhab/voice/mactts/internal/MacTTSService.java
View File

@ -39,9 +39,9 @@ import org.slf4j.LoggerFactory;
* This is a TTS service implementation for Mac OS, which simply uses the "say" command from the OS.
*
* @author Kai Kreuzer - Initial contribution and API
* @author Pauli Antilla
* @author Kelly Davis
* @author Laurent Garnier : Implement TTS LRU cache
* @author Pauli Antilla - Improvements
* @author Kelly Davis - Improvements
* @author Laurent Garnier - Implement TTS LRU cache
*/
@Component(service = TTSService.class)
@NonNullByDefault

4
bundles/org.openhab.voice.marytts/src/main/java/org/openhab/voice/marytts/internal/MaryTTSVoice.java
View File

@ -65,9 +65,7 @@ public class MaryTTSVoice implements Voice {
return label;
}
/**
* {@inheritDoc}
*/
// automatically inherit doc
@Override
public Locale getLocale() {
return locale;

4
bundles/org.openhab.voice.pollytts/src/main/java/org/openhab/voice/pollytts/internal/PollyTTSVoice.java
View File

@ -66,9 +66,7 @@ public class PollyTTSVoice implements Voice {
return label;
}
/**
* {@inheritDoc}
*/
// automatically inherit doc
@Override
public Locale getLocale() {
return locale;

Some files were not shown because too many files have changed in this diff Show More