Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/micronaut 4 #94

Merged
merged 4 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/" }
Expand All @@ -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.reactor:micronaut-reactor-http-client"

// kestra
compileOnly group: "io.kestra", name: "core", version: kestraVersion
Expand All @@ -58,8 +56,7 @@ dependencies {
// SMB VFS with SMB2/3 support
api group: 'com.github.new-proimage', name: 'vfs-jcifs-smb', version: '0.9.3'
api group: 'com.jcraft', name: 'jsch', version: '0.1.55'
api 'commons-net:commons-net:3.9.0'
api group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.36'
api 'commons-net:commons-net:3.10.0'
api group: 'org.codelibs', name: 'jcifs', version: '2.1.37'

}
Expand All @@ -82,10 +79,21 @@ 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"
testImplementation "io.micronaut:micronaut-http-client"
testImplementation "io.micronaut.reactor:micronaut-reactor-http-client"
testImplementation "io.micronaut:micronaut-http-server-netty"
testImplementation "io.micronaut:micronaut-jackson-databind"

testImplementation group: "io.kestra", name: "core", version: kestraVersion
testImplementation group: "io.kestra", name: "repository-memory", version: kestraVersion
Expand All @@ -99,7 +107,6 @@ dependencies {

// libs
testImplementation group: 'com.devskiller.friendly-id', name: 'friendly-id', version: '1.1.0'
testImplementation "io.micronaut:micronaut-http-server-netty"
}

/**********************************************************************************************************************\
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.15.0-SNAPSHOT
kestraVersion=[0.15,)
micronautVersion=3.10.1
micronautVersion=4.2.2
lombokVersion=1.18.30
22 changes: 6 additions & 16 deletions src/main/java/io/kestra/plugin/fs/http/AbstractHttp.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
package io.kestra.plugin.fs.http;

import io.kestra.core.exceptions.IllegalVariableEvaluationException;
import io.kestra.core.models.annotations.PluginProperty;
import io.kestra.core.models.tasks.Task;
import io.kestra.core.runners.RunContext;
import io.kestra.core.serializers.JacksonMapper;
import io.micronaut.http.*;
import io.micronaut.http.client.DefaultHttpClientConfiguration;
import io.micronaut.http.client.HttpClient;
import io.micronaut.http.client.HttpClientConfiguration;
import io.micronaut.http.client.multipart.MultipartBody;
import io.micronaut.http.client.netty.NettyHttpClientFactory;
import io.micronaut.http.ssl.ClientSslConfiguration;
import io.micronaut.logging.LogLevel;
import io.micronaut.rxjava2.http.client.RxStreamingHttpClient;
import io.swagger.v3.oas.annotations.media.Schema;
import io.micronaut.reactor.http.client.ReactorHttpClient;
import io.micronaut.reactor.http.client.ReactorStreamingHttpClient;
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.apache.commons.io.IOUtils;
Expand All @@ -24,18 +20,14 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.*;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import java.util.stream.Collectors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

import static io.kestra.core.utils.Rethrow.throwFunction;

Expand All @@ -45,8 +37,6 @@
@Getter
@NoArgsConstructor
abstract public class AbstractHttp extends Task implements HttpInterface {
private static final NettyHttpClientFactory FACTORY = new NettyHttpClientFactory();

@NotNull
protected String uri;

Expand Down Expand Up @@ -142,13 +132,13 @@ protected DefaultHttpClientConfiguration configuration(RunContext runContext, Ht
protected HttpClient client(RunContext runContext, HttpMethod httpMethod) throws IllegalVariableEvaluationException, MalformedURLException, URISyntaxException {
URI from = new URI(runContext.render(this.uri));

return FACTORY.createClient(from.toURL(), this.configuration(runContext, httpMethod));
return ReactorHttpClient.create(from.toURL(), this.configuration(runContext, httpMethod));
}

protected RxStreamingHttpClient streamingClient(RunContext runContext, HttpMethod httpMethod) throws IllegalVariableEvaluationException, MalformedURLException, URISyntaxException {
protected ReactorStreamingHttpClient streamingClient(RunContext runContext, HttpMethod httpMethod) throws IllegalVariableEvaluationException, MalformedURLException, URISyntaxException {
URI from = new URI(runContext.render(this.uri));

return new ExtendedBridgedRxHttpClient(FACTORY.createStreamingClient(from.toURL(), this.configuration(runContext, httpMethod)));
return ReactorStreamingHttpClient.create(from.toURL(), this.configuration(runContext, httpMethod));
}

@SuppressWarnings({"unchecked", "rawtypes"})
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/io/kestra/plugin/fs/http/Download.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import io.micronaut.http.HttpResponse;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.client.exceptions.HttpClientResponseException;
import io.micronaut.rxjava2.http.client.RxStreamingHttpClient;
import io.micronaut.reactor.http.client.ReactorStreamingHttpClient;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
Expand All @@ -25,6 +25,8 @@
import java.util.List;
import java.util.Map;

import static io.kestra.core.utils.Rethrow.throwFunction;

@SuperBuilder
@ToString
@EqualsAndHashCode
Expand Down Expand Up @@ -65,15 +67,15 @@ public Download.Output run(RunContext runContext) throws Exception {

// do it
try (
RxStreamingHttpClient client = this.streamingClient(runContext, this.method);
ReactorStreamingHttpClient client = this.streamingClient(runContext, this.method);
BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(tempFile));
) {
@SuppressWarnings("unchecked")
HttpRequest<String> request = this.request(runContext);

Long size = client
.exchangeStream(request)
.map(response -> {
.map(throwFunction(response -> {
if (builder.code == null) {
builder
.code(response.code())
Expand All @@ -88,9 +90,9 @@ public Download.Output run(RunContext runContext) throws Exception {
} else {
return 0L;
}
})
}))
.reduce(Long::sum)
.blockingGet();
.block();

if (size == null) {
size = 0L;
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/io/kestra/plugin/fs/http/Trigger.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import lombok.experimental.SuperBuilder;
import org.slf4j.Logger;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.time.Duration;
import java.util.Map;
import java.util.Optional;
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/io/kestra/plugin/fs/ssh/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,18 @@
import lombok.ToString;
import lombok.experimental.SuperBuilder;

import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;

@SuperBuilder
@ToString
Expand Down
Loading
Loading