jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 18:05:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(system): reduce repository code duplication between OSS and EE

Browse Source 
Part-of: https://github.com/kestra-io/kestra-ee/issues/1684
This commit is contained in:
Loïc Mathieu
2025-11-14 10:05:30 +01:00
parent 3b08c51158
commit 8346874c43
17 changed files with 188 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jdbc-h2/src/main/java/io/kestra/repository/h2/H2ExecutionRepository.java
View File

@@ -40,19 +40,5 @@ public class H2ExecutionRepository extends AbstractJdbcExecutionRepository {
@Override
protected Field<Date> formatDateField(String dateField, DateUtils.GroupType groupType) {
switch (groupType) {
case MONTH:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM')", Date.class);
case WEEK:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'YYYY-ww')", Date.class);
case DAY:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd')", Date.class);
case HOUR:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:00:00')", Date.class);
case MINUTE:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:mm:00')", Date.class);
default:
throw new IllegalArgumentException("Unsupported GroupType: " + groupType);
}
}
return H2RepositoryUtils.formatDateField(dateField, groupType); }
}

15
jdbc-h2/src/main/java/io/kestra/repository/h2/H2LogRepository.java
View File

@@ -30,20 +30,7 @@ public class H2LogRepository extends AbstractJdbcLogRepository {
@Override
protected Field<Date> formatDateField(String dateField, DateUtils.GroupType groupType) {
switch (groupType) {
case MONTH:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM')", Date.class);
case WEEK:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'YYYY-ww')", Date.class);
case DAY:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd')", Date.class);
case HOUR:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:00:00')", Date.class);
case MINUTE:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:mm:00')", Date.class);
default:
throw new IllegalArgumentException("Unsupported GroupType: " + groupType);
}
return H2RepositoryUtils.formatDateField(dateField, groupType);
}
}

15
jdbc-h2/src/main/java/io/kestra/repository/h2/H2MetricRepository.java
View File

@@ -23,20 +23,7 @@ public class H2MetricRepository extends AbstractJdbcMetricRepository {
@Override
protected Field<Date> formatDateField(String dateField, DateUtils.GroupType groupType) {
switch (groupType) {
case MONTH:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM')", Date.class);
case WEEK:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'YYYY-ww')", Date.class);
case DAY:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd')", Date.class);
case HOUR:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:00:00')", Date.class);
case MINUTE:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:mm:00')", Date.class);
default:
throw new IllegalArgumentException("Unsupported GroupType: " + groupType);
}
return H2RepositoryUtils.formatDateField(dateField, groupType);
}
}

30
jdbc-h2/src/main/java/io/kestra/repository/h2/H2RepositoryUtils.java Normal file
View File

@@ -0,0 +1,30 @@
package io.kestra.repository.h2;
import io.kestra.core.utils.DateUtils;
import org.jooq.Field;
import org.jooq.impl.DSL;
import java.util.Date;
public final class H2RepositoryUtils {
private H2RepositoryUtils() {
// utility class pattern
}
public static Field<Date> formatDateField(String dateField, DateUtils.GroupType groupType) {
switch (groupType) {
case MONTH:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM')", Date.class);
case WEEK:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'YYYY-ww')", Date.class);
case DAY:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd')", Date.class);
case HOUR:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:00:00')", Date.class);
case MINUTE:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:mm:00')", Date.class);
default:
throw new IllegalArgumentException("Unsupported GroupType: " + groupType);
}
}
}

15
jdbc-h2/src/main/java/io/kestra/repository/h2/H2TriggerRepository.java
View File

@@ -23,19 +23,6 @@ public class H2TriggerRepository extends AbstractJdbcTriggerRepository {
@Override
protected Field<Date> formatDateField(String dateField, DateUtils.GroupType groupType) {
switch (groupType) {
case MONTH:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM')", Date.class);
case WEEK:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'YYYY-ww')", Date.class);
case DAY:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd')", Date.class);
case HOUR:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:00:00')", Date.class);
case MINUTE:
return DSL.field("FORMATDATETIME(\"" + dateField + "\", 'yyyy-MM-dd HH:mm:00')", Date.class);
default:
throw new IllegalArgumentException("Unsupported GroupType: " + groupType);
}
return H2RepositoryUtils.formatDateField(dateField, groupType);
}
}