adapt to core StringUtils (#15784)

Signed-off-by: Leo Siepel <leosiepel@gmail.com>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWProxy.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWProxy.java
index 82014a4008000db73f873f5daa52fc8870687d6b..6bc03775149e6696e456c1a1d1efd0b63e544913 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWProxy.java
+++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWProxy.java
@@ -52,6 +52,7 @@ import org.openhab.binding.mybmw.internal.utils.Converter;
 import org.openhab.binding.mybmw.internal.utils.HTTPConstants;
 import org.openhab.binding.mybmw.internal.utils.ImageProperties;
 import org.openhab.core.io.net.http.HttpClientFactory;
+import org.openhab.core.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -323,12 +324,12 @@ public class MyBMWProxy {
             /*
              * Step 2) Calculate values for base parameters
              */
-            String verfifierBytes = Converter.getRandomString(64);
+            String verfifierBytes = StringUtils.getRandomAlphabetic(64).toLowerCase();
             String codeVerifier = Base64.getUrlEncoder().withoutPadding().encodeToString(verfifierBytes.getBytes());
             MessageDigest digest = MessageDigest.getInstance("SHA-256");
             byte[] hash = digest.digest(codeVerifier.getBytes(StandardCharsets.UTF_8));
             String codeChallange = Base64.getUrlEncoder().withoutPadding().encodeToString(hash);
-            String stateBytes = Converter.getRandomString(16);
+            String stateBytes = StringUtils.getRandomAlphabetic(16).toLowerCase();
             String state = Base64.getUrlEncoder().withoutPadding().encodeToString(stateBytes.getBytes());
 
             MultiMap<String> baseParams = new MultiMap<String>();

diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/Converter.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/Converter.java
index 5b1047c91bc87cdac19e4dc30a21af54fa9404e5..672a9bb836e13544484370da70790c0ab8904e02 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/Converter.java
+++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/Converter.java
@@ -13,7 +13,6 @@
 package org.openhab.binding.mybmw.internal.utils;
 
 import java.lang.reflect.Type;
-import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
 import java.time.LocalTime;
 import java.time.ZoneId;
@@ -24,7 +23,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Random;
 import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -249,15 +247,6 @@ public class Converter {
         return v;
     }
 
-    public static String getRandomString(int size) {
-        int leftLimit = 97; // letter 'a'
-        int rightLimit = 122; // letter 'z'
-        Random random = new SecureRandom();
-
-        return random.ints(leftLimit, rightLimit + 1).limit(size)
-                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append).toString();
-    }
-
     public static State getLockState(boolean lock) {
         if (lock) {
             return StringType.valueOf(Constants.LOCKED);

diff --git a/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/AuthTest.java b/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/AuthTest.java
index 52f05bd57c5e7480b2624cf1848d86d548efa661..5563919a0992ff7d2d2ca53978acb49e0fcd79b3 100644 (file)
--- a/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/AuthTest.java
+++ b/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/AuthTest.java
@@ -46,6 +46,7 @@ import org.openhab.binding.mybmw.internal.utils.BimmerConstants;
 import org.openhab.binding.mybmw.internal.utils.Constants;
 import org.openhab.binding.mybmw.internal.utils.Converter;
 import org.openhab.core.io.net.http.HttpClientFactory;
+import org.openhab.core.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,16 +79,14 @@ class AuthTest {
             AuthQueryResponse aqr = Converter.getGson().fromJson(firstResponse.getContentAsString(),
                     AuthQueryResponse.class);
 
-            // String verifier_bytes = RandomStringUtils.randomAlphanumeric(64);
-            String verifierBytes = Converter.getRandomString(64);
+            String verifierBytes = StringUtils.getRandomAlphabetic(64).toLowerCase();
             String codeVerifier = Base64.getUrlEncoder().withoutPadding().encodeToString(verifierBytes.getBytes());
 
             MessageDigest digest = MessageDigest.getInstance("SHA-256");
             byte[] hash = digest.digest(codeVerifier.getBytes(StandardCharsets.UTF_8));
             String codeChallenge = Base64.getUrlEncoder().withoutPadding().encodeToString(hash);
 
-            // String state_bytes = RandomStringUtils.randomAlphanumeric(16);
-            String stateBytes = Converter.getRandomString(16);
+            String stateBytes = StringUtils.getRandomAlphabetic(16).toLowerCase();
             String state = Base64.getUrlEncoder().withoutPadding().encodeToString(stateBytes.getBytes());
 
             String authUrl = aqr.gcdmBaseUrl + BimmerConstants.OAUTH_ENDPOINT;