From fe0c35d22f53639234c6a8ef906838f0adef27b0 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Fri, 19 Mar 2021 10:40:14 +0100 Subject: [PATCH] Fix Java and Jetty deprecations (#10349) Signed-off-by: Wouter Born --- .../discovery/AutelisDiscoveryParticipant.java | 2 +- .../autelis/internal/handler/AutelisHandler.java | 7 ++++--- .../internal/account/SmartherAccountService.java | 4 ++-- .../binding/cm11a/internal/X10Interface.java | 2 +- .../coolmasternet/internal/handler/HVACHandler.java | 4 ++-- .../internal/DaikinHttpClientFactoryImpl.java | 2 +- .../internal/handler/DeviceHandler.java | 3 ++- .../dmx/internal/multiverse/BaseDmxChannel.java | 5 +++-- .../openhab/binding/feican/internal/Commands.java | 3 ++- .../binding/gree/internal/handler/GreeHandler.java | 3 ++- .../binding/http/internal/HttpHandlerFactory.java | 6 +++--- .../openhab/binding/ihc/internal/ChannelUtils.java | 2 +- .../innogysmarthome/internal/InnogyWebSocket.java | 2 +- .../org/openhab/binding/ism8/server/Server.java | 3 ++- .../binding/knx/internal/dpt/KNXCoreTypeMapper.java | 3 ++- .../lifx/internal/handler/LifxLightHandler.java | 4 ++-- .../internal/handler/NestRedirectUrlSupplier.java | 2 +- .../binding/netatmo/internal/ChannelTypeUtils.java | 3 ++- .../src/test/java/main/Main.java | 2 +- .../internal/messages/RFXComLighting2Message.java | 5 +++-- .../internal/messages/RFXComLighting5Message.java | 5 +++-- .../internal/messages/RFXComRFXSensorMessage.java | 13 ++++++------- .../binding/robonect/internal/RobonectClient.java | 7 ++++--- .../robonect/internal/model/ModelParserTest.java | 10 +++++----- .../binding/seneye/internal/SeneyeService.java | 2 +- .../SqueezeBoxServerDiscoveryParticipant.java | 4 ++-- .../systeminfo/internal/model/OSHISysteminfo.java | 11 ++++++----- .../tacmi/internal/schema/TACmiSchemaHandler.java | 6 +++--- .../tado/internal/adapter/TadoZoneStateAdapter.java | 5 +++-- .../tado/internal/handler/BaseHomeThingHandler.java | 2 +- .../telegram/internal/action/TelegramActions.java | 4 ++-- .../internal/core/TelldusCoreDeviceController.java | 3 ++- .../internal/live/TelldusLiveDeviceController.java | 3 ++- .../local/TelldusLocalDeviceController.java | 3 ++- .../tibber/internal/handler/TibberHandler.java | 2 +- .../tradfri/internal/model/TradfriVersionTest.java | 2 +- .../unifi/internal/UniFiThingHandlerFactory.java | 2 +- .../internal/handler/VenstarThermostatHandler.java | 2 +- .../wifiled/internal/handler/LEDStateDTO.java | 9 +++++---- .../handler/ZWayZAutomationDeviceHandler.java | 2 +- .../internal/handler/ZWayZWaveDeviceHandler.java | 3 ++- .../internal/model/device/RgbLightDevice.java | 3 ++- .../handler/test/AstroValidConfigurationTest.java | 8 ++++---- 43 files changed, 98 insertions(+), 80 deletions(-) diff --git a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java index 67a29b9a9..23c859c5e 100644 --- a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java @@ -65,7 +65,7 @@ public class AutelisDiscoveryParticipant implements UpnpDiscoveryParticipant { properties.put("host", url.getHost()); properties.put("user", "admin"); properties.put("password", "admin"); - properties.put("port", new Integer(port)); + properties.put("port", Integer.valueOf(port)); DiscoveryResult result = DiscoveryResultBuilder.create(uid).withProperties(properties).withLabel(label) .build(); diff --git a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java index b80a02c66..3669f87a5 100644 --- a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java +++ b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java @@ -13,6 +13,8 @@ package org.openhab.binding.autelis.internal.handler; import java.io.StringReader; +import java.nio.charset.StandardCharsets; +import java.util.Base64; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -30,8 +32,6 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.jetty.util.B64Code; -import org.eclipse.jetty.util.StringUtil; import org.openhab.binding.autelis.internal.AutelisBindingConstants; import org.openhab.binding.autelis.internal.config.AutelisConfiguration; import org.openhab.core.library.types.DecimalType; @@ -313,7 +313,8 @@ public class AutelisHandler extends BaseThingHandler { } baseURL = "http://" + host + ":" + port; - basicAuthentication = "Basic " + B64Code.encode(username + ":" + password, StringUtil.__ISO_8859_1); + basicAuthentication = "Basic " + + Base64.getEncoder().encodeToString((username + ":" + password).getBytes(StandardCharsets.ISO_8859_1)); logger.debug("Autelius binding configured with base url {} and refresh period of {}", baseURL, refresh); initPolling(0); diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java index b3914acb4..30fe6f84f 100644 --- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java +++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java @@ -22,13 +22,13 @@ import java.util.Hashtable; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.openhab.binding.bticinosmarther.internal.api.dto.Notification; import org.openhab.binding.bticinosmarther.internal.api.dto.Sender; import org.openhab.binding.bticinosmarther.internal.api.exception.SmartherGatewayException; @@ -61,7 +61,7 @@ public class SmartherAccountService { private final Logger logger = LoggerFactory.getLogger(SmartherAccountService.class); - private final Set handlers = new ConcurrentHashSet<>(); + private final Set handlers = ConcurrentHashMap.newKeySet(); private @Nullable HttpService httpService; private @Nullable BundleContext bundleContext; diff --git a/bundles/org.openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java b/bundles/org.openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java index 60a800c93..e9ef9043f 100644 --- a/bundles/org.openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java +++ b/bundles/org.openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java @@ -357,7 +357,7 @@ public class X10Interface extends Thread implements SerialPortEventListener { */ public static boolean validateAddress(String address) { return (!(address.length() < 2 || address.length() > 3 - || !HOUSE_CODES.containsKey(new Character(address.charAt(0))) + || !HOUSE_CODES.containsKey(Character.valueOf(address.charAt(0))) || !DEVICE_CODES.containsKey(Integer.parseInt(address.substring(1))))); } diff --git a/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java b/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java index 509e224b6..4eb327b11 100644 --- a/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java +++ b/bundles/org.openhab.binding.coolmasternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java @@ -136,7 +136,7 @@ public class HVACHandler extends BaseThingHandler { if (command instanceof RefreshType) { final String currentTemp = query(controller, "a"); if (currentTemp != null) { - final Integer temp = new Integer(currentTemp); + final Integer temp = Integer.parseInt(currentTemp); final QuantityType value = new QuantityType<>(temp, controller.getUnit()); updateState(CURRENT_TEMP, value); } @@ -157,7 +157,7 @@ public class HVACHandler extends BaseThingHandler { if (command instanceof RefreshType) { final String setTemp = query(controller, "t"); if (setTemp != null) { - final Integer temp = new Integer(setTemp); + final Integer temp = Integer.parseInt(setTemp); final QuantityType value = new QuantityType<>(temp, controller.getUnit()); updateState(SET_TEMP, value); } diff --git a/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinHttpClientFactoryImpl.java b/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinHttpClientFactoryImpl.java index 947a38892..b7729ef13 100644 --- a/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinHttpClientFactoryImpl.java +++ b/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinHttpClientFactoryImpl.java @@ -62,7 +62,7 @@ public class DaikinHttpClientFactoryImpl implements DaikinHttpClientFactory { private synchronized void initialize() { if (httpClient == null) { - httpClient = new HttpClient(new SslContextFactory(true)); + httpClient = new HttpClient(new SslContextFactory.Client(true)); try { httpClient.start(); logger.debug("Daikin http client started"); diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/DeviceHandler.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/DeviceHandler.java index ee37d31a2..2225d95d6 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/DeviceHandler.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/DeviceHandler.java @@ -15,6 +15,7 @@ package org.openhab.binding.digitalstrom.internal.handler; import static org.openhab.binding.digitalstrom.internal.DigitalSTROMBindingConstants.*; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -410,7 +411,7 @@ public class DeviceHandler extends BaseThingHandler implements DeviceStatusListe if (value <= 0 || max <= 0) { return 0; } - int percentValue = new BigDecimal(value * ((float) 100 / max)).setScale(0, BigDecimal.ROUND_HALF_UP).intValue(); + int percentValue = new BigDecimal(value * ((float) 100 / max)).setScale(0, RoundingMode.HALF_UP).intValue(); return percentValue < 0 ? 0 : percentValue > 100 ? 100 : percentValue; } diff --git a/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/BaseDmxChannel.java b/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/BaseDmxChannel.java index 88292e44b..2abd1fa9e 100644 --- a/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/BaseDmxChannel.java +++ b/bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/BaseDmxChannel.java @@ -95,9 +95,10 @@ public class BaseDmxChannel implements Comparable { if (otherDmxChannel == null) { return -1; } - int universeCompare = new Integer(getUniverseId()).compareTo(new Integer(otherDmxChannel.getUniverseId())); + int universeCompare = Integer.valueOf(getUniverseId()) + .compareTo(Integer.valueOf(otherDmxChannel.getUniverseId())); if (universeCompare == 0) { - return new Integer(getChannelId()).compareTo(new Integer(otherDmxChannel.getChannelId())); + return Integer.valueOf(getChannelId()).compareTo(Integer.valueOf(otherDmxChannel.getChannelId())); } else { return universeCompare; } diff --git a/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/Commands.java b/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/Commands.java index 49da817f5..5284de881 100644 --- a/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/Commands.java +++ b/bundles/org.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/Commands.java @@ -13,6 +13,7 @@ package org.openhab.binding.feican.internal; import java.math.BigDecimal; +import java.math.RoundingMode; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.library.types.HSBType; @@ -82,7 +83,7 @@ public class Commands { */ private byte convertColorPercentToByte(PercentType percent) { return percent.toBigDecimal().multiply(BigDecimal.valueOf(255)) - .divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).byteValue(); + .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).byteValue(); } /** diff --git a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java index 1869a1e54..73ccda0c8 100644 --- a/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java +++ b/bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java @@ -16,6 +16,7 @@ import static org.openhab.binding.gree.internal.GreeBindingConstants.*; import java.io.IOException; import java.math.BigDecimal; +import java.math.RoundingMode; import java.net.DatagramSocket; import java.time.Instant; import java.util.List; @@ -567,7 +568,7 @@ public class GreeHandler extends BaseThingHandler { public static QuantityType toQuantityType(Number value, int digits, Unit unit) { BigDecimal bd = new BigDecimal(value.doubleValue()); - return new QuantityType<>(bd.setScale(digits, BigDecimal.ROUND_HALF_EVEN), unit); + return new QuantityType<>(bd.setScale(digits, RoundingMode.HALF_EVEN), unit); } private void stopRefreshTask() { diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpHandlerFactory.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpHandlerFactory.java index 3318fb9d4..064984de0 100644 --- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpHandlerFactory.java +++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpHandlerFactory.java @@ -12,7 +12,7 @@ */ package org.openhab.binding.http.internal; -import static org.openhab.binding.http.internal.HttpBindingConstants.*; +import static org.openhab.binding.http.internal.HttpBindingConstants.THING_TYPE_URL; import java.util.Set; @@ -59,8 +59,8 @@ public class HttpHandlerFactory extends BaseThingHandlerFactory @Activate public HttpHandlerFactory(@Reference HttpClientFactory httpClientFactory, @Reference HttpDynamicStateDescriptionProvider httpDynamicStateDescriptionProvider) { - this.secureClient = new HttpClient(new SslContextFactory()); - this.insecureClient = new HttpClient(new SslContextFactory(true)); + this.secureClient = new HttpClient(new SslContextFactory.Client()); + this.insecureClient = new HttpClient(new SslContextFactory.Client(true)); try { this.secureClient.start(); this.insecureClient.start(); diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java index e8b3fd52e..2bb837d5f 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java @@ -202,7 +202,7 @@ public class ChannelUtils { ChannelUID channelUID = new ChannelUID(thing.getUID(), group + resourceId); ChannelTypeUID type = new ChannelTypeUID(BINDING_ID, channelType); Configuration configuration = new Configuration(); - configuration.put(PARAM_RESOURCE_ID, new Integer(resourceId)); + configuration.put(PARAM_RESOURCE_ID, Integer.valueOf(resourceId)); Channel channel = ChannelBuilder.create(channelUID, acceptedItemType).withConfiguration(configuration) .withLabel(description).withType(type).build(); diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java index 5b0a5caa1..61aa8d650 100644 --- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java +++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java @@ -149,7 +149,7 @@ public class InnogyWebSocket { } WebSocketClient startWebSocketClient() throws Exception { - WebSocketClient client = new WebSocketClient(new SslContextFactory()); + WebSocketClient client = new WebSocketClient(new SslContextFactory.Client()); client.setMaxIdleTimeout(this.maxIdleTimeout); client.start(); return client; diff --git a/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java b/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java index f0d6fcfd6..8b2ac26cc 100644 --- a/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java +++ b/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java @@ -85,6 +85,7 @@ public class Server extends Thread { * Starts the server * */ + @Override public void run() { this.startRetries = 0; while (!this.isInterrupted()) { @@ -132,7 +133,7 @@ public class Server extends Thread { IDataPoint dp = DataPointFactory.createDataPoint(id, knxType, description); if (dp != null) { - this.dataPoints.put(new Integer(id), dp); + this.dataPoints.put(Integer.valueOf(id), dp); } } diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java index 605f18a7b..ef2f93085 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java @@ -13,6 +13,7 @@ package org.openhab.binding.knx.internal.dpt; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.ParseException; @@ -1017,6 +1018,6 @@ public class KNXCoreTypeMapper implements KNXTypeMapper { */ private int convertPercentToByte(PercentType percent) { return percent.toBigDecimal().multiply(BigDecimal.valueOf(255)) - .divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).intValue(); + .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).intValue(); } } diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java index 812371394..d1927d1c9 100644 --- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java +++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java @@ -402,7 +402,7 @@ public class LifxLightHandler extends BaseThingHandler { Configuration configuration = channel.getConfiguration(); Object speed = configuration.get(parameter); - return speed == null ? null : new Double(speed.toString()); + return speed == null ? null : Double.valueOf(speed.toString()); } private LifxProduct getProduct() { @@ -414,7 +414,7 @@ public class LifxLightHandler extends BaseThingHandler { // Without first conversion to double, on a very first thing creation from discovery inbox, // the product type is incorrectly parsed, as framework passed it as a floating point number // (e.g. 50.0 instead of 50) - Double d = Double.parseDouble((String) propertyValue); + Double d = Double.valueOf((String) propertyValue); long productID = d.longValue(); return LifxProduct.getProductFromProductID(productID); } catch (IllegalArgumentException e) { diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/handler/NestRedirectUrlSupplier.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/handler/NestRedirectUrlSupplier.java index 3d027ced5..90d08da70 100644 --- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/handler/NestRedirectUrlSupplier.java +++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/handler/NestRedirectUrlSupplier.java @@ -71,7 +71,7 @@ public class NestRedirectUrlSupplier { * @see https://developers.nest.com/documentation/cloud/how-to-handle-redirects */ private String resolveRedirectUrl() throws FailedResolvingNestUrlException { - HttpClient httpClient = new HttpClient(new SslContextFactory()); + HttpClient httpClient = new HttpClient(new SslContextFactory.Client()); httpClient.setFollowRedirects(false); Request request = httpClient.newRequest(NestBindingConstants.NEST_URL).method(HttpMethod.GET).timeout(30, diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/ChannelTypeUtils.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/ChannelTypeUtils.java index 16cbaeda2..909187a18 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/ChannelTypeUtils.java +++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/ChannelTypeUtils.java @@ -13,6 +13,7 @@ package org.openhab.binding.netatmo.internal; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; @@ -83,7 +84,7 @@ public class ChannelTypeUtils { } public static State toDecimalType(@Nullable BigDecimal decimal) { - return decimal == null ? UnDefType.NULL : new DecimalType(decimal.setScale(2, BigDecimal.ROUND_HALF_UP)); + return decimal == null ? UnDefType.NULL : new DecimalType(decimal.setScale(2, RoundingMode.HALF_UP)); } public static State toDecimalType(@Nullable String textualDecimal) { diff --git a/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java b/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java index d8e646565..7f9f893fc 100644 --- a/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java +++ b/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java @@ -100,7 +100,7 @@ public class Main { ipAddress = parser.getIpAddress(); logger.info("IP150 IP Address: {}", ipAddress); - port = new Integer(parser.getPort()); + port = Integer.parseInt(parser.getPort()); logger.info("IP150 port: {}", port); } } diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2Message.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2Message.java index 5c660cd62..2c84bcbf7 100644 --- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2Message.java +++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2Message.java @@ -18,6 +18,7 @@ import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.Pac import static org.openhab.binding.rfxcom.internal.messages.RFXComLighting2Message.Commands.*; import java.math.BigDecimal; +import java.math.RoundingMode; import org.openhab.binding.rfxcom.internal.exceptions.RFXComException; import org.openhab.binding.rfxcom.internal.exceptions.RFXComUnsupportedChannelException; @@ -155,7 +156,7 @@ public class RFXComLighting2Message extends RFXComDeviceMessageImpl scheduledJob; public SeneyeService(SeneyeConfigurationParameters config) throws CommunicationException { diff --git a/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java b/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java index b914e5c7a..3a5726b79 100644 --- a/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/discovery/SqueezeBoxServerDiscoveryParticipant.java @@ -84,8 +84,8 @@ public class SqueezeBoxServerDiscoveryParticipant implements UpnpDiscoveryPartic String representationPropertyName = "ipAddress"; properties.put(representationPropertyName, host); - properties.put("webport", new Integer(webPort)); - properties.put("cliPort", new Integer(cliPort)); + properties.put("webport", Integer.valueOf(webPort)); + properties.put("cliPort", Integer.valueOf(cliPort)); DiscoveryResult result = DiscoveryResultBuilder.create(uid).withProperties(properties) .withRepresentationProperty(representationPropertyName).withLabel(label).build(); diff --git a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java index c95b71657..7bb4b63ba 100644 --- a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java +++ b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java @@ -13,6 +13,7 @@ package org.openhab.binding.systeminfo.internal.model; import java.math.BigDecimal; +import java.math.RoundingMode; import org.apache.commons.lang3.ArrayUtils; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -316,14 +317,14 @@ public class OSHISysteminfo implements SysteminfoInterface { @Override public @Nullable DecimalType getSensorsCpuTemperature() { BigDecimal cpuTemp = new BigDecimal(sensors.getCpuTemperature()); - cpuTemp = cpuTemp.setScale(PRECISION_AFTER_DECIMAL_SIGN, BigDecimal.ROUND_HALF_UP); + cpuTemp = cpuTemp.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.HALF_UP); return cpuTemp.signum() == 1 ? new DecimalType(cpuTemp) : null; } @Override public @Nullable DecimalType getSensorsCpuVoltage() { BigDecimal cpuVoltage = new BigDecimal(sensors.getCpuVoltage()); - cpuVoltage = cpuVoltage.setScale(PRECISION_AFTER_DECIMAL_SIGN, BigDecimal.ROUND_HALF_UP); + cpuVoltage = cpuVoltage.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.HALF_UP); return cpuVoltage.signum() == 1 ? new DecimalType(cpuVoltage) : null; } @@ -464,13 +465,13 @@ public class OSHISysteminfo implements SysteminfoInterface { private BigDecimal getPercentsValue(double decimalFraction) { BigDecimal result = new BigDecimal(decimalFraction * 100); - result = result.setScale(PRECISION_AFTER_DECIMAL_SIGN, BigDecimal.ROUND_HALF_UP); + result = result.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.HALF_UP); return result; } private BigDecimal getTimeInMinutes(double timeInSeconds) { BigDecimal timeInMinutes = new BigDecimal(timeInSeconds / 60); - timeInMinutes = timeInMinutes.setScale(PRECISION_AFTER_DECIMAL_SIGN, BigDecimal.ROUND_UP); + timeInMinutes = timeInMinutes.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.UP); return timeInMinutes; } @@ -525,7 +526,7 @@ public class OSHISysteminfo implements SysteminfoInterface { } double processorLoads[] = cpu.getSystemLoadAverage(index + 1); BigDecimal result = new BigDecimal(processorLoads[index]); - result = result.setScale(PRECISION_AFTER_DECIMAL_SIGN, BigDecimal.ROUND_HALF_UP); + result = result.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.HALF_UP); return result; } diff --git a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java index a2bd5c89e..515e840e3 100644 --- a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java +++ b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java @@ -14,6 +14,7 @@ package org.openhab.binding.tacmi.internal.schema; import java.net.URI; import java.nio.charset.StandardCharsets; +import java.util.Base64; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,7 +37,6 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; -import org.eclipse.jetty.util.B64Code; import org.openhab.binding.tacmi.internal.TACmiChannelTypeProvider; import org.openhab.core.library.types.OnOffType; import org.openhab.core.library.types.StringType; @@ -109,8 +109,8 @@ public class TACmiSchemaHandler extends BaseThingHandler { this.online = false; updateStatus(ThingStatus.UNKNOWN); - this.authHeader = "Basic " - + B64Code.encode(config.username + ":" + config.password, StandardCharsets.ISO_8859_1); + this.authHeader = "Basic " + Base64.getEncoder() + .encodeToString((config.username + ":" + config.password).getBytes(StandardCharsets.ISO_8859_1)); final String serverBase = "http://" + config.host + "/"; this.serverBase = serverBase; diff --git a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java index b75ff8cd4..e5e27deff 100644 --- a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java +++ b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java @@ -13,6 +13,7 @@ package org.openhab.binding.tado.internal.adapter; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.OffsetDateTime; import org.openhab.binding.tado.internal.TadoBindingConstants.HvacMode; @@ -48,7 +49,7 @@ import org.openhab.core.types.UnDefType; * * @author Dennis Frommknecht - Initial contribution * @author Andrew Fiddian-Green - Added Low Battery Alarm, A/C Power and Open Window channels - * + * */ public class TadoZoneStateAdapter { private ZoneState zoneState; @@ -199,7 +200,7 @@ public class TadoZoneStateAdapter { } private static DecimalType toDecimalType(double value) { - BigDecimal decimal = new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP); + BigDecimal decimal = new BigDecimal(value).setScale(2, RoundingMode.HALF_UP); return new DecimalType(decimal); } diff --git a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/BaseHomeThingHandler.java b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/BaseHomeThingHandler.java index 6aede7618..32a488170 100644 --- a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/BaseHomeThingHandler.java +++ b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/BaseHomeThingHandler.java @@ -31,7 +31,7 @@ public abstract class BaseHomeThingHandler extends BaseThingHandler { public Long getHomeId() { TadoHomeHandler handler = getHomeHandler(); - return handler != null ? handler.getHomeId() : new Long(0); + return handler != null ? handler.getHomeId() : Long.valueOf(0); } protected TadoHomeHandler getHomeHandler() { diff --git a/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java b/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java index 964f36c43..61932b4d7 100644 --- a/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java +++ b/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java @@ -36,7 +36,6 @@ import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.util.FutureResponseListener; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; -import org.eclipse.jetty.util.B64Code; import org.openhab.binding.telegram.internal.TelegramHandler; import org.openhab.core.automation.annotation.ActionInput; import org.openhab.core.automation.annotation.RuleAction; @@ -314,7 +313,8 @@ public class TelegramActions implements ThingActions { AuthenticationStore auth = client.getAuthenticationStore(); URI uri = URI.create(photoURL); auth.addAuthenticationResult(new BasicResult(HttpHeader.AUTHORIZATION, uri, - "Basic " + B64Code.encode(username + ":" + password, StandardCharsets.ISO_8859_1))); + "Basic " + Base64.getEncoder().encodeToString( + (username + ":" + password).getBytes(StandardCharsets.ISO_8859_1)))); } try { // API has 10mb limit to jpg file size, without this it can only accept 2mb diff --git a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java index 9481695a5..9f709c3f9 100644 --- a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java +++ b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java @@ -13,6 +13,7 @@ package org.openhab.binding.tellstick.internal.core; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Collections; import java.util.SortedMap; import java.util.TreeMap; @@ -119,7 +120,7 @@ public class TelldusCoreDeviceController implements DeviceChangeListener, Sensor case JNA.CLibrary.TELLSTICK_DIM: dimValue = new BigDecimal(((TellstickDevice) device).getData()); dimValue = dimValue.multiply(new BigDecimal(100)); - dimValue = dimValue.divide(new BigDecimal(255), 0, BigDecimal.ROUND_HALF_UP); + dimValue = dimValue.divide(new BigDecimal(255), 0, RoundingMode.HALF_UP); break; default: logger.warn("Could not handle {} for {}", ((TellstickDevice) device).getStatus(), device); diff --git a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/live/TelldusLiveDeviceController.java b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/live/TelldusLiveDeviceController.java index ecdd033d5..12cffa05f 100644 --- a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/live/TelldusLiveDeviceController.java +++ b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/live/TelldusLiveDeviceController.java @@ -13,6 +13,7 @@ package org.openhab.binding.tellstick.internal.live; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -248,7 +249,7 @@ public class TelldusLiveDeviceController implements DeviceChangeListener, Sensor case JNA.CLibrary.TELLSTICK_DIM: dimValue = new BigDecimal(((TellstickNetDevice) device).getStatevalue()); dimValue = dimValue.multiply(new BigDecimal(100)); - dimValue = dimValue.divide(new BigDecimal(255), 0, BigDecimal.ROUND_HALF_UP); + dimValue = dimValue.divide(new BigDecimal(255), 0, RoundingMode.HALF_UP); break; default: logger.warn("Could not handle {} for {}", (((TellstickNetDevice) device).getState()), device); diff --git a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/local/TelldusLocalDeviceController.java b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/local/TelldusLocalDeviceController.java index 425f76e29..1ab4b9dc7 100644 --- a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/local/TelldusLocalDeviceController.java +++ b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/local/TelldusLocalDeviceController.java @@ -13,6 +13,7 @@ package org.openhab.binding.tellstick.internal.local; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -221,7 +222,7 @@ public class TelldusLocalDeviceController implements DeviceChangeListener, Senso case JNA.CLibrary.TELLSTICK_DIM: dimValue = new BigDecimal(((TellstickLocalDeviceDTO) device).getStatevalue()); dimValue = dimValue.multiply(new BigDecimal(100)); - dimValue = dimValue.divide(new BigDecimal(255), 0, BigDecimal.ROUND_HALF_UP); + dimValue = dimValue.divide(new BigDecimal(255), 0, RoundingMode.HALF_UP); break; default: logger.warn("Could not handle {} for {}", (((TellstickLocalDeviceDTO) device).getState()), device); diff --git a/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java b/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java index 84f7f468c..952cbc584 100644 --- a/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java +++ b/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java @@ -69,7 +69,7 @@ public class TibberHandler extends BaseThingHandler { private static final int REQUEST_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(20); private final Logger logger = LoggerFactory.getLogger(TibberHandler.class); private final Properties httpHeader = new Properties(); - private final SslContextFactory sslContextFactory = new SslContextFactory(true); + private final SslContextFactory sslContextFactory = new SslContextFactory.Client(true); private final Executor websocketExecutor = ThreadPoolManager.getPool("tibber.websocket"); private TibberConfiguration tibberConfig = new TibberConfiguration(); private @Nullable TibberWebSocketListener socket; diff --git a/bundles/org.openhab.binding.tradfri/src/test/java/org/openhab/binding/tradfri/internal/model/TradfriVersionTest.java b/bundles/org.openhab.binding.tradfri/src/test/java/org/openhab/binding/tradfri/internal/model/TradfriVersionTest.java index 9511b609e..e184c9c25 100644 --- a/bundles/org.openhab.binding.tradfri/src/test/java/org/openhab/binding/tradfri/internal/model/TradfriVersionTest.java +++ b/bundles/org.openhab.binding.tradfri/src/test/java/org/openhab/binding/tradfri/internal/model/TradfriVersionTest.java @@ -72,7 +72,7 @@ public class TradfriVersionTest { assertTrue(VERSION.equals(new TradfriVersion(VERSION_STRING))); assertFalse(VERSION.equals((TradfriVersion) null)); - assertFalse(VERSION.equals(new Integer("1"))); + assertFalse(VERSION.equals(Integer.valueOf("1"))); assertFalse(VERSION.equals(new TradfriVersion("1.2.5"))); } diff --git a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/UniFiThingHandlerFactory.java b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/UniFiThingHandlerFactory.java index acf86a41d..36d7d395f 100644 --- a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/UniFiThingHandlerFactory.java +++ b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/UniFiThingHandlerFactory.java @@ -46,7 +46,7 @@ public class UniFiThingHandlerFactory extends BaseThingHandlerFactory { public UniFiThingHandlerFactory(@Reference final HttpClientFactory httpClientFactory) { // [wip] mgb: disabled due to missing common name attributes with certs // this.httpClient = httpClientFactory.getCommonHttpClient(); - httpClient = new HttpClient(new SslContextFactory(true)); + httpClient = new HttpClient(new SslContextFactory.Client(true)); try { httpClient.start(); } catch (Exception e) { diff --git a/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java b/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java index 37116b693..153ae2ba4 100644 --- a/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java +++ b/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java @@ -106,7 +106,7 @@ public class VenstarThermostatHandler extends ConfigStatusThingHandler { public VenstarThermostatHandler(Thing thing) { super(thing); - httpClient = new HttpClient(new SslContextFactory(true)); + httpClient = new HttpClient(new SslContextFactory.Client(true)); gson = new GsonBuilder().registerTypeAdapter(VenstarSystemState.class, new VenstarSystemStateSerializer()) .registerTypeAdapter(VenstarSystemMode.class, new VenstarSystemModeSerializer()).create(); diff --git a/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/LEDStateDTO.java b/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/LEDStateDTO.java index 0a60f42b0..a84809ac6 100644 --- a/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/LEDStateDTO.java +++ b/bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/LEDStateDTO.java @@ -16,6 +16,7 @@ import static java.lang.Math.*; import java.awt.Color; import java.math.BigDecimal; +import java.math.RoundingMode; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; @@ -92,13 +93,13 @@ public class LEDStateDTO { PercentType b = new PercentType(new BigDecimal(hsv[2]).multiply(new BigDecimal(100.0))); HSBType hsbType = new HSBType(h, s, b); - PercentType w = new PercentType(new BigDecimal(white).divide(new BigDecimal(255.0), 3, BigDecimal.ROUND_HALF_UP) + PercentType w = new PercentType(new BigDecimal(white).divide(new BigDecimal(255.0), 3, RoundingMode.HALF_UP) + .multiply(new BigDecimal(100.0))); + PercentType w2 = new PercentType(new BigDecimal(white2).divide(new BigDecimal(255.0), 3, RoundingMode.HALF_UP) .multiply(new BigDecimal(100.0))); - PercentType w2 = new PercentType(new BigDecimal(white2) - .divide(new BigDecimal(255.0), 3, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100.0))); // Range: 0x00 .. 0x1F. Speed is inversed - BigDecimal ps = new BigDecimal(programSpeed).divide(new BigDecimal(0x1f), 2, BigDecimal.ROUND_HALF_UP) + BigDecimal ps = new BigDecimal(programSpeed).divide(new BigDecimal(0x1f), 2, RoundingMode.HALF_UP) .multiply(new BigDecimal(100.0)); PercentType e = new PercentType(new BigDecimal(100.0).subtract(ps)); diff --git a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZAutomationDeviceHandler.java b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZAutomationDeviceHandler.java index 63335021b..6ee8b5042 100644 --- a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZAutomationDeviceHandler.java +++ b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZAutomationDeviceHandler.java @@ -181,7 +181,7 @@ public class ZWayZAutomationDeviceHandler extends ZWayDeviceHandler { } Calendar lastUpdateOfDevice = Calendar.getInstance(); - lastUpdateOfDevice.setTimeInMillis(new Long(device.getUpdateTime()) * 1000); + lastUpdateOfDevice.setTimeInMillis(Long.valueOf(device.getUpdateTime()) * 1000); if (lastUpdate == null || lastUpdateOfDevice.after(lastUpdate)) { lastUpdate = lastUpdateOfDevice; diff --git a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZWaveDeviceHandler.java b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZWaveDeviceHandler.java index 944df80e8..ce4b8c16b 100644 --- a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZWaveDeviceHandler.java +++ b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZWaveDeviceHandler.java @@ -211,7 +211,8 @@ public class ZWayZWaveDeviceHandler extends ZWayDeviceHandler { } Calendar lastUpdateOfDevice = Calendar.getInstance(); - lastUpdateOfDevice.setTimeInMillis(new Long(zwaveDevice.getData().getLastReceived().getUpdateTime()) * 1000); + lastUpdateOfDevice + .setTimeInMillis(Long.valueOf(zwaveDevice.getData().getLastReceived().getUpdateTime()) * 1000); if (lastUpdate == null || lastUpdateOfDevice.after(lastUpdate)) { lastUpdate = lastUpdateOfDevice; diff --git a/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java b/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java index fc2668ca8..05cd3d37b 100644 --- a/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java +++ b/bundles/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java @@ -13,6 +13,7 @@ package org.openhab.io.imperihome.internal.model.device; import java.math.BigDecimal; +import java.math.RoundingMode; import org.apache.commons.lang3.StringUtils; import org.openhab.core.items.Item; @@ -84,6 +85,6 @@ public class RgbLightDevice extends AbstractEnergyLinkDevice { private int convertPercentToByte(PercentType percent) { return percent.toBigDecimal().multiply(BigDecimal.valueOf(255)) - .divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).intValue(); + .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).intValue(); } } diff --git a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java index a3e6cbf37..d0671e30d 100644 --- a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java +++ b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java @@ -108,7 +108,7 @@ public class AstroValidConfigurationTest { public void testIfTheIntervalForASunThingIsLessThan1_theThingStatusBecomesOFFLINE() { Configuration thingConfiguration = new Configuration(); thingConfiguration.put(GEOLOCATION_PROPERTY, GEOLOCATION_VALUE); - thingConfiguration.put(INTERVAL_PROPERTY, new Integer(0)); + thingConfiguration.put(INTERVAL_PROPERTY, Integer.valueOf(0)); assertThingStatus(thingConfiguration, ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR); } @@ -116,7 +116,7 @@ public class AstroValidConfigurationTest { public void testIfTheIntervalForAMoonThingIsLessThan1_theThingStatusBecomesOFFLINE() { Configuration thingConfiguration = new Configuration(); thingConfiguration.put(GEOLOCATION_PROPERTY, GEOLOCATION_VALUE); - thingConfiguration.put(INTERVAL_PROPERTY, new Integer(0)); + thingConfiguration.put(INTERVAL_PROPERTY, Integer.valueOf(0)); assertThingStatus(thingConfiguration, ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR); } @@ -124,7 +124,7 @@ public class AstroValidConfigurationTest { public void testIfTheIntervalForASunThingIsGreaterThan86400_theThingStatusBecomesOFFLINE() { Configuration thingConfiguration = new Configuration(); thingConfiguration.put(GEOLOCATION_PROPERTY, GEOLOCATION_VALUE); - thingConfiguration.put(INTERVAL_PROPERTY, new Integer(86401)); + thingConfiguration.put(INTERVAL_PROPERTY, Integer.valueOf(86401)); assertThingStatus(thingConfiguration, ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR); } @@ -132,7 +132,7 @@ public class AstroValidConfigurationTest { public void testIfTheIntervalForAMoonThingIsGreaterThan86400_theThingStatusBecomesOFFLINE() { Configuration thingConfiguration = new Configuration(); thingConfiguration.put(GEOLOCATION_PROPERTY, GEOLOCATION_VALUE); - thingConfiguration.put(INTERVAL_PROPERTY, new Integer(86401)); + thingConfiguration.put(INTERVAL_PROPERTY, Integer.valueOf(86401)); assertThingStatus(thingConfiguration, ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR); }