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 ad6b64ab53 refactor: convert param classes into records (#2762)
ad6b64ab53 is described below

commit ad6b64ab53b4ebbb2e529e7e724f1bda6cdcb156
Author: Tim <[email protected]>
AuthorDate: Thu Apr 25 08:03:48 2024 +0200

    refactor: convert param classes into records (#2762)
    
    * refactor: convert param classes into records
    
    * style: fix indentation
    
    * fix: adjust to record syntax
    
    * fix: adapt data types & default value
---
 .../influx/DataExplorerInfluxQueryExecutor.java    |  8 ++---
 .../dataexplorer/param/DeleteQueryParams.java      | 40 +++-------------------
 .../param/ProvidedRestQueryParamConverter.java     | 10 ++----
 .../dataexplorer/param/SelectQueryParams.java      |  2 +-
 .../param/model/LimitClauseParams.java             | 12 +------
 .../param/model/OffsetClauseParams.java            | 12 +------
 .../param/model/SelectClauseParams.java            |  4 ---
 7 files changed, 14 insertions(+), 74 deletions(-)

diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
index dbb8a9a0b2..0a1061ac0d 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
@@ -114,12 +114,12 @@ public class DataExplorerInfluxQueryExecutor extends 
DataExplorerQueryExecutor<Q
 
   @Override
   protected Query makeDeleteQuery(DeleteQueryParams params) {
-    String query = "DELETE FROM \"" + params.getMeasurementId() + "\"";
-    if (params.isTimeRestricted()) {
+    String query = "DELETE FROM \"" + params.measurementId() + "\"";
+    if (params.timeRestricted()) {
       query += "WHERE time > "
-          + params.getStartTime() * 1000000
+          + params.startTime() * 1000000
           + " AND time < "
-          + params.getEndTime() * 1000000;
+          + params.endTime() * 1000000;
     }
     return new Query(query, getDatabaseName());
   }
diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/DeleteQueryParams.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/DeleteQueryParams.java
index 8bdda43de4..33d3634903 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/DeleteQueryParams.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/DeleteQueryParams.java
@@ -18,43 +18,11 @@
 
 package org.apache.streampipes.dataexplorer.param;
 
-public class DeleteQueryParams {
 
-  private final String measurementId;
+public record DeleteQueryParams(String measurementId, Long startTime, Long 
endTime, boolean timeRestricted) {
 
-  private long startTime;
-
-  private long endTime;
-
-  private boolean timeRestricted;
-
-  public DeleteQueryParams(String measurementId) {
-    this.measurementId = measurementId;
-    this.timeRestricted = false;
-  }
-
-  public DeleteQueryParams(String measurementId,
-                           Long startTime,
-                           Long endTime) {
-    this(measurementId);
-    this.startTime = startTime;
-    this.endTime = endTime;
-    this.timeRestricted = true;
-  }
-
-  public String getMeasurementId() {
-    return measurementId;
-  }
-
-  public long getStartTime() {
-    return startTime;
-  }
-
-  public long getEndTime() {
-    return endTime;
-  }
-
-  public boolean isTimeRestricted() {
-    return timeRestricted;
+  public DeleteQueryParams(String measurementId, Long startTime, Long endTime) 
{
+    this(measurementId, startTime != null ? startTime : 0, endTime != null ? 
endTime : 99999999999999L, true);
   }
 }
+
diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/ProvidedRestQueryParamConverter.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/ProvidedRestQueryParamConverter.java
index 9b6f341dd7..186a5eb74c 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/ProvidedRestQueryParamConverter.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/ProvidedRestQueryParamConverter.java
@@ -111,13 +111,9 @@ public class ProvidedRestQueryParamConverter {
   }
 
   public static DeleteQueryParams getDeleteQueryParams(String measurementId,
-                                                                    Long 
startTime,
-                                                                    Long 
endTime) {
-    if (startTime != null || endTime != null) {
-      return new DeleteQueryParams(measurementId, startTime, endTime);
-    } else {
-      return new DeleteQueryParams(measurementId);
-    }
+                                                       Long startTime,
+                                                       Long endTime) {
+    return new DeleteQueryParams(measurementId, startTime, endTime);
   }
 
   private static boolean hasTimeParams(ProvidedRestQueryParams params) {
diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/SelectQueryParams.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/SelectQueryParams.java
index be5392d8c3..4131d9bf22 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/SelectQueryParams.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/SelectQueryParams.java
@@ -95,7 +95,7 @@ public class SelectQueryParams {
 
   public int getLimit() {
     if (Objects.nonNull(limitParams)) {
-      return limitParams.getLimit();
+      return limitParams.limit();
     } else {
       return Integer.MIN_VALUE;
     }
diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/LimitClauseParams.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/LimitClauseParams.java
index bdff3d070d..f1ecef0e77 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/LimitClauseParams.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/LimitClauseParams.java
@@ -21,22 +21,12 @@ package org.apache.streampipes.dataexplorer.param.model;
 import org.apache.streampipes.dataexplorer.api.IQueryStatement;
 import org.apache.streampipes.dataexplorer.querybuilder.IDataLakeQueryBuilder;
 
-public class LimitClauseParams implements IQueryStatement {
-
-  private final Integer limit;
-
-  public LimitClauseParams(Integer limit) {
-    this.limit = limit;
-  }
+public record LimitClauseParams(Integer limit) implements IQueryStatement {
 
   public static LimitClauseParams from(Integer limit) {
     return new LimitClauseParams(limit);
   }
 
-  public Integer getLimit() {
-    return limit;
-  }
-
   @Override
   public void buildStatement(IDataLakeQueryBuilder<?> builder) {
     builder.withLimit(limit);
diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/OffsetClauseParams.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/OffsetClauseParams.java
index b8dbc94aea..6419b7a73e 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/OffsetClauseParams.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/OffsetClauseParams.java
@@ -21,22 +21,12 @@ package org.apache.streampipes.dataexplorer.param.model;
 import org.apache.streampipes.dataexplorer.api.IQueryStatement;
 import org.apache.streampipes.dataexplorer.querybuilder.IDataLakeQueryBuilder;
 
-public class OffsetClauseParams implements IQueryStatement {
-
-  private final Integer offset;
-
-  public OffsetClauseParams(Integer offset) {
-    this.offset = offset;
-  }
+public record OffsetClauseParams(Integer offset) implements IQueryStatement {
 
   public static OffsetClauseParams from(Integer offset) {
     return new OffsetClauseParams(offset);
   }
 
-  public Integer getOffset() {
-    return offset;
-  }
-
   @Override
   public void buildStatement(IDataLakeQueryBuilder<?> builder) {
     builder.withOffset(offset);
diff --git 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/SelectClauseParams.java
 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/SelectClauseParams.java
index fe7f8d0f65..02db7227f2 100644
--- 
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/SelectClauseParams.java
+++ 
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/param/model/SelectClauseParams.java
@@ -32,10 +32,6 @@ public class SelectClauseParams implements IQueryStatement {
   private List<SelectColumn> selectedColumnsCountOnly;
   private boolean selectWildcard = false;
 
-  public SelectClauseParams() {
-    this.selectWildcard = true;
-  }
-
   public SelectClauseParams(String columns,
                             boolean countOnly) {
     this.selectWildcard = false;

Reply via email to