This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 1df7217a43 refactor: replace gson by jackson (#2763)
1df7217a43 is described below
commit 1df7217a43714a156fe5f31589eb94ed7cabaca8
Author: Tim <[email protected]>
AuthorDate: Wed Apr 24 08:59:22 2024 +0200
refactor: replace gson by jackson (#2763)
* refactor: replace gson by jackson
* fix: class used for logger
---
.../query/writer/ConfiguredJsonOutputWriter.java | 5 ++---
.../query/writer/item/JsonItemGenerator.java | 25 ++++++++++++++--------
.../query/writer/item/TestJsonItemGenerator.java | 4 ++--
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredJsonOutputWriter.java
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredJsonOutputWriter.java
index e1311c9e47..e14e866e05 100644
---
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredJsonOutputWriter.java
+++
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredJsonOutputWriter.java
@@ -22,7 +22,7 @@ import
org.apache.streampipes.dataexplorer.param.ProvidedRestQueryParams;
import org.apache.streampipes.dataexplorer.query.writer.item.ItemGenerator;
import org.apache.streampipes.dataexplorer.query.writer.item.JsonItemGenerator;
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.OutputStream;
@@ -36,8 +36,7 @@ public class ConfiguredJsonOutputWriter extends
ConfiguredOutputWriter {
private final ItemGenerator itemGenerator;
public ConfiguredJsonOutputWriter() {
- Gson gson = new Gson();
- this.itemGenerator = new JsonItemGenerator(gson);
+ this.itemGenerator = new JsonItemGenerator(new ObjectMapper());
}
@Override
diff --git
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemGenerator.java
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemGenerator.java
index e135bb8cdf..03d37197f0 100644
---
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemGenerator.java
+++
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemGenerator.java
@@ -19,28 +19,35 @@
package org.apache.streampipes.dataexplorer.query.writer.item;
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JsonItemGenerator extends ItemGenerator {
+ private static final Logger LOG =
LoggerFactory.getLogger(JsonItemGenerator.class);
+
private static final String BEGIN_OBJECT = "{";
private static final String END_OBJECT = "}";
- private final Gson gson;
+ private final ObjectMapper objectMapper;
- public JsonItemGenerator(Gson gson) {
+ public JsonItemGenerator(ObjectMapper objectMapper) {
super(COMMA_SEPARATOR);
- this.gson = gson;
+ this.objectMapper = objectMapper;
}
@Override
protected String makeItemString(String key,
Object value) {
- var stringValue = value != null ? gson.toJson(value) : null;
- return "\""
- + key
- + "\": "
- + stringValue;
+ String valueJsonString = null;
+ try {
+ valueJsonString = value != null ?
this.objectMapper.writeValueAsString(value) : null;
+ } catch (JsonProcessingException e) {
+ LOG.error("Error while converting value to JSON string: {}",
e.getMessage());
+ }
+ return "\"%s\": %s".formatted(key, valueJsonString);
}
@Override
diff --git
a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemGenerator.java
b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemGenerator.java
index 2b3dcb58b1..786570bc83 100644
---
a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemGenerator.java
+++
b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemGenerator.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.dataexplorer.query.writer.item;
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,7 +29,7 @@ public class TestJsonItemGenerator extends TestItemGenerator {
@Test
public void testJsonWriter() {
- var writer = new JsonItemGenerator(new Gson());
+ var writer = new JsonItemGenerator(new ObjectMapper());
String result = writer.createItem(row, columns);