Skip to content

Remove Fastjson from the driver #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nicole00 merged 1 commit into from
Sep 3, 2026
+63 −14
Merged

Remove Fastjson from the driver #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<commons-codec.version>1.13</commons-codec.version>
<commons-pool2.version>2.2</commons-pool2.version>
<servlet.version>3.0.1</servlet.version>
<fastjson.version>1.2.83</fastjson.version>
<bouncycastle.version>1.69</bouncycastle.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jts.version>1.16.1</jts.version>
Expand Down Expand Up @@ -80,11 +79,6 @@
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
Expand All @@ -98,22 +92,22 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>1.60.0</version>
<version>1.75.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.60.0</version>
<version>1.75.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.60.0</version>
<version>1.75.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.25.1</version>
<version>3.25.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api -->
<dependency>
Expand Down Expand Up @@ -192,9 +186,9 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.25.1:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:3.25.5:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.60.0:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.75.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
Expand Down
59 changes: 57 additions & 2 deletions client/src/main/java/com/vesoft/nebula/driver/graph/net/GrpcConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import static com.vesoft.nebula.driver.graph.exception.IOErrorException.E_TIME_OUT;

import com.alibaba.fastjson.JSON;
import com.google.common.base.Charsets;
import com.google.protobuf.ByteString;
import com.vesoft.nebula.driver.graph.ErrorCode;
Expand All @@ -30,6 +29,7 @@
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
import java.nio.charset.Charset;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLException;
import org.slf4j.Logger;
Expand Down Expand Up @@ -108,7 +108,7 @@ public AuthResult authenticate(String user, Map<String, Object> authOptions)
.build();
ByteString userString = user == null ? ByteString.copyFrom("", charset)
: ByteString.copyFrom(user, charset);
String authInfoString = JSON.toJSONString(authOptions);
String authInfoString = toJsonString(authOptions);
AuthRequest authReq = AuthRequest.newBuilder()
.setUsername(userString)
.setAuthInfo(ByteString.copyFrom(authInfoString, charset))
Expand Down Expand Up @@ -140,6 +140,61 @@ public AuthResult authenticate(String user, Map<String, Object> authOptions)
}
}

static String toJsonString(Map<String, Object> options) {
if (options == null) {
return "null";
}
StringBuilder json = new StringBuilder("{");
boolean first = true;
for (Entry<String, Object> entry : options.entrySet()) {
if (!first) {
json.append(',');
}
appendJsonString(json, entry.getKey());
json.append(':');
appendJsonString(json, String.valueOf(entry.getValue()));
first = false;
}
return json.append('}').toString();
}

private static void appendJsonString(StringBuilder json, String value) {
json.append('"');
for (int index = 0; index < value.length(); index++) {
char character = value.charAt(index);
switch (character) {
case '"':
json.append("\\\"");
break;
case '\\':
json.append("\\\\");
break;
case '\b':
json.append("\\b");
break;
case '\f':
json.append("\\f");
break;
case '\n':
json.append("\\n");
break;
case '\r':
json.append("\\r");
break;
case '\t':
json.append("\\t");
break;
default:
if (character < 0x20) {
json.append(String.format("\\u%04x", (int) character));
} else {
json.append(character);
}
}
}
json.append('"');
}

public ExecuteResponse execute(long sessionID, String stmt, long timeout)
throws IOErrorException {
if (stmt == null) {
Expand Down
Loading