Fix Java and Jetty deprecations (openhab#10349)

Signed-off-by: Wouter Born <github@maindrain.net>
thinkingstone · Nov 7, 2021 · 5fce855 · 5fce855
1 parent 8bd86c8
commit 5fce855
Show file tree

Hide file tree

Showing 43 changed files with 98 additions and 80 deletions.
diff --git a/...main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java b/...main/java/org/openhab/binding/autelis/internal/discovery/AutelisDiscoveryParticipant.java
@@ -65,7 +65,7 @@ public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
             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/...ng.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java b/...ng.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.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 @@ private void configure() {
         }
 
         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/...ain/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java b/...ain/java/org/openhab/binding/bticinosmarther/internal/account/SmartherAccountService.java
@@ -22,13 +22,13 @@
 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<SmartherAccountHandler> handlers = new ConcurrentHashSet<>();
+    private final Set<SmartherAccountHandler> handlers = ConcurrentHashMap.newKeySet();
 
     private @Nullable HttpService httpService;
     private @Nullable BundleContext bundleContext;

diff --git a/....openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java b/....openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10Interface.java
@@ -357,7 +357,7 @@ public boolean sendFunction(String address, int function, int dims) throws Inval
      */
     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/...sternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java b/...sternet/src/main/java/org/openhab/binding/coolmasternet/internal/handler/HVACHandler.java
@@ -136,7 +136,7 @@ public void handleCommand(final ChannelUID channelUID, final Command command) {
                     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 void handleCommand(final ChannelUID channelUID, final Command command) {
                     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/...daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinHttpClientFactoryImpl.java b/...daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinHttpClientFactoryImpl.java
@@ -62,7 +62,7 @@ protected void deactivate() {
 
     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/...lstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/DeviceHandler.java b/...lstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/DeviceHandler.java
@@ -15,6 +15,7 @@
 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 @@ private int fromValueToPercent(int value, int max) {
         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/...binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/BaseDmxChannel.java b/...binding.dmx/src/main/java/org/openhab/binding/dmx/internal/multiverse/BaseDmxChannel.java
@@ -95,9 +95,10 @@ public int compareTo(BaseDmxChannel otherDmxChannel) {
         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/...rg.openhab.binding.feican/src/main/java/org/openhab/binding/feican/internal/Commands.java b/...rg.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 byte[] color(HSBType color) {
      */
     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/...hab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java b/...hab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeHandler.java
@@ -16,6 +16,7 @@
 
 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 @@ private String logInfo(String msgKey, Object... arg) {
 
     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/...nhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpHandlerFactory.java b/...nhab.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/.../org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java b/.../org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java
@@ -202,7 +202,7 @@ private static void addChannelsFromProjectFile(Thing thing, NodeList nodes, Stri
                 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/...smarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java b/...smarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java
@@ -149,7 +149,7 @@ public void onMessage(String msg) {
     }
 
     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
@@ -85,6 +85,7 @@ public boolean getConnected() {
      * Starts the server
      *
      */
+    @Override
     public void run() {
         this.startRetries = 0;
         while (!this.isInterrupted()) {
@@ -132,7 +133,7 @@ public void addDataPoint(int id, String knxType, String description) {
 
         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/...hab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java b/...hab.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 @@ private int getMainNumber(String dptID) {
      */
     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/...inding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java b/...inding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java
@@ -402,7 +402,7 @@ public String getLogId(@Nullable MACAddress macAddress, @Nullable InetSocketAddr
 
         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 @@ private LifxProduct getProduct() {
             // 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/...nest/src/main/java/org/openhab/binding/nest/internal/handler/NestRedirectUrlSupplier.java b/...nest/src/main/java/org/openhab/binding/nest/internal/handler/NestRedirectUrlSupplier.java
@@ -71,7 +71,7 @@ public void resetCache() {
      * @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/....binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/ChannelTypeUtils.java b/....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 static State toDecimalType(double value) {
     }
 
     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
@@ -100,7 +100,7 @@ private static void readArguments(String[] args) {
         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/...om/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2Message.java b/...om/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2Message.java
@@ -18,6 +18,7 @@
 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 String getDeviceId() {
      */
     public static int getDimLevelFromPercentType(PercentType pt) {
         return pt.toBigDecimal().multiply(BigDecimal.valueOf(15))
-                .divide(PercentType.HUNDRED.toBigDecimal(), 0, BigDecimal.ROUND_UP).intValue();
+                .divide(PercentType.HUNDRED.toBigDecimal(), 0, RoundingMode.UP).intValue();
     }
 
     /**
@@ -168,7 +169,7 @@ public static PercentType getPercentTypeFromDimLevel(int value) {
         value = Math.min(value, 15);
 
         return new PercentType(BigDecimal.valueOf(value).multiply(BigDecimal.valueOf(100))
-                .divide(BigDecimal.valueOf(15), 0, BigDecimal.ROUND_UP).intValue());
+                .divide(BigDecimal.valueOf(15), 0, RoundingMode.UP).intValue());
     }
 
     @Override

diff --git a/...om/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting5Message.java b/...om/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting5Message.java
@@ -17,6 +17,7 @@
 import static org.openhab.binding.rfxcom.internal.messages.RFXComLighting5Message.SubType.*;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Arrays;
 import java.util.List;
 
@@ -216,7 +217,7 @@ public String getDeviceId() {
      */
     public static int getDimLevelFromPercentType(PercentType pt) {
         return pt.toBigDecimal().multiply(BigDecimal.valueOf(31))
-                .divide(PercentType.HUNDRED.toBigDecimal(), 0, BigDecimal.ROUND_UP).intValue();
+                .divide(PercentType.HUNDRED.toBigDecimal(), 0, RoundingMode.UP).intValue();
     }
 
     /**
@@ -229,7 +230,7 @@ public static PercentType getPercentTypeFromDimLevel(int value) {
         value = Math.min(value, 31);
 
         return new PercentType(BigDecimal.valueOf(value).multiply(BigDecimal.valueOf(100))
-                .divide(BigDecimal.valueOf(31), 0, BigDecimal.ROUND_UP).intValue());
+                .divide(BigDecimal.valueOf(31), 0, RoundingMode.UP).intValue());
     }
 
     @Override

diff --git a/...om/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComRFXSensorMessage.java b/...om/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComRFXSensorMessage.java
@@ -12,8 +12,7 @@
  */
 package org.openhab.binding.rfxcom.internal.messages;
 
-import static java.math.BigDecimal.*;
-import static java.math.RoundingMode.HALF_DOWN;
+import static java.math.RoundingMode.*;
 import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
 import static org.openhab.binding.rfxcom.internal.messages.ByteEnumUtil.fromByte;
 
@@ -257,12 +256,12 @@ private State handleHumidity(DeviceState deviceState) {
         BigDecimal supplyVoltage = ((DecimalType) referenceVoltageState).toBigDecimal();
 
         // RH = (((A/D voltage / supply voltage) - 0.16) / 0.0062) / (1.0546 - 0.00216 * temperature)
-        BigDecimal belowTheDivider = adVoltage.divide(supplyVoltage, 4, ROUND_HALF_DOWN)
-                .subtract(HUMIDITY_VOLTAGE_SUBTRACTION).divide(HUMIDITY_VOLTAGE_DIVIDER, 4, ROUND_HALF_DOWN);
+        BigDecimal belowTheDivider = adVoltage.divide(supplyVoltage, 4, HALF_DOWN)
+                .subtract(HUMIDITY_VOLTAGE_SUBTRACTION).divide(HUMIDITY_VOLTAGE_DIVIDER, 4, HALF_DOWN);
         BigDecimal underTheDivider = HUMIDITY_TEMPERATURE_CORRECTION
                 .subtract(HUMIDITY_TEMPERATURE_MULTIPLIER.multiply(temperature));
 
-        return new DecimalType(belowTheDivider.divide(underTheDivider, 4, ROUND_HALF_DOWN));
+        return new DecimalType(belowTheDivider.divide(underTheDivider, 4, HALF_DOWN));
     }
 
     private State handlePressure(DeviceState deviceState) {
@@ -277,14 +276,14 @@ private State handlePressure(DeviceState deviceState) {
 
         // hPa = ((A/D voltage / supply voltage) + 0.095) / 0.0009
         return new DecimalType((adVoltage.divide(supplyVoltage, 4, HALF_DOWN).add(PRESSURE_ADDITION))
-                .divide(PRESSURE_DIVIDER, 4, ROUND_HALF_DOWN));
+                .divide(PRESSURE_DIVIDER, 4, HALF_DOWN));
     }
 
     private BigDecimal getVoltage() {
         if (miliVoltageTimesTen == null) {
             return null;
         }
-        return miliVoltageTimesTen.divide(ONE_HUNDRED, 100, ROUND_CEILING);
+        return miliVoltageTimesTen.divide(ONE_HUNDRED, 100, CEILING);
     }
 
     @Override