dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tbel: encodeURI() decodeURI() comments 2

Browse Source
This commit is contained in:
nick 2024-04-17 13:09:54 +03:00
parent 332c676317
commit 4e9d03fce4
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
View File

@ -43,7 +43,6 @@ import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -612,22 +611,6 @@ public class TbUtils {
return BigDecimal.valueOf(value).setScale(precision, RoundingMode.HALF_UP).floatValue(); return BigDecimal.valueOf(value).setScale(precision, RoundingMode.HALF_UP).floatValue();
} }
private static boolean isHexadecimal(String value) {
return value != null && (value.contains("0x") || value.contains("0X"));
}
private static String prepareNumberString(String value) {
if (value != null) {
value = value.trim();
if (isHexadecimal(value)) {
value = value.replace("0x", "");
value = value.replace("0X", "");
}
value = value.replace(",", ".");
}
return value;
}
public static ExecutionHashMap<String, Object> toFlatMap(ExecutionContext ctx, Map<String, Object> json) { public static ExecutionHashMap<String, Object> toFlatMap(ExecutionContext ctx, Map<String, Object> json) {
return toFlatMap(ctx, json, new ArrayList<>(), true); return toFlatMap(ctx, json, new ArrayList<>(), true);
} }
@ -646,23 +629,22 @@ public class TbUtils {
return map; return map;
} }
public static String encodeURI(String uri) { public static String encodeURI(String uri) {
String encoded = URLEncoder.encode(uri, StandardCharsets.UTF_8); String encoded = URLEncoder.encode(uri, StandardCharsets.UTF_8);
Optional<String> encodedMdnOpt = Optional.of(encoded);
for (var entry : mdnEncodingReplacements.entrySet()) { for (var entry : mdnEncodingReplacements.entrySet()) {
encodedMdnOpt = Optional.of(encodedMdnOpt.get().replaceAll(entry.getKey(), entry.getValue())); encoded = encoded.replaceAll(entry.getKey(), entry.getValue());
} }
return encodedMdnOpt.orElse(null); return encoded;
} }
public static String decodeURI(String uri) { public static String decodeURI(String uri) {
ArrayList<String> allKeys = new ArrayList<>(mdnEncodingReplacements.keySet()); ArrayList<String> allKeys = new ArrayList<>(mdnEncodingReplacements.keySet());
Collections.reverse(allKeys); Collections.reverse(allKeys);
Optional<String> encodedMdnOpt = Optional.of(uri);
for (String strKey : allKeys) { for (String strKey : allKeys) {
encodedMdnOpt = Optional.of(encodedMdnOpt.get().replaceAll(mdnEncodingReplacements.get(strKey), strKey)); uri = uri.replaceAll(mdnEncodingReplacements.get(strKey), strKey);
} }
return encodedMdnOpt.map(s -> URLDecoder.decode(s, StandardCharsets.UTF_8)).orElse(null); return URLDecoder.decode(uri, StandardCharsets.UTF_8);
} }
private static void parseRecursive(Object json, Map<String, Object> map, List<String> excludeList, String path, boolean pathInKey) { private static void parseRecursive(Object json, Map<String, Object> map, List<String> excludeList, String path, boolean pathInKey) {
@ -705,6 +687,22 @@ public class TbUtils {
} }
} }
private static boolean isHexadecimal(String value) {
return value != null && (value.contains("0x") || value.contains("0X"));
}
private static String prepareNumberString(String value) {
if (value != null) {
value = value.trim();
if (isHexadecimal(value)) {
value = value.replace("0x", "");
value = value.replace("0X", "");
}
value = value.replace(",", ".");
}
return value;
}
private static boolean isValidRadix(String value, int radix) { private static boolean isValidRadix(String value, int radix) {
for (int i = 0; i < value.length(); i++) { for (int i = 0; i < value.length(); i++) {
if (i == 0 && value.charAt(i) == '-') { if (i == 0 && value.charAt(i) == '-') {