From a44db077c1ff985f8b5fef1d8244f90ced51777a Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Mon, 7 Sep 2020 15:05:28 +0200 Subject: [PATCH 1/2] [max] Revert "remove dependency on org.apache.commons.net.util (#8418)" This reverts commit 6aa1793c680118195f9f447ea5af09efe96f96f6. It breaks the build because test fails. Signed-off-by: Hilbrand Bouwkamp --- .../org/openhab/binding/max/internal/command/MCommand.java | 4 ++-- .../org/openhab/binding/max/internal/command/SCommand.java | 5 ++--- .../binding/max/internal/command/SConfigCommand.java | 5 ++--- .../org/openhab/binding/max/internal/command/TCommand.java | 4 ++-- .../org/openhab/binding/max/internal/message/CMessage.java | 5 +++-- .../org/openhab/binding/max/internal/message/LMessage.java | 6 +++--- .../org/openhab/binding/max/internal/message/MMessage.java | 4 ++-- .../org/openhab/binding/max/internal/message/NMessage.java | 6 +++--- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/MCommand.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/MCommand.java index 18f9431fa65d0..6e08679e47be1 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/MCommand.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/MCommand.java @@ -16,12 +16,12 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Base64; import java.util.List; import java.util.Set; import java.util.TreeSet; import org.apache.commons.lang.StringUtils; +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.openhab.binding.max.internal.device.Device; import org.openhab.binding.max.internal.device.RoomInformation; @@ -165,7 +165,7 @@ public String getCommandString() { } - final String encodedString = Base64.getEncoder().encodeToString(message.toByteArray()); + final String encodedString = Base64.encodeBase64StringUnChunked(message.toByteArray()); final StringBuilder commandStringBuilder = new StringBuilder(); int parts = (int) Math.round(encodedString.length() / MAX_MSG_LENGTH + 0.5); for (int i = 0; i < parts; i++) { diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SCommand.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SCommand.java index 04f5f508e8710..9b15010f92704 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SCommand.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SCommand.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.max.internal.command; -import java.util.Base64; - +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.openhab.binding.max.internal.device.ThermostatModeType; @@ -97,7 +96,7 @@ public String getCommandString() { final String commandString = baseString + rfAddress + Utils.toHex(roomId) + Utils.toHex(bits); - final String encodedString = Base64.getEncoder().encodeToString(Utils.hexStringToByteArray(commandString)); + final String encodedString = Base64.encodeBase64String(Utils.hexStringToByteArray(commandString)); return "s:" + encodedString; } diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SConfigCommand.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SConfigCommand.java index 611df2aafd176..7e01862e059a5 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SConfigCommand.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SConfigCommand.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.max.internal.command; -import java.util.Base64; - +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -152,7 +151,7 @@ public String getCommandString() { commandString = commandString + Utils.toHex(roomId) + commandConfigString; } - String encodedString = Base64.getEncoder().encodeToString(Utils.hexStringToByteArray(commandString)); + String encodedString = Base64.encodeBase64String(Utils.hexStringToByteArray(commandString)); return "s:" + encodedString; } diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/TCommand.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/TCommand.java index 7f258723e233d..486f8a88fbda0 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/TCommand.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/TCommand.java @@ -13,10 +13,10 @@ package org.openhab.binding.max.internal.command; import java.util.ArrayList; -import java.util.Base64; import java.util.List; import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; /** @@ -51,7 +51,7 @@ public String getCommandString() { for (String rfAddress : rfAddresses) { commandArray = ArrayUtils.addAll(Utils.hexStringToByteArray(rfAddress), commandArray); } - String encodedString = Base64.getEncoder().encodeToString(commandArray); + String encodedString = Base64.encodeBase64StringUnChunked(commandArray); return "t:" + String.format("%02d", rfAddresses.size()) + "," + updateForced + "," + encodedString + '\r' + '\n'; diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/CMessage.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/CMessage.java index 213dcaa92d46a..2ca823e2616ca 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/CMessage.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/CMessage.java @@ -19,13 +19,13 @@ import java.math.RoundingMode; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.Base64; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.openhab.binding.max.internal.device.DeviceType; import org.slf4j.Logger; @@ -67,7 +67,8 @@ public CMessage(String raw) { String[] tokens = this.getPayload().split(Message.DELIMETER); rfAddress = tokens[0]; - byte[] bytes = Base64.getDecoder().decode((tokens[1].getBytes(StandardCharsets.UTF_8))); + + byte[] bytes = Base64.decodeBase64(tokens[1].getBytes(StandardCharsets.UTF_8)); int[] data = new int[bytes.length]; diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/LMessage.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/LMessage.java index b7152fbfbc77a..24bf9348d1feb 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/LMessage.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/LMessage.java @@ -14,10 +14,10 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Base64; import java.util.Collection; import java.util.List; +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.openhab.binding.max.internal.device.Device; import org.openhab.binding.max.internal.device.DeviceConfiguration; @@ -39,7 +39,7 @@ public LMessage(String raw) { public Collection getDevices(List configurations) { final List devices = new ArrayList<>(); - final byte[] decodedRawMessage = Base64.getDecoder().decode(getPayload().getBytes(StandardCharsets.UTF_8)); + final byte[] decodedRawMessage = Base64.decodeBase64(getPayload().getBytes(StandardCharsets.UTF_8)); final MaxTokenizer tokenizer = new MaxTokenizer(decodedRawMessage); @@ -55,7 +55,7 @@ public Collection getDevices(List configu } public Collection updateDevices(List devices, List configurations) { - byte[] decodedRawMessage = Base64.getDecoder().decode(getPayload().getBytes(StandardCharsets.UTF_8)); + byte[] decodedRawMessage = Base64.decodeBase64(getPayload().getBytes(StandardCharsets.UTF_8)); MaxTokenizer tokenizer = new MaxTokenizer(decodedRawMessage); diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MMessage.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MMessage.java index ada0d9e9a94a4..f933fdf20a8d2 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MMessage.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MMessage.java @@ -14,9 +14,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Base64; import java.util.List; +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.openhab.binding.max.internal.device.DeviceInformation; import org.openhab.binding.max.internal.device.DeviceType; @@ -49,7 +49,7 @@ public MMessage(String raw) { return; } try { - byte[] bytes = Base64.getDecoder().decode(tokens[2].getBytes(StandardCharsets.UTF_8)); + byte[] bytes = Base64.decodeBase64(tokens[2].getBytes(StandardCharsets.UTF_8)); hasConfiguration = true; logger.trace("*** M Message trace**** "); diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/NMessage.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/NMessage.java index 385783a3506ce..52ffbc4392fb0 100644 --- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/NMessage.java +++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/NMessage.java @@ -13,8 +13,8 @@ package org.openhab.binding.max.internal.message; import java.nio.charset.StandardCharsets; -import java.util.Base64; +import org.apache.commons.net.util.Base64; import org.openhab.binding.max.internal.Utils; import org.openhab.binding.max.internal.device.DeviceType; import org.slf4j.Logger; @@ -45,8 +45,8 @@ public NMessage(String raw) { if (msgPayload.length() > 0) { try { - decodedPayload = new String(Base64.getDecoder().decode(msgPayload), StandardCharsets.UTF_8); - byte[] bytes = Base64.getDecoder().decode(msgPayload); + decodedPayload = new String(Base64.decodeBase64(msgPayload), StandardCharsets.UTF_8); + byte[] bytes = Base64.decodeBase64(msgPayload); deviceType = DeviceType.create(bytes[0] & 0xFF); rfAddress = Utils.toHex(bytes[1] & 0xFF, bytes[2] & 0xFF, bytes[3] & 0xFF); From 8a6261dc33de4d07818aee78b26baa6ef03d9a45 Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Mon, 7 Sep 2020 15:08:00 +0200 Subject: [PATCH 2/2] [max] Moved standard unit test to binding itself. Signed-off-by: Hilbrand Bouwkamp --- .../org/openhab/binding/max/internal/command/FCommandTest.java | 0 .../org/openhab/binding/max/internal/command/MCommandTest.java | 0 .../org/openhab/binding/max/internal/command/SCommandTest.java | 0 .../openhab/binding/max/internal/command/SConfigCommandTest.java | 0 .../org/openhab/binding/max/internal/command/TCommandTest.java | 0 .../org/openhab/binding/max/internal/command/ZCommandTest.java | 0 .../org/openhab/binding/max/internal/message/CMessageTest.java | 0 .../openhab/binding/max/internal/message/ConfigurationTest.java | 0 .../org/openhab/binding/max/internal/message/FMessageTest.java | 0 .../org/openhab/binding/max/internal/message/HMessageTest.java | 0 .../org/openhab/binding/max/internal/message/LMessageTest.java | 0 .../org/openhab/binding/max/internal/message/MMessageTest.java | 0 .../binding/max/internal/message/MessageProcessorTest.java | 0 .../org/openhab/binding/max/internal/message/NMessageTest.java | 0 .../org/openhab/binding/max/internal/message/SMessageTest.java | 0 .../java/org/openhab/binding/max/internal/message/UtilsTest.java | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/command/FCommandTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/command/MCommandTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/command/SCommandTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/command/SConfigCommandTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/command/TCommandTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/command/ZCommandTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/CMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/ConfigurationTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/FMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/HMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/LMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/MMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/MessageProcessorTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/NMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/SMessageTest.java (100%) rename {itests/org.openhab.binding.max.tests/src/main => bundles/org.openhab.binding.max/src/test}/java/org/openhab/binding/max/internal/message/UtilsTest.java (100%) diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/FCommandTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/FCommandTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/FCommandTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/FCommandTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/MCommandTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/MCommandTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/MCommandTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/MCommandTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/SCommandTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/SCommandTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/SCommandTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/SCommandTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/SConfigCommandTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/SConfigCommandTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/SConfigCommandTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/SConfigCommandTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/TCommandTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/TCommandTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/TCommandTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/TCommandTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/ZCommandTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/ZCommandTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/command/ZCommandTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/command/ZCommandTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/CMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/CMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/CMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/CMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/ConfigurationTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/ConfigurationTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/ConfigurationTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/ConfigurationTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/FMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/FMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/FMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/FMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/HMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/HMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/HMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/HMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/LMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/LMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/LMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/LMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/MMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/MMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/MMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/MMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/MessageProcessorTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/MessageProcessorTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/MessageProcessorTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/MessageProcessorTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/NMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/NMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/NMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/NMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/SMessageTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/SMessageTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/SMessageTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/SMessageTest.java diff --git a/itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/UtilsTest.java b/bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/UtilsTest.java similarity index 100% rename from itests/org.openhab.binding.max.tests/src/main/java/org/openhab/binding/max/internal/message/UtilsTest.java rename to bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/UtilsTest.java