This is an automated email from the ASF dual-hosted git repository. bossenti pushed a commit to branch replace-gson-by-jackson in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 4a751069bc963574800f9e17f81890b387dc548d Author: bossenti <[email protected]> AuthorDate: Tue Apr 23 13:34:08 2024 +0200 refactor: replace gson by jackson --- .../query/writer/ConfiguredJsonOutputWriter.java | 5 ++--- .../query/writer/item/JsonItemWriter.java | 25 ++++++++++++++-------- .../query/writer/item/TestJsonItemWriter.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 0781c7334a..e34207755b 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.JsonItemWriter; -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 jsonObjectWriter; public ConfiguredJsonOutputWriter() { - Gson gson = new Gson(); - this.jsonObjectWriter = new JsonItemWriter(gson); + this.jsonObjectWriter = new JsonItemWriter(new ObjectMapper()); } @Override diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemWriter.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemWriter.java index fde43721d4..8919f7c912 100644 --- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemWriter.java +++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemWriter.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 JsonItemWriter extends ItemGenerator { + private static final Logger LOG = LoggerFactory.getLogger(JsonItemWriter.class); + private static final String BEGIN_OBJECT = "{"; private static final String END_OBJECT = "}"; - private final Gson gson; + private final ObjectMapper objectMapper; - public JsonItemWriter(Gson gson) { + public JsonItemWriter(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/TestJsonItemWriter.java b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemWriter.java index 518194b4d4..230d67dded 100644 --- a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemWriter.java +++ b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemWriter.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 TestJsonItemWriter extends TestItemWriter { @Test public void testJsonWriter() { - var writer = new JsonItemWriter(new Gson()); + var writer = new JsonItemWriter(new ObjectMapper()); String result = writer.createItem(row, columns);
