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 aea5a66b05 refactor: align item generator class names with parent
class (#2760)
aea5a66b05 is described below
commit aea5a66b053a7905430fd88f87258a831bbd2cfa
Author: Tim <[email protected]>
AuthorDate: Wed Apr 24 08:08:26 2024 +0200
refactor: align item generator class names with parent class (#2760)
---
.../dataexplorer/query/writer/ConfiguredCsvOutputWriter.java | 8 ++++----
.../dataexplorer/query/writer/ConfiguredJsonOutputWriter.java | 8 ++++----
.../writer/item/{CsvItemWriter.java => CsvItemGenerator.java} | 4 ++--
.../writer/item/{JsonItemWriter.java => JsonItemGenerator.java} | 4 ++--
.../item/{TestCsvItemWriter.java => TestCsvItemGenerator.java} | 6 +++---
.../writer/item/{TestItemWriter.java => TestItemGenerator.java} | 2 +-
.../item/{TestJsonItemWriter.java => TestJsonItemGenerator.java} | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredCsvOutputWriter.java
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredCsvOutputWriter.java
index 03ca75530c..3d37ff9230 100644
---
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredCsvOutputWriter.java
+++
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/ConfiguredCsvOutputWriter.java
@@ -19,7 +19,7 @@
package org.apache.streampipes.dataexplorer.query.writer;
import org.apache.streampipes.dataexplorer.param.ProvidedRestQueryParams;
-import org.apache.streampipes.dataexplorer.query.writer.item.CsvItemWriter;
+import org.apache.streampipes.dataexplorer.query.writer.item.CsvItemGenerator;
import java.io.IOException;
import java.io.OutputStream;
@@ -34,7 +34,7 @@ public class ConfiguredCsvOutputWriter extends
ConfiguredOutputWriter {
private static final String COMMA = ",";
private static final String SEMICOLON = ";";
- private CsvItemWriter itemWriter;
+ private CsvItemGenerator itemGenerator;
private String delimiter = COMMA;
@Override
@@ -43,7 +43,7 @@ public class ConfiguredCsvOutputWriter extends
ConfiguredOutputWriter {
if (params.has(QP_CSV_DELIMITER)) {
delimiter = params.getAsString(QP_CSV_DELIMITER).equals("comma") ? COMMA
: SEMICOLON;
}
- this.itemWriter = new CsvItemWriter(delimiter);
+ this.itemGenerator = new CsvItemGenerator(delimiter);
}
@Override
@@ -65,7 +65,7 @@ public class ConfiguredCsvOutputWriter extends
ConfiguredOutputWriter {
outputStream.write(toBytes(makeHeaderLine(columnNames)));
}
- outputStream.write(toBytes(itemWriter.createItem(row, columnNames) +
LINE_SEPARATOR));
+ outputStream.write(toBytes(itemGenerator.createItem(row, columnNames) +
LINE_SEPARATOR));
}
private String makeHeaderLine(List<String> columns) {
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..e1311c9e47 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
@@ -20,7 +20,7 @@ package org.apache.streampipes.dataexplorer.query.writer;
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 org.apache.streampipes.dataexplorer.query.writer.item.JsonItemGenerator;
import com.google.gson.Gson;
@@ -33,11 +33,11 @@ public class ConfiguredJsonOutputWriter extends
ConfiguredOutputWriter {
private static final String BEGIN_ARRAY = "[";
private static final String END_ARRAY = "]";
- private final ItemGenerator jsonObjectWriter;
+ private final ItemGenerator itemGenerator;
public ConfiguredJsonOutputWriter() {
Gson gson = new Gson();
- this.jsonObjectWriter = new JsonItemWriter(gson);
+ this.itemGenerator = new JsonItemGenerator(gson);
}
@Override
@@ -65,7 +65,7 @@ public class ConfiguredJsonOutputWriter extends
ConfiguredOutputWriter {
outputStream.write(toBytes(","));
}
- var item = jsonObjectWriter.createItem(row, columnNames);
+ var item = itemGenerator.createItem(row, columnNames);
outputStream.write(toBytes(item));
}
}
diff --git
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/CsvItemWriter.java
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/CsvItemGenerator.java
similarity index 91%
rename from
streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/CsvItemWriter.java
rename to
streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/CsvItemGenerator.java
index bd80f2d9ab..f509338d3c 100644
---
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/CsvItemWriter.java
+++
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/CsvItemGenerator.java
@@ -19,9 +19,9 @@
package org.apache.streampipes.dataexplorer.query.writer.item;
-public class CsvItemWriter extends ItemGenerator {
+public class CsvItemGenerator extends ItemGenerator {
- public CsvItemWriter(String delimiter) {
+ public CsvItemGenerator(String delimiter) {
super(delimiter);
}
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/JsonItemGenerator.java
similarity index 93%
rename from
streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemWriter.java
rename to
streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/query/writer/item/JsonItemGenerator.java
index fde43721d4..e135bb8cdf 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/JsonItemGenerator.java
@@ -21,14 +21,14 @@ package
org.apache.streampipes.dataexplorer.query.writer.item;
import com.google.gson.Gson;
-public class JsonItemWriter extends ItemGenerator {
+public class JsonItemGenerator extends ItemGenerator {
private static final String BEGIN_OBJECT = "{";
private static final String END_OBJECT = "}";
private final Gson gson;
- public JsonItemWriter(Gson gson) {
+ public JsonItemGenerator(Gson gson) {
super(COMMA_SEPARATOR);
this.gson = gson;
}
diff --git
a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestCsvItemWriter.java
b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestCsvItemGenerator.java
similarity index 90%
rename from
streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestCsvItemWriter.java
rename to
streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestCsvItemGenerator.java
index bb45358a7c..b24adf5838 100644
---
a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestCsvItemWriter.java
+++
b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestCsvItemGenerator.java
@@ -22,14 +22,14 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class TestCsvItemWriter extends TestItemWriter {
+public class TestCsvItemGenerator extends TestItemGenerator {
private static final String ExpectedComma = "1668578077051,test,1";
private static final String ExpectedSemicolon = "1668578077051;test;1";
@Test
public void testCsvItemWriterCommaSeparated() {
- var writer = new CsvItemWriter(",");
+ var writer = new CsvItemGenerator(",");
String result = writer.createItem(row, columns);
@@ -38,7 +38,7 @@ public class TestCsvItemWriter extends TestItemWriter {
@Test
public void testCsvItemWriterSemicolonSeparated() {
- var writer = new CsvItemWriter(";");
+ var writer = new CsvItemGenerator(";");
String result = writer.createItem(row, columns);
diff --git
a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestItemWriter.java
b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestItemGenerator.java
similarity index 96%
rename from
streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestItemWriter.java
rename to
streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestItemGenerator.java
index 0c113ca78d..3dd0fd7672 100644
---
a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestItemWriter.java
+++
b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestItemGenerator.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.BeforeEach;
import java.util.Arrays;
import java.util.List;
-public abstract class TestItemWriter {
+public abstract class TestItemGenerator {
protected List<Object> row;
protected List<String> columns;
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/TestJsonItemGenerator.java
similarity index 91%
rename from
streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemWriter.java
rename to
streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/query/writer/item/TestJsonItemGenerator.java
index 518194b4d4..2b3dcb58b1 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/TestJsonItemGenerator.java
@@ -23,13 +23,13 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class TestJsonItemWriter extends TestItemWriter {
+public class TestJsonItemGenerator extends TestItemGenerator {
private static final String Expected = "{\"time\": 1668578077051,\"string\":
\"test\",\"number\": 1}";
@Test
public void testJsonWriter() {
- var writer = new JsonItemWriter(new Gson());
+ var writer = new JsonItemGenerator(new Gson());
String result = writer.createItem(row, columns);