From 4838ae988fabe6f48cb50421b4934120deae1b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Wed, 3 Jan 2024 14:12:00 +0100 Subject: [PATCH 1/3] feat: Micronaut 4 --- build.gradle | 29 +++++++++++-------- gradle.properties | 2 +- .../io/kestra/plugin/dbt/cli/AbstractDbt.java | 7 ++--- .../java/io/kestra/plugin/dbt/cli/DbtCLI.java | 4 +-- .../java/io/kestra/plugin/dbt/cli/Setup.java | 4 +-- .../plugin/dbt/cloud/AbstractDbtCloud.java | 2 +- .../plugin/dbt/cloud/JobScheduleDate.java | 2 +- .../plugin/dbt/cloud/JobScheduleTime.java | 2 +- .../kestra/plugin/dbt/cloud/TriggerRun.java | 3 +- .../kestra/plugin/dbt/cloud/models/Job.java | 2 +- .../plugin/dbt/cloud/models/Status.java | 7 ----- .../plugin/dbt/cloud/models/Trigger.java | 2 +- 12 files changed, 30 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 6425752..d0c4d56 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ plugins { def isBuildSnapshot = version.toString().endsWith("-SNAPSHOT") repositories { + mavenLocal() mavenCentral() if (isBuildSnapshot) { maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } @@ -31,24 +32,21 @@ tasks.withType(JavaCompile) { options.compilerArgs.add("-parameters") } -configurations.all { - resolutionStrategy { - force("org.slf4j:slf4j-api:1.7.36") - } -} - dependencies { // lombok annotationProcessor "org.projectlombok:lombok:$lombokVersion" compileOnly "org.projectlombok:lombok:$lombokVersion" // micronaut - annotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion") + annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion") annotationProcessor "io.micronaut:micronaut-inject-java" - annotationProcessor "io.micronaut:micronaut-validation" - compileOnly platform("io.micronaut:micronaut-bom:$micronautVersion") + annotationProcessor "io.micronaut.validation:micronaut-validation-processor" + + compileOnly platform("io.micronaut.platform:micronaut-platform:$micronautVersion") compileOnly "io.micronaut:micronaut-inject" - compileOnly "io.micronaut:micronaut-validation" + compileOnly "io.micronaut.validation:micronaut-validation" + compileOnly "io.micronaut:micronaut-http-client" + compileOnly "io.micronaut.rxjava2:micronaut-rxjava2" // kestra compileOnly group: "io.kestra", name: "core", version: kestraVersion @@ -73,9 +71,16 @@ testlogger { } dependencies { - testAnnotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion") + // lombok + testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion + testCompileOnly 'org.projectlombok:lombok:' + lombokVersion + + // micronaut + testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion") testAnnotationProcessor "io.micronaut:micronaut-inject-java" - testImplementation platform("io.micronaut:micronaut-bom:$micronautVersion") + testAnnotationProcessor "io.micronaut.validation:micronaut-validation-processor" + + testImplementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion") testImplementation "io.micronaut.test:micronaut-test-junit5" // test deps needed only for to have a runner diff --git a/gradle.properties b/gradle.properties index 5cdedeb..1a1efe1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ version=0.15.0-SNAPSHOT kestraVersion=[0.15,) -micronautVersion=3.10.1 +micronautVersion=4.2.2 lombokVersion=1.18.30 diff --git a/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java b/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java index 89a3476..d6ba6cc 100644 --- a/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java +++ b/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java @@ -4,7 +4,6 @@ import io.kestra.core.models.annotations.PluginProperty; import io.kestra.core.models.tasks.*; import io.kestra.core.runners.RunContext; -import io.kestra.core.tasks.PluginUtilsService; import io.kestra.plugin.dbt.ResultParser; import io.kestra.plugin.scripts.exec.scripts.models.DockerOptions; import io.kestra.plugin.scripts.exec.scripts.models.RunnerType; @@ -24,12 +23,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java b/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java index 52a5055..a87414c 100644 --- a/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java +++ b/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java @@ -30,8 +30,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/dbt/cli/Setup.java b/src/main/java/io/kestra/plugin/dbt/cli/Setup.java index 5612028..13e237c 100644 --- a/src/main/java/io/kestra/plugin/dbt/cli/Setup.java +++ b/src/main/java/io/kestra/plugin/dbt/cli/Setup.java @@ -35,8 +35,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/AbstractDbtCloud.java b/src/main/java/io/kestra/plugin/dbt/cloud/AbstractDbtCloud.java index cb71f2b..61b0365 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/AbstractDbtCloud.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/AbstractDbtCloud.java @@ -22,7 +22,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.time.Duration; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleDate.java b/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleDate.java index 9ece402..4301c19 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleDate.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleDate.java @@ -6,7 +6,7 @@ import lombok.extern.jackson.Jacksonized; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; @Value @Jacksonized diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleTime.java b/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleTime.java index 4139316..672ac0a 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleTime.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/JobScheduleTime.java @@ -6,7 +6,7 @@ import lombok.extern.jackson.Jacksonized; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; @Value @Jacksonized diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/TriggerRun.java b/src/main/java/io/kestra/plugin/dbt/cloud/TriggerRun.java index 2b8a389..d8b4e3f 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/TriggerRun.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/TriggerRun.java @@ -1,6 +1,5 @@ package io.kestra.plugin.dbt.cloud; -import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.models.annotations.Example; import io.kestra.core.models.annotations.Plugin; import io.kestra.core.models.annotations.PluginProperty; @@ -20,7 +19,7 @@ import java.net.URI; import java.time.Duration; import java.util.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/models/Job.java b/src/main/java/io/kestra/plugin/dbt/cloud/models/Job.java index 7e92f50..03c1fc6 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/models/Job.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/models/Job.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; @Value @Jacksonized diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/models/Status.java b/src/main/java/io/kestra/plugin/dbt/cloud/models/Status.java index 0a36478..41b296e 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/models/Status.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/models/Status.java @@ -1,17 +1,10 @@ package io.kestra.plugin.dbt.cloud.models; -import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.v3.oas.annotations.media.Schema; -import io.micronaut.validation.Validated; import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; -import javax.validation.Valid; -import javax.validation.constraints.*; - @Value @Jacksonized @SuperBuilder diff --git a/src/main/java/io/kestra/plugin/dbt/cloud/models/Trigger.java b/src/main/java/io/kestra/plugin/dbt/cloud/models/Trigger.java index a60ed51..67af7a3 100644 --- a/src/main/java/io/kestra/plugin/dbt/cloud/models/Trigger.java +++ b/src/main/java/io/kestra/plugin/dbt/cloud/models/Trigger.java @@ -8,7 +8,7 @@ import java.time.ZonedDateTime; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; @Value @Jacksonized From f979fb080d95bcae1ff62d9c5da32e9580acfae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Fri, 5 Jan 2024 10:01:14 +0100 Subject: [PATCH 2/3] feat(*): Migrate from RxJava2 to Reactor --- build.gradle | 2 +- src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java | 2 +- src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d0c4d56..3677afa 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { compileOnly "io.micronaut:micronaut-inject" compileOnly "io.micronaut.validation:micronaut-validation" compileOnly "io.micronaut:micronaut-http-client" - compileOnly "io.micronaut.rxjava2:micronaut-rxjava2" + compileOnly "io.micronaut.reactor:micronaut-reactor" // kestra compileOnly group: "io.kestra", name: "core", version: kestraVersion diff --git a/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java b/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java index d6ba6cc..b5c74ae 100644 --- a/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java +++ b/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java @@ -147,7 +147,7 @@ public ScriptOutput run(RunContext runContext) throws Exception { .withDockerOptions(this.getDocker()) .withLogConsumer(new AbstractLogConsumer() { @Override - public void accept(String line, Boolean isStdErr) throws Exception { + public void accept(String line, Boolean isStdErr) { LogService.parse(runContext, line); } }); diff --git a/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java b/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java index a87414c..274579c 100644 --- a/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java +++ b/src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java @@ -128,7 +128,7 @@ public ScriptOutput run(RunContext runContext) throws Exception { CommandsWrapper commands = this.commands(runContext) .withLogConsumer(new AbstractLogConsumer() { @Override - public void accept(String line, Boolean isStdErr) throws Exception { + public void accept(String line, Boolean isStdErr) { LogService.parse(runContext, line); } }); From a167b13965d10d9b79c55b1c8ae246005ecab3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Tue, 30 Jan 2024 10:16:12 +0100 Subject: [PATCH 3/3] fix: incorrect validation annotation --- src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java | 1 - src/main/java/io/kestra/plugin/dbt/cli/Setup.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java b/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java index b5c74ae..43ae688 100644 --- a/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java +++ b/src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java @@ -86,7 +86,6 @@ public abstract class AbstractDbt extends Task implements RunnableTask