[max] Revert of openhab#8418 and move standard max tests to binding (o…

…penhab#8423) This reverts commit 6aa1793. It breaks the build because test fails. Moved standard unit test to binding itself. Signed-off-by: Hilbrand Bouwkamp <[email protected]>
markus7017 · Sep 18, 2020 · 4d15c36 · 4d15c36
1 parent fe27e51
commit 4d15c36
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 20 deletions.
diff --git a/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/MCommand.java b/....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/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SCommand.java b/....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/...ab.binding.max/src/main/java/org/openhab/binding/max/internal/command/SConfigCommand.java b/...ab.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/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/TCommand.java b/....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/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/CMessage.java b/....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/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/LMessage.java b/....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<? extends Device> getDevices(List<DeviceConfiguration> configurations) {
         final List<Device> 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<? extends Device> getDevices(List<DeviceConfiguration> configu
     }
 
     public Collection<? extends Device> updateDevices(List<Device> devices, List<DeviceConfiguration> 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/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MMessage.java b/....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/....openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/NMessage.java b/....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);

diff --git a/...ng/max/internal/command/FCommandTest.java → ...ng/max/internal/command/FCommandTest.java b/...ng/max/internal/command/FCommandTest.java → ...ng/max/internal/command/FCommandTest.java
diff --git a/...ng/max/internal/command/MCommandTest.java → ...ng/max/internal/command/MCommandTest.java b/...ng/max/internal/command/MCommandTest.java → ...ng/max/internal/command/MCommandTest.java
diff --git a/...ng/max/internal/command/SCommandTest.java → ...ng/max/internal/command/SCommandTest.java b/...ng/max/internal/command/SCommandTest.java → ...ng/max/internal/command/SCommandTest.java
diff --git a/.../internal/command/SConfigCommandTest.java → .../internal/command/SConfigCommandTest.java b/.../internal/command/SConfigCommandTest.java → .../internal/command/SConfigCommandTest.java
diff --git a/...ng/max/internal/command/TCommandTest.java → ...ng/max/internal/command/TCommandTest.java b/...ng/max/internal/command/TCommandTest.java → ...ng/max/internal/command/TCommandTest.java
diff --git a/...ng/max/internal/command/ZCommandTest.java → ...ng/max/internal/command/ZCommandTest.java b/...ng/max/internal/command/ZCommandTest.java → ...ng/max/internal/command/ZCommandTest.java
diff --git a/...ng/max/internal/message/CMessageTest.java → ...ng/max/internal/message/CMessageTest.java b/...ng/max/internal/message/CMessageTest.java → ...ng/max/internal/message/CMessageTest.java
diff --git a/...x/internal/message/ConfigurationTest.java → ...x/internal/message/ConfigurationTest.java b/...x/internal/message/ConfigurationTest.java → ...x/internal/message/ConfigurationTest.java
diff --git a/...ng/max/internal/message/FMessageTest.java → ...ng/max/internal/message/FMessageTest.java b/...ng/max/internal/message/FMessageTest.java → ...ng/max/internal/message/FMessageTest.java
diff --git a/...ng/max/internal/message/HMessageTest.java → ...ng/max/internal/message/HMessageTest.java b/...ng/max/internal/message/HMessageTest.java → ...ng/max/internal/message/HMessageTest.java
diff --git a/...ng/max/internal/message/LMessageTest.java → ...ng/max/internal/message/LMessageTest.java b/...ng/max/internal/message/LMessageTest.java → ...ng/max/internal/message/LMessageTest.java
diff --git a/...ng/max/internal/message/MMessageTest.java → ...ng/max/internal/message/MMessageTest.java b/...ng/max/internal/message/MMessageTest.java → ...ng/max/internal/message/MMessageTest.java
diff --git a/...nternal/message/MessageProcessorTest.java → ...nternal/message/MessageProcessorTest.java b/...nternal/message/MessageProcessorTest.java → ...nternal/message/MessageProcessorTest.java
diff --git a/...ng/max/internal/message/NMessageTest.java → ...ng/max/internal/message/NMessageTest.java b/...ng/max/internal/message/NMessageTest.java → ...ng/max/internal/message/NMessageTest.java
diff --git a/...ng/max/internal/message/SMessageTest.java → ...ng/max/internal/message/SMessageTest.java b/...ng/max/internal/message/SMessageTest.java → ...ng/max/internal/message/SMessageTest.java
diff --git a/...nding/max/internal/message/UtilsTest.java → ...nding/max/internal/message/UtilsTest.java b/...nding/max/internal/message/UtilsTest.java → ...nding/max/internal/message/UtilsTest.java