From ce67b0145ee76696be88fb26288a35745f2a5dc3 Mon Sep 17 00:00:00 2001 From: lsiepel Date: Tue, 22 Jul 2025 00:00:12 +0200 Subject: [PATCH] [various] Fix LocalVariableNameCheck (#18994) * Fix LocalVariableNameCheck Signed-off-by: Leo Siepel --- .../enocean/internal/eep/A5_09/A5_09_05.java | 8 +++--- .../enocean/internal/eep/A5_09/A5_09_0C.java | 16 +++++------ .../internal/onvif/OnvifConnection.java | 6 ++-- .../handler/JablotronBridgeHandler.java | 8 +++--- .../handler/EspMilightHubHandler.java | 28 +++++++++---------- .../onewire/internal/device/DS2438.java | 8 +++--- .../samsungtv/internal/WakeOnLanUtility.java | 24 ++++++++-------- .../service/SmartThingsApiService.java | 8 +++--- .../tuya/internal/util/CryptoUtil.java | 8 +++--- 9 files changed, 56 insertions(+), 58 deletions(-) diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_05.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_05.java index b966f2dcdf..b632fd9458 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_05.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_05.java @@ -62,15 +62,15 @@ public class A5_09_05 extends A5_09 { protected String getVOCID() { int vocId = getDB1Value(); - String[] VOCIdentifications = getVOCIdentifications(); + String[] vocIdentifications = getVOCIdentifications(); if (vocId == 255) { - return VOCIdentifications[VOCIdentifications.length - 1]; - } else if (vocId < 0 || vocId >= VOCIdentifications.length - 1) { + return vocIdentifications[vocIdentifications.length - 1]; + } else if (vocId < 0 || vocId >= vocIdentifications.length - 1) { logger.debug("Invalid value according to enocean specification for A5_09 VOC Identification {}", vocId); return ""; } - return VOCIdentifications[vocId]; + return vocIdentifications[vocId]; } @Override diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_0C.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_0C.java index 84519c9fa1..8a2f82fae2 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_0C.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_09/A5_09_0C.java @@ -36,16 +36,16 @@ public class A5_09_0C extends A5_09_05 { @Override protected String[] getVOCIdentifications() { - String[] VOCIdsSuper = super.getVOCIdentifications(); - int elFromSuper = VOCIdsSuper.length - 2; - String[] VOCIdsExtension = new String[] { "Naphthalene", "4-Phenylcyclohexene", "Limonene", "Trichloroethylene", - "Isovaleric acid", "Indole", "Cadaverine", "Putrescine", "Caproic acid", "Ozone" }; - String[] VOCIdsExtended = new String[elFromSuper + VOCIdsExtension.length]; + String[] parentVOCIds = super.getVOCIdentifications(); + int parentVOCIdsLength = parentVOCIds.length - 2; + String[] additionalVOCIds = new String[] { "Naphthalene", "4-Phenylcyclohexene", "Limonene", + "Trichloroethylene", "Isovaleric acid", "Indole", "Cadaverine", "Putrescine", "Caproic acid", "Ozone" }; + String[] combinedVOCIds = new String[parentVOCIdsLength + additionalVOCIds.length]; - System.arraycopy(VOCIdsSuper, 0, VOCIdsExtended, 0, elFromSuper); - System.arraycopy(VOCIdsExtension, 0, VOCIdsExtended, elFromSuper, VOCIdsExtension.length); + System.arraycopy(parentVOCIds, 0, combinedVOCIds, 0, parentVOCIdsLength); + System.arraycopy(additionalVOCIds, 0, combinedVOCIds, parentVOCIdsLength, additionalVOCIds.length); - return VOCIdsExtended; + return combinedVOCIds; } @Override diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java index b875acfb8f..11b86ed34d 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java @@ -825,9 +825,9 @@ public class OnvifConnection { logger.error("Error parsing ONVIF xml.", e); return; } - NodeList NotificationMessageNodeList = xmlDocument.getElementsByTagName("wsnt:NotificationMessage"); - for (int i = 0; i < NotificationMessageNodeList.getLength(); i++) { - Element notificationMessageElement = (Element) NotificationMessageNodeList.item(i); + NodeList notificationMessages = xmlDocument.getElementsByTagName("wsnt:NotificationMessage"); + for (int i = 0; i < notificationMessages.getLength(); i++) { + Element notificationMessageElement = (Element) notificationMessages.item(i); Element topicElement = (Element) notificationMessageElement.getElementsByTagName("wsnt:Topic").item(0); String topic = topicElement.getFirstChild().getNodeValue().replace("tns1:", ""); diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java index 7abbfab554..645ecd5995 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java @@ -263,19 +263,19 @@ public class JablotronBridgeHandler extends BaseBridgeHandler { url = JABLOTRON_API_URL + "accessTokenGet.json"; urlParameters = "{ \"force-renew\": true }"; - JablotronAccessTokenResponse token_response = sendJsonMessage(url, urlParameters, + JablotronAccessTokenResponse tokenResponse = sendJsonMessage(url, urlParameters, JablotronAccessTokenResponse.class, false); - if (token_response == null) { + if (tokenResponse == null) { updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Null get access token response"); return; } - if (token_response.getHttpCode() != 200) { + if (tokenResponse.getHttpCode() != 200) { updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Get access token http error: " + response.getHttpCode()); } else { - accessToken = token_response.getData().getAccessToken(); + accessToken = tokenResponse.getData().getAccessToken(); updateStatus(ThingStatus.ONLINE); } } diff --git a/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/java/org/openhab/binding/mqtt/espmilighthub/internal/handler/EspMilightHubHandler.java b/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/java/org/openhab/binding/mqtt/espmilighthub/internal/handler/EspMilightHubHandler.java index f656ca8176..166a412a8d 100644 --- a/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/java/org/openhab/binding/mqtt/espmilighthub/internal/handler/EspMilightHubHandler.java +++ b/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/java/org/openhab/binding/mqtt/espmilighthub/internal/handler/EspMilightHubHandler.java @@ -319,21 +319,19 @@ public class EspMilightHubHandler extends BaseThingHandler implements MqttMessag // https://cormusa.org/wp-content/uploads/2018/04/CORM_2011_Calculation_of_CCT_and_Duv_and_Practical_Conversion_Formulae.pdf // page 19 private static BigDecimal calculateDuvFromHSB(HSBType hsb) { - PercentType[] xy = hsb.toXY(); - var x = xy[0].toBigDecimal().divide(BIG_DECIMAL_100); - var y = xy[1].toBigDecimal().divide(BIG_DECIMAL_100); - var u = BIG_DECIMAL_4.multiply(x).divide( - BIG_DECIMAL_2.multiply(x).negate().add(BIG_DECIMAL_12.multiply(y).add(BIG_DECIMAL_3)), - MathContext.DECIMAL128); - var v = BIG_DECIMAL_6.multiply(y).divide( - BIG_DECIMAL_2.multiply(x).negate().add(BIG_DECIMAL_12.multiply(y).add(BIG_DECIMAL_3)), - MathContext.DECIMAL128); - var Lfp = u.subtract(BIG_DECIMAL_0292).pow(2).add(v.subtract(BIG_DECIMAL_024).pow(2)) - .sqrt(MathContext.DECIMAL128); - var a = new BigDecimal( - Math.acos(u.subtract(BIG_DECIMAL_0292).divide(Lfp, MathContext.DECIMAL128).doubleValue())); - BigDecimal Lbb = polynomialFit(a, CORM_COEFFICIENTS); - return Lfp.subtract(Lbb); + PercentType[] xyCoordinates = hsb.toXY(); + var normalizedX = xyCoordinates[0].toBigDecimal().divide(BIG_DECIMAL_100); + var normalizedY = xyCoordinates[1].toBigDecimal().divide(BIG_DECIMAL_100); + var chromaticityU = BIG_DECIMAL_4.multiply(normalizedX).divide(BIG_DECIMAL_2.multiply(normalizedX).negate() + .add(BIG_DECIMAL_12.multiply(normalizedY).add(BIG_DECIMAL_3)), MathContext.DECIMAL128); + var chromaticityV = BIG_DECIMAL_6.multiply(normalizedY).divide(BIG_DECIMAL_2.multiply(normalizedX).negate() + .add(BIG_DECIMAL_12.multiply(normalizedY).add(BIG_DECIMAL_3)), MathContext.DECIMAL128); + var distanceFromPlanckian = chromaticityU.subtract(BIG_DECIMAL_0292).pow(2) + .add(chromaticityV.subtract(BIG_DECIMAL_024).pow(2)).sqrt(MathContext.DECIMAL128); + var angle = new BigDecimal(Math.acos(chromaticityU.subtract(BIG_DECIMAL_0292) + .divide(distanceFromPlanckian, MathContext.DECIMAL128).doubleValue())); + BigDecimal planckianOffset = polynomialFit(angle, CORM_COEFFICIENTS); + return distanceFromPlanckian.subtract(planckianOffset); } /* diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java index a7d6e0e605..f79202424e 100644 --- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java +++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java @@ -91,7 +91,7 @@ public class DS2438 extends AbstractOwDevice { public void refresh(OwserverBridgeHandler bridgeHandler, Boolean forcedRefresh) throws OwException { if (isConfigured) { logger.trace("refresh of sensor {} started", sensorId); - double Vcc = 5.0; + double vcc = 5.0; if (enabledChannels.contains(CHANNEL_TEMPERATURE) || enabledChannels.contains(CHANNEL_HUMIDITY) || enabledChannels.contains(CHANNEL_ABSOLUTE_HUMIDITY) @@ -159,8 +159,8 @@ public class DS2438 extends AbstractOwDevice { } if (enabledChannels.contains(CHANNEL_SUPPLYVOLTAGE)) { - Vcc = ((DecimalType) bridgeHandler.readDecimalType(sensorId, supplyVoltageParameter)).doubleValue(); - State supplyVoltage = new QuantityType<>(Vcc, Units.VOLT); + vcc = ((DecimalType) bridgeHandler.readDecimalType(sensorId, supplyVoltageParameter)).doubleValue(); + State supplyVoltage = new QuantityType<>(vcc, Units.VOLT); callback.postUpdate(CHANNEL_SUPPLYVOLTAGE, supplyVoltage); } @@ -190,7 +190,7 @@ public class DS2438 extends AbstractOwDevice { // workaround bug in DS2438 light = new QuantityType<>(0, Units.LUX); } else { - light = new QuantityType<>(Math.pow(10, (65 / 7.5) - (47 / 7.5) * (Vcc / measured)), + light = new QuantityType<>(Math.pow(10, (65 / 7.5) - (47 / 7.5) * (vcc / measured)), Units.LUX); } callback.postUpdate(CHANNEL_LIGHT, light); diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/WakeOnLanUtility.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/WakeOnLanUtility.java index cacb8b9c28..e5995518f6 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/WakeOnLanUtility.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/WakeOnLanUtility.java @@ -43,28 +43,29 @@ public class WakeOnLanUtility { private static final Logger LOGGER = LoggerFactory.getLogger(WakeOnLanUtility.class); private static final int CMD_TIMEOUT_MS = 1000; + private static final Pattern MAC_REGEX = Pattern.compile("(([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2})"); private static String host = ""; /** * Get os command to find MAC address * - * @return os COMMAND + * @return os command */ public static String getCommand() { String os = System.getProperty("os.name"); - String COMMAND = ""; + String command = ""; if (os != null) { os = os.toLowerCase(); LOGGER.debug("{}: os: {}", host, os); if ((os.contains("win"))) { - COMMAND = "arp -a %s"; + command = "arp -a %s"; } else if ((os.contains("mac"))) { - COMMAND = "arp %s"; + command = "arp %s"; } else { // linux if (checkIfLinuxCommandExists("arp")) { - COMMAND = "arp %s"; + command = "arp %s"; } else if (checkIfLinuxCommandExists("arping")) { // typically OH provided docker image - COMMAND = "arping -r -c 1 -C 1 %s"; + command = "arping -r -c 1 -C 1 %s"; } else { LOGGER.warn("{}: arping not installed", host); } @@ -72,7 +73,7 @@ public class WakeOnLanUtility { } else { LOGGER.warn("{}: Unable to determine os", host); } - return COMMAND; + return command; } /** @@ -83,14 +84,13 @@ public class WakeOnLanUtility { */ public static @Nullable String getMACAddress(String hostName) { host = hostName; - String COMMAND = getCommand(); - if (COMMAND.isEmpty()) { + String command = getCommand(); + if (command.isEmpty()) { LOGGER.debug("{}: MAC address detection not possible. No command to identify MAC found.", hostName); return null; } - Pattern MAC_REGEX = Pattern.compile("(([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2})"); - String[] cmds = Stream.of(COMMAND.split(" ")).map(arg -> String.format(arg, hostName)).toArray(String[]::new); + String[] cmds = Stream.of(command.split(" ")).map(arg -> String.format(arg, hostName)).toArray(String[]::new); String response = ExecUtil.executeCommandLineAndWaitResponse(Duration.ofMillis(CMD_TIMEOUT_MS), cmds); String macAddress = null; @@ -109,7 +109,7 @@ public class WakeOnLanUtility { LOGGER.debug("{}: MAC address of host {} is {}", hostName, hostName, macAddress); } else { LOGGER.debug("{}: Problem executing command {} to retrieve MAC address for {}: {}", hostName, - String.format(COMMAND, hostName), hostName, response); + String.format(command, hostName), hostName, response); } return macAddress; } diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/SmartThingsApiService.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/SmartThingsApiService.java index 25573ccae7..f75204c87b 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/SmartThingsApiService.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/SmartThingsApiService.java @@ -801,10 +801,10 @@ public class SmartThingsApiService implements SamsungTvService { logger.trace("{}: SSE Got TV Channel Name: {}", host, tvChannelName); updateState(CHANNEL_NAME, tvChannelName); } - String Power = d.getSwitch(); - if (!Power.isBlank()) { - logger.debug("{}: SSE Got TV Power: {}", host, Power); - if ("on".equals(Power)) { + String power = d.getSwitch(); + if (!power.isBlank()) { + logger.debug("{}: SSE Got TV Power: {}", host, power); + if ("on".equals(power)) { // handler.putOnline(); // ignore on event for now } else { // handler.setOffline(); // ignore off event for now diff --git a/bundles/org.openhab.binding.tuya/src/main/java/org/openhab/binding/tuya/internal/util/CryptoUtil.java b/bundles/org.openhab.binding.tuya/src/main/java/org/openhab/binding/tuya/internal/util/CryptoUtil.java index 89d41f01eb..4b6065a538 100644 --- a/bundles/org.openhab.binding.tuya/src/main/java/org/openhab/binding/tuya/internal/util/CryptoUtil.java +++ b/bundles/org.openhab.binding.tuya/src/main/java/org/openhab/binding/tuya/internal/util/CryptoUtil.java @@ -313,11 +313,11 @@ public class CryptoUtil { public static byte @Nullable [] hmac(byte[] data, byte[] key) { try { - Mac sha256_HMAC = Mac.getInstance("HmacSHA256"); - SecretKeySpec secret_key = new SecretKeySpec(key, "HmacSHA256"); - sha256_HMAC.init(secret_key); + Mac sha256HMAC = Mac.getInstance("HmacSHA256"); + SecretKeySpec secretKey = new SecretKeySpec(key, "HmacSHA256"); + sha256HMAC.init(secretKey); - return sha256_HMAC.doFinal(data); + return sha256HMAC.doFinal(data); } catch (NoSuchAlgorithmException | InvalidKeyException e) { LOGGER.warn("Creating HMAC hash failed: {}", e.getMessage()); }