You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by vg...@apache.org on 2024/08/22 13:16:06 UTC
(incubator-hugegraph) branch migrate-commons created (now 0f87b1817)
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a change to branch migrate-commons
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
at 0f87b1817 feat(common): add a tool method encode (#146)
This branch includes the following new commits:
new 0f87b1817 feat(common): add a tool method encode (#146)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(incubator-hugegraph) 01/01: feat(common): add a tool method encode (#146)
Posted by vg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a commit to branch migrate-commons
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 0f87b18172f584434c61100e4c1b8176c1b58c1e
Author: John <th...@qq.com>
AuthorDate: Tue Aug 20 18:26:48 2024 +0800
feat(common): add a tool method encode (#146)
---
.../apache/hugegraph/rest/AbstractRestClient.java | 11 +++++
.../org/apache/hugegraph/unit/UnitTestSuite.java | 2 +
.../unit/rest/AbstractRestClientTest.java | 57 ++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java b/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java
index 2b08e69b3..c13a686b7 100644
--- a/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java
+++ b/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java
@@ -19,7 +19,10 @@ package org.apache.hugegraph.rest;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.util.Arrays;
import java.util.Collection;
@@ -411,6 +414,14 @@ public abstract class AbstractRestClient implements RestClient {
}
}
+ public static String encode(String raw) {
+ try {
+ return URLEncoder.encode(raw, StandardCharsets.UTF_8.toString()).replace("+", "%2B");
+ } catch (UnsupportedEncodingException e) {
+ throw new IllegalArgumentException("Failed to encode string: " + raw, e);
+ }
+ }
+
public void resetAuthContext() {
this.authContext.remove();
}
diff --git a/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java b/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
index 838928193..80095d1cc 100644
--- a/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
+++ b/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
@@ -22,6 +22,7 @@ import org.apache.hugegraph.testutil.WhiteboxTest;
import org.apache.hugegraph.unit.config.HugeConfigTest;
import org.apache.hugegraph.unit.config.OptionSpaceTest;
import org.apache.hugegraph.unit.event.EventHubTest;
+import org.apache.hugegraph.unit.rest.AbstractRestClientTest;
import org.apache.hugegraph.unit.version.VersionTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -83,6 +84,7 @@ import org.apache.hugegraph.unit.util.VersionUtilTest;
EventHubTest.class,
PerfUtilTest.class,
StopwatchTest.class,
+ AbstractRestClientTest.class,
RestClientTest.class,
RestResultTest.class,
VersionTest.class,
diff --git a/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/AbstractRestClientTest.java b/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/AbstractRestClientTest.java
new file mode 100644
index 000000000..b2d2b1a3b
--- /dev/null
+++ b/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/AbstractRestClientTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hugegraph.unit.rest;
+
+import org.apache.hugegraph.rest.AbstractRestClient;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AbstractRestClientTest {
+
+ @Test
+ public void testEncodeWithSpaces() {
+ String raw = "hello world";
+ String expected = "hello%2Bworld";
+ String encoded = AbstractRestClient.encode(raw);
+ Assert.assertEquals(expected, encoded);
+ }
+
+ @Test
+ public void testEncodeWithSpecialCharacters() {
+ String raw = "hello@world!";
+ String expected = "hello%40world%21";
+ String encoded = AbstractRestClient.encode(raw);
+ Assert.assertEquals(expected, encoded);
+ }
+
+ @Test
+ public void testEncodeWithChineseCharacters() {
+ String raw = "你好";
+ String expected = "%E4%BD%A0%E5%A5%BD";
+ String encoded = AbstractRestClient.encode(raw);
+ Assert.assertEquals(expected, encoded);
+ }
+
+ @Test
+ public void testEncodeWithNullInput() {
+ String raw = null;
+ Assert.assertThrows(NullPointerException.class, () -> {
+ AbstractRestClient.encode(raw);
+ });
+ }
+}