This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b34cc8f402 use java.net.URLEncoder/Decoder instead of buggy custom
impl.
new 22ac7e1a08 Merge pull request #4749 from mbien/task-categories-fix
b34cc8f402 is described below
commit b34cc8f402600a21b72a035b58aa16911fd5915f
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Fri Oct 7 17:18:17 2022 +0200
use java.net.URLEncoder/Decoder instead of buggy custom impl.
This isn't optimal since the methods are used to encode file names
(255 char limit on windows), but since this is public API its still
worth fixing since it didn't support non latin chars properly.
---
.../modules/bugtracking/commons/TextUtils.java | 46 ++++++----------------
1 file changed, 13 insertions(+), 33 deletions(-)
diff --git
a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/TextUtils.java
b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/TextUtils.java
index 7a7128235b..5ef8fea0b6 100644
---
a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/TextUtils.java
+++
b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/TextUtils.java
@@ -19,6 +19,10 @@
package org.netbeans.modules.bugtracking.commons;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -184,24 +188,17 @@ public class TextUtils {
* Encodes URL by encoding to %XX escape sequences.
*
* @param url url to decode
- * @return decoded url
+ * @return encoded url
*/
public static String encodeURL(String url) {
if (url == null) {
return null;
}
- StringBuffer sb = new StringBuffer(url.length());
-
- for (int i = 0; i < url.length(); i++) {
- char c = url.charAt(i);
- if (!isAlowedChar(c)) {
- sb.append('%');
// NOI18N
- sb.append(Integer.toHexString(c).toUpperCase());
- } else {
- sb.append(c);
- }
+ try {
+ return URLEncoder.encode(url,
StandardCharsets.UTF_8.name()).replace("+", "%20");
+ } catch (UnsupportedEncodingException ignored) {
+ return null;
}
- return sb.toString();
}
/**
@@ -214,30 +211,13 @@ public class TextUtils {
if (encoded == null) {
return null;
}
- StringBuilder sb = new StringBuilder(encoded.length());
-
- for (int i = 0; i < encoded.length(); i++) {
- char c = encoded.charAt(i);
- if (c == '%') {
- String code = encoded.substring(i + 1, i + 3);
- char decode = (char) Integer.parseInt(code, 16);
- sb.append(decode);
- i += 2;
- } else {
- sb.append(c);
- }
+ try {
+ return URLDecoder.decode(encoded, StandardCharsets.UTF_8.name());
+ } catch (UnsupportedEncodingException ignored) {
+ return null;
}
- return sb.toString();
}
- private static boolean isAlowedChar(char c) {
- return c >= '0' && c <= '9' ||
// NOI18N
- c >= 'A' && c <= 'Z' ||
// NOI18N
- c >= 'a' && c <= 'z' ||
// NOI18N
- c == '.' ||
// NOI18N
- c == '_';
// NOI18N
- }
-
public static String getMD5(String name) {
MessageDigest digest;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
