From 3dcd8f0cfad230ac56a0ecbea7c366bc4c9e875a Mon Sep 17 00:00:00 2001 From: robnielsen Date: Sat, 20 Jun 2020 12:23:53 -0500 Subject: [PATCH] [insteon] Fix Java 11 deprecation messages (#7951) Signed-off-by: Rob Nielsen --- .../org/openhab/binding/insteon/internal/device/X10.java | 4 ++-- .../org/openhab/binding/insteon/internal/driver/Port.java | 2 +- .../org/openhab/binding/insteon/internal/message/Msg.java | 6 +++--- .../openhab/binding/insteon/internal/message/MsgType.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/X10.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/X10.java index 1190e79b60192..122e616530bd7 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/X10.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/X10.java @@ -69,7 +69,7 @@ public byte code() { * @return clear text house code, i.e letter A-P */ public static String houseToString(byte c) { - String s = houseCodeToString.get(new Integer(c & 0xff)); + String s = houseCodeToString.get(c & 0xff); return (s == null) ? "X" : s; } @@ -80,7 +80,7 @@ public static String houseToString(byte c) { * @return decoded integer, i.e. number 0-16 */ public static int unitToInt(byte c) { - Integer i = unitCodeToInt.get(new Integer(c & 0xff)); + Integer i = unitCodeToInt.get(c & 0xff); return (i == null) ? -1 : i; } diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/Port.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/Port.java index 2737eee2735ac..e10313f6f7d57 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/Port.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/Port.java @@ -374,7 +374,7 @@ private int dropBytes(byte[] buffer, int len) { ArrayList l = new ArrayList<>(); for (int i = 0; i < len; i++) { if (rng.nextInt(100) >= dropRate) { - l.add(new Byte(buffer[i])); + l.add(buffer[i]); } } for (int i = 0; i < l.size(); i++) { diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java index 7dbcf68fe677f..6776722813282 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java @@ -536,7 +536,7 @@ public int compare(@Nullable Field f1, @Nullable Field f2) { * @return the length of the header to expect */ public static int getHeaderLength(byte cmd) { - Integer len = HEADER_MAP.get(new Integer(cmd)); + Integer len = HEADER_MAP.get((int) cmd); if (len == null) { return (-1); // not found } @@ -603,7 +603,7 @@ private static int cmdToKey(byte cmd, boolean isExtended) { private static void buildHeaderMap() { for (Msg m : MSG_MAP.values()) { if (m.getDirection() == Direction.FROM_MODEM) { - HEADER_MAP.put(new Integer(m.getCommandNumber()), m.getHeaderLength()); + HEADER_MAP.put((int) m.getCommandNumber(), m.getHeaderLength()); } } } @@ -611,7 +611,7 @@ private static void buildHeaderMap() { private static void buildLengthMap() { for (Msg m : MSG_MAP.values()) { if (m.getDirection() == Direction.FROM_MODEM) { - Integer key = new Integer(cmdToKey(m.getCommandNumber(), m.isExtended())); + int key = cmdToKey(m.getCommandNumber(), m.isExtended()); REPLY_MAP.put(key, m); } } diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgType.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgType.java index c0eac34a86bda..2902043730002 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgType.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgType.java @@ -62,7 +62,7 @@ public enum MsgType { static { for (MsgType t : MsgType.values()) { - Integer i = new Integer(t.getByteValue() & 0xff); + int i = t.getByteValue() & 0xff; hash.put(i, t); } } @@ -72,7 +72,7 @@ private int getByteValue() { } public static MsgType fromValue(byte b) throws IllegalArgumentException { - Integer i = new Integer((b & 0xe0)); + int i = b & 0xe0; @Nullable MsgType mt = hash.get(i); if (mt == null) {