refactor: Use jackson

erezrokah · erezrokah · commit d80892c915bb · 2023-08-22T12:02:12.000+02:00
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -48,8 +48,6 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-api:2.20.0'
     implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
 
-    implementation 'com.google.code.gson:gson:2.10.1'
-
     testImplementation(platform('org.junit:junit-bom:5.10.0'))
     testImplementation('org.junit.jupiter:junit-jupiter:5.10.0')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
diff --git a/lib/src/main/java/io/cloudquery/internal/servers/plugin/v3/PluginServer.java b/lib/src/main/java/io/cloudquery/internal/servers/plugin/v3/PluginServer.java
@@ -42,11 +42,15 @@ public void getVersion(
   public void init(
       io.cloudquery.plugin.v3.Init.Request request,
       StreamObserver<io.cloudquery.plugin.v3.Init.Response> responseObserver) {
-    plugin.init(
-        request.getSpec().toStringUtf8(),
-        NewClientOptions.builder().noConnection(request.getNoConnection()).build());
-    responseObserver.onNext(io.cloudquery.plugin.v3.Init.Response.newBuilder().build());
-    responseObserver.onCompleted();
+    try {
+      plugin.init(
+          request.getSpec().toStringUtf8(),
+          NewClientOptions.builder().noConnection(request.getNoConnection()).build());
+      responseObserver.onNext(io.cloudquery.plugin.v3.Init.Response.newBuilder().build());
+      responseObserver.onCompleted();
+    } catch (Exception e) {
+      responseObserver.onError(e);
+    }
   }
 
   @Override
diff --git a/lib/src/main/java/io/cloudquery/memdb/MemDB.java b/lib/src/main/java/io/cloudquery/memdb/MemDB.java
@@ -105,7 +105,7 @@ public void close() {
   }
 
   @Override
-  public ClientMeta newClient(String spec, NewClientOptions options) {
+  public ClientMeta newClient(String spec, NewClientOptions options) throws Exception {
     if (options.isNoConnection()) {
       return null;
     }
diff --git a/lib/src/main/java/io/cloudquery/memdb/Spec.java b/lib/src/main/java/io/cloudquery/memdb/Spec.java
@@ -1,14 +1,17 @@
 package io.cloudquery.memdb;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class Spec {
-  public static Spec fromJSON(String json) {
-    Spec spec = new Gson().fromJson(json, Spec.class);
+  public static Spec fromJSON(String json) throws JsonMappingException, JsonProcessingException {
+    ObjectMapper objectMapper = new ObjectMapper();
+    Spec spec = objectMapper.readValue(json, Spec.class);
     if (spec.getConcurrency() == 0) {
       spec.setConcurrency(10000);
     }
diff --git a/lib/src/main/java/io/cloudquery/plugin/Plugin.java b/lib/src/main/java/io/cloudquery/plugin/Plugin.java
@@ -19,11 +19,11 @@ public abstract class Plugin {
   @Setter protected Logger logger;
   protected ClientMeta client;
 
-  public void init(String spec, NewClientOptions options) {
+  public void init(String spec, NewClientOptions options) throws Exception {
     client = newClient(spec, options);
   }
 
-  public abstract ClientMeta newClient(String spec, NewClientOptions options);
+  public abstract ClientMeta newClient(String spec, NewClientOptions options) throws Exception;
 
   public abstract List<Table> tables(
       List<String> includeList, List<String> skipList, boolean skipDependentTables)

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void close() {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`@Override`
`108`		`- public ClientMeta newClient(String spec, NewClientOptions options) {`
	`108`	`+ public ClientMeta newClient(String spec, NewClientOptions options) throws Exception {`
`109`	`109`	`if (options.isNoConnection()) {`
`110`	`110`	`return null;`
`111`	`111`	`}`