feat(core): record import for java 17 compatibility

kestra-io · Jan 11, 2023 · b45ea04 · b45ea04
1 parent f420d52
commit b45ea04
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 1 deletion.
diff --git a/jdbc-h2/src/main/java/io/kestra/repository/h2/H2Repository.java b/jdbc-h2/src/main/java/io/kestra/repository/h2/H2Repository.java
@@ -6,6 +6,7 @@
 import io.micronaut.data.model.Pageable;
 import lombok.SneakyThrows;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.util.Arrays;

diff --git a/jdbc-h2/src/main/java/io/kestra/runner/h2/H2Queue.java b/jdbc-h2/src/main/java/io/kestra/runner/h2/H2Queue.java
@@ -4,6 +4,7 @@
 import io.kestra.jdbc.runner.JdbcQueue;
 import io.micronaut.context.ApplicationContext;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 import org.jooq.impl.SQLDataType;
 

diff --git a/jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlRepository.java b/jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlRepository.java
@@ -5,6 +5,7 @@
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.data.model.Pageable;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.util.Arrays;

diff --git a/jdbc-mysql/src/main/java/io/kestra/runner/mysql/MysqlQueue.java b/jdbc-mysql/src/main/java/io/kestra/runner/mysql/MysqlQueue.java
@@ -4,6 +4,7 @@
 import io.kestra.jdbc.runner.JdbcQueue;
 import io.micronaut.context.ApplicationContext;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.util.List;

diff --git a/jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresRepository.java b/jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresRepository.java
@@ -7,6 +7,7 @@
 import io.micronaut.data.model.Pageable;
 import lombok.SneakyThrows;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.util.List;

diff --git a/jdbc-postgres/src/main/java/io/kestra/runner/postgres/PostgresQueue.java b/jdbc-postgres/src/main/java/io/kestra/runner/postgres/PostgresQueue.java
@@ -6,8 +6,8 @@
 import io.micronaut.core.annotation.NonNull;
 import lombok.SneakyThrows;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
-import org.jooq.impl.SQLDataType;
 
 import java.util.List;
 import java.util.Map;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/AbstractJdbcRepository.java b/jdbc/src/main/java/io/kestra/jdbc/AbstractJdbcRepository.java
@@ -15,6 +15,7 @@
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.io.IOException;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcExecutionRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcExecutionRepository.java
@@ -26,6 +26,7 @@
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.time.Duration;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcFlowRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcFlowRepository.java
@@ -24,6 +24,7 @@
 import jakarta.inject.Singleton;
 import lombok.SneakyThrows;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.util.*;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/JdbcFlowRepositoryService.java b/jdbc/src/main/java/io/kestra/jdbc/repository/JdbcFlowRepositoryService.java
@@ -0,0 +1,74 @@
+package io.kestra.jdbc.repository;
+
+import io.kestra.core.models.flows.Flow;
+import io.kestra.jdbc.AbstractJdbcRepository;
+import org.jooq.*;
+import org.jooq.Record;
+import org.jooq.impl.DSL;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static io.kestra.jdbc.repository.AbstractJdbcRepository.field;
+
+public abstract class JdbcFlowRepositoryService {
+    public static Table<Record> lastRevision(AbstractJdbcRepository<Flow> jdbcRepository, boolean asterisk) {
+        List<SelectFieldOrAsterisk> fields = new ArrayList<>();
+        if (asterisk) {
+            fields.add(DSL.asterisk());
+        } else {
+            fields.add(field("key", String.class));
+            fields.add(field("revision", Integer.class));
+        }
+
+        fields.add(
+            DSL.rowNumber()
+                .over()
+                .partitionBy(field("namespace"), field("id"))
+                .orderBy(field("revision").desc())
+                .as("revision_rows")
+        );
+
+        return jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                DSLContext context = DSL.using(configuration);
+
+                return context.select(DSL.asterisk())
+                    .from(
+                        context.select(fields)
+                            .from(jdbcRepository.getTable())
+                            .asTable("rev_ord")
+                    )
+                    .where(field("revision_rows").eq(1))
+                    .asTable("rev");
+            });
+    }
+
+    public static Condition findCondition(AbstractJdbcRepository<Flow> jdbcRepository, String query, Map<String, String> labels) {
+        List<Condition> conditions = new ArrayList<>();
+
+        if (query != null) {
+            conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
+        }
+
+        if (labels != null)  {
+            labels.forEach((key, value) -> {
+                Field<String> field = DSL.field("JQ_STRING(\"value\", '.labels." + key + "')", String.class);
+
+                if (value == null) {
+                    conditions.add(field.isNotNull());
+                } else {
+                    conditions.add(field.eq(value));
+                }
+            });
+        }
+
+        return conditions.size() == 0 ? DSL.trueCondition() : DSL.and(conditions);
+    }
+
+    public static Condition findSourceCodeCondition(AbstractJdbcRepository<Flow> jdbcRepository, String query) {
+        return jdbcRepository.fullTextCondition(List.of("source_code"), query);
+    }
+}
diff --git a/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcQueue.java b/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcQueue.java
@@ -20,6 +20,7 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 
 import java.io.IOException;