Skip to content

Commit 041c301

Browse files
authored
adapt to core StringUtils (openhab#15787)
Signed-off-by: Leo Siepel <[email protected]>
1 parent 468a245 commit 041c301

File tree

1 file changed

+2
-12
lines changed
  • bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal

1 file changed

+2
-12
lines changed

bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java

+2-12
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.io.IOException;
1818
import java.nio.charset.StandardCharsets;
1919
import java.nio.file.Files;
20-
import java.security.SecureRandom;
2120
import java.util.Arrays;
2221
import java.util.HashSet;
2322
import java.util.List;
@@ -47,6 +46,7 @@
4746
import org.openhab.core.net.HttpServiceUtil;
4847
import org.openhab.core.types.Command;
4948
import org.openhab.core.types.TypeParser;
49+
import org.openhab.core.util.StringUtils;
5050
import org.openhab.io.openhabcloud.NotificationAction;
5151
import org.osgi.framework.BundleContext;
5252
import org.osgi.framework.Constants;
@@ -80,8 +80,6 @@ public class CloudService implements ActionService, CloudClientListener, EventSu
8080
private static final int DEFAULT_LOCAL_OPENHAB_MAX_CONCURRENT_REQUESTS = 200;
8181
private static final int DEFAULT_LOCAL_OPENHAB_REQUEST_TIMEOUT = 30000;
8282
private static final String HTTPCLIENT_NAME = "openhabcloud";
83-
private static final String CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
84-
private static final SecureRandom SR = new SecureRandom();
8583

8684
private final Logger logger = LoggerFactory.getLogger(CloudService.class);
8785

@@ -292,14 +290,6 @@ private void writeFile(File file, String content) {
292290
}
293291
}
294292

295-
private String randomString(int length) {
296-
StringBuilder sb = new StringBuilder(length);
297-
for (int i = 0; i < length; i++) {
298-
sb.append(CHARS.charAt(SR.nextInt(CHARS.length())));
299-
}
300-
return sb.toString();
301-
}
302-
303293
/**
304294
* Creates a random secret and writes it to the <code>userdata/openhabcloud</code>
305295
* directory. An existing <code>secret</code> file won't be overwritten.
@@ -310,7 +300,7 @@ private String getSecret() {
310300
String newSecretString = "";
311301

312302
if (!file.exists()) {
313-
newSecretString = randomString(20);
303+
newSecretString = StringUtils.getRandomAlphanumeric(20);
314304
logger.debug("New secret = {}", censored(newSecretString));
315305
writeFile(file, newSecretString);
316306
} else {

0 commit comments

Comments
 (0)