(streampipes) 01/01: refactor: change `FilterCondition` class to record

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bossenti pushed a commit to branch change-to-record
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 64445b0cd01c6d06b4e4decfd84a8b79ed6cefd7
Author: bossenti <bo...@posteo.de>
AuthorDate: Tue Apr 23 09:50:10 2024 +0200

    refactor: change `FilterCondition` class to record
---
 .../influx/DataLakeInfluxQueryBuilder.java         |  4 ++--
 .../dataexplorer/querybuilder/FilterCondition.java | 25 +---------------------
 .../param/WhereStatementParamsTest.java            |  6 +++---
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataLakeInfluxQueryBuilder.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataLakeInfluxQueryBuilder.java
index d2f518246b..8c968ca885 100644
--- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataLakeInfluxQueryBuilder.java
+++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataLakeInfluxQueryBuilder.java
@@ -170,7 +170,7 @@ public class DataLakeInfluxQueryBuilder implements IDataLakeQueryBuilder<Query>
   public IDataLakeQueryBuilder<Query> withInclusiveFilter(List<FilterCondition> filterConditions) {
     List<ConjunctionClause> and = new ArrayList<>();
     filterConditions.forEach(c -> and
-        .add(new AndConjunction(new SimpleClause(c.getField(), c.getOperator(), c.getCondition()))));
+        .add(new AndConjunction(new SimpleClause(c.field(), c.operator(), c.condition()))));
 
     addNestedWhereClause(and);
 
@@ -251,7 +251,7 @@ public class DataLakeInfluxQueryBuilder implements IDataLakeQueryBuilder<Query>
         this.selectionQuery.from(env.getTsStorageBucket().getValueOrDefault(), escapeIndex(measurementId));
     this.whereClauses.forEach(selectQuery::where);
 
-    if (this.groupByClauses.size() > 0) {
+    if (!this.groupByClauses.isEmpty()) {
       selectQuery.groupBy(this.groupByClauses.toArray());
     }
 
diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/querybuilder/FilterCondition.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/querybuilder/FilterCondition.java
index 396bed21d2..ed2592d8d3 100644
--- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/querybuilder/FilterCondition.java
+++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/querybuilder/FilterCondition.java
@@ -17,28 +17,5 @@
  */
 package org.apache.streampipes.dataexplorer.querybuilder;
 
-public class FilterCondition {
-
-  private String field;
-  private String operator;
-  private Object condition;
-
-  public FilterCondition(String field, String operator, Object condition) {
-    this.field = field;
-    this.operator = operator;
-    this.condition = condition;
-  }
-
-  public String getField() {
-    return field;
-  }
-
-  public String getOperator() {
-    return operator;
-  }
-
-  public Object getCondition() {
-    return condition;
-  }
-
+public record FilterCondition(String field, String operator, Object condition) {
 }
diff --git a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/param/WhereStatementParamsTest.java b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/param/WhereStatementParamsTest.java
index 6859a41531..984aee2bed 100644
--- a/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/param/WhereStatementParamsTest.java
+++ b/streampipes-data-explorer/src/test/java/org/apache/streampipes/dataexplorer/param/WhereStatementParamsTest.java
@@ -53,9 +53,9 @@ public class WhereStatementParamsTest {
   private void assertWhereCondition(WhereClauseParams result, FilterCondition expected) {
     assertEquals(1, result.getWhereConditions().size());
     FilterCondition resultingFilterCondition = result.getWhereConditions().get(0);
-    assertEquals(expected.getField(), resultingFilterCondition.getField());
-    assertEquals(expected.getOperator(), resultingFilterCondition.getOperator());
-    assertEquals(expected.getCondition(), resultingFilterCondition.getCondition());
+    assertEquals(expected.field(), resultingFilterCondition.field());
+    assertEquals(expected.operator(), resultingFilterCondition.operator());
+    assertEquals(expected.condition(), resultingFilterCondition.condition());
   }