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(core): fix various compilation warnings

Browse Source 
Fixed clear Java compilation warnings.
This commit is contained in:
yuri1969
2025-01-29 21:47:03 +01:00
committed by Loïc Mathieu
parent e6827f2736
commit 625135959c
12 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/main/java/io/kestra/cli/commands/plugins/PluginDocCommand.java
View File

@@ -1,6 +1,5 @@
package io.kestra.cli.commands.plugins; package io.kestra.cli.commands.plugins;
import com.google.common.base.Charsets;
import com.google.common.io.Files; import com.google.common.io.Files;
import io.kestra.cli.AbstractCommand; import io.kestra.cli.AbstractCommand;
import io.kestra.core.docs.DocumentationGenerator; import io.kestra.core.docs.DocumentationGenerator;
@@ -61,7 +60,7 @@ public class PluginDocCommand extends AbstractCommand {
Files Files
.asCharSink( .asCharSink(
file, file,
Charsets.UTF_8 StandardCharsets.UTF_8
).write(s.getBody()); ).write(s.getBody());
stdOut("Generate doc in: {0}", file); stdOut("Generate doc in: {0}", file);

4
core/src/main/java/io/kestra/core/docs/DocumentationGenerator.java
View File

@@ -1,6 +1,5 @@
package io.kestra.core.docs; package io.kestra.core.docs;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import io.kestra.core.models.annotations.PluginSubGroup; import io.kestra.core.models.annotations.PluginSubGroup;
import io.kestra.core.models.conditions.Condition; import io.kestra.core.models.conditions.Condition;
@@ -29,6 +28,7 @@ import org.apache.commons.io.IOUtils;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -257,7 +257,7 @@ public class DocumentationGenerator {
public static <T> String render(String templateName, Map<String, Object> vars) throws IOException { public static <T> String render(String templateName, Map<String, Object> vars) throws IOException {
String pebbleTemplate = IOUtils.toString( String pebbleTemplate = IOUtils.toString(
Objects.requireNonNull(DocumentationGenerator.class.getClassLoader().getResourceAsStream("docs/" + templateName + ".peb")), Objects.requireNonNull(DocumentationGenerator.class.getClassLoader().getResourceAsStream("docs/" + templateName + ".peb")),
Charsets.UTF_8 StandardCharsets.UTF_8
); );
PebbleTemplate compiledTemplate = pebbleEngine.getLiteralTemplate(pebbleTemplate); PebbleTemplate compiledTemplate = pebbleEngine.getLiteralTemplate(pebbleTemplate);

3
core/src/main/java/io/kestra/core/models/validations/KestraConstraintViolationException.java
View File

@@ -5,11 +5,14 @@ import io.kestra.core.models.tasks.Task;
import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException; import jakarta.validation.ConstraintViolationException;
import java.io.Serial;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class KestraConstraintViolationException extends ConstraintViolationException { public class KestraConstraintViolationException extends ConstraintViolationException {
@Serial
private static final long serialVersionUID = 1L;
public KestraConstraintViolationException(Set<? extends ConstraintViolation<?>> constraintViolations) { public KestraConstraintViolationException(Set<? extends ConstraintViolation<?>> constraintViolations) {
super(constraintViolations); super(constraintViolations);

7
core/src/main/java/io/kestra/core/runners/pebble/filters/UrlDecoderFilter.java
View File

@@ -12,8 +12,8 @@ import io.pebbletemplates.pebble.extension.Filter;
import io.pebbletemplates.pebble.template.EvaluationContext; import io.pebbletemplates.pebble.template.EvaluationContext;
import io.pebbletemplates.pebble.template.PebbleTemplate; import io.pebbletemplates.pebble.template.PebbleTemplate;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -31,10 +31,7 @@ public class UrlDecoderFilter implements Filter {
return null; return null;
} }
String arg = (String) input; String arg = (String) input;
try { arg = URLDecoder.decode(arg, StandardCharsets.UTF_8);
arg = URLDecoder.decode(arg, "UTF-8");
} catch (UnsupportedEncodingException e) {
}
return arg; return arg;
} }

5
core/src/main/java/io/kestra/core/utils/Hashing.java
View File

@@ -1,8 +1,7 @@
package io.kestra.core.utils; package io.kestra.core.utils;
import com.google.common.base.Charsets;
import com.google.common.hash.HashCode; import com.google.common.hash.HashCode;
import com.google.common.hash.Hasher; import java.nio.charset.StandardCharsets;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@@ -62,6 +61,6 @@ public final class Hashing {
} }
private static HashCode getHashString(String value) { private static HashCode getHashString(String value) {
return com.google.common.hash.Hashing.murmur3_128().hashString(value, Charsets.UTF_8); return com.google.common.hash.Hashing.murmur3_128().hashString(value, StandardCharsets.UTF_8);
} }
} }

4
core/src/main/java/io/kestra/core/utils/IdUtils.java
View File

@@ -1,9 +1,9 @@
package io.kestra.core.utils; package io.kestra.core.utils;
import com.devskiller.friendly_id.FriendlyId; import com.devskiller.friendly_id.FriendlyId;
import com.google.common.base.Charsets;
import com.google.common.hash.HashFunction; import com.google.common.hash.HashFunction;
import com.google.common.hash.Hashing; import com.google.common.hash.Hashing;
import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
import java.util.UUID; import java.util.UUID;
@@ -21,7 +21,7 @@ abstract public class IdUtils {
public static String from(String from) { public static String from(String from) {
return FriendlyId.toFriendlyId( return FriendlyId.toFriendlyId(
UUID.nameUUIDFromBytes( UUID.nameUUIDFromBytes(
HASH_FUNCTION.hashString(from, Charsets.UTF_8).asBytes() HASH_FUNCTION.hashString(from, StandardCharsets.UTF_8).asBytes()
) )
); );
} }

3
core/src/test/java/io/kestra/core/http/client/HttpClientTest.java
View File

@@ -1,7 +1,6 @@
package io.kestra.core.http.client; package io.kestra.core.http.client;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.base.Charsets;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.exceptions.IllegalVariableEvaluationException;
import io.kestra.core.http.HttpRequest; import io.kestra.core.http.HttpRequest;
@@ -420,7 +419,7 @@ class HttpClientTest {
try (var inputStream = fileUpload.getInputStream()) { try (var inputStream = fileUpload.getInputStream()) {
sink.next(new AbstractMap.SimpleEntry<>( sink.next(new AbstractMap.SimpleEntry<>(
fileUpload.getName(), fileUpload.getName(),
IOUtils.toString(inputStream, Charsets.UTF_8) IOUtils.toString(inputStream, StandardCharsets.UTF_8)
)); ));
} }
} catch (IOException e) { } catch (IOException e) {

5
core/src/test/java/io/kestra/plugin/core/http/RequestTest.java
View File

@@ -1,7 +1,6 @@
package io.kestra.plugin.core.http; package io.kestra.plugin.core.http;
import com.devskiller.friendly_id.FriendlyId; import com.devskiller.friendly_id.FriendlyId;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import io.kestra.core.http.client.HttpClientRequestException; import io.kestra.core.http.client.HttpClientRequestException;
import io.kestra.core.http.client.HttpClientResponseException; import io.kestra.core.http.client.HttpClientResponseException;
@@ -350,7 +349,7 @@ class RequestTest {
Request.Output output = task.run(runContext); Request.Output output = task.run(runContext);
assertThat(output.getBody(), is("world > " + IOUtils.toString(new FileInputStream(file), Charsets.UTF_8))); assertThat(output.getBody(), is("world > " + IOUtils.toString(new FileInputStream(file), StandardCharsets.UTF_8)));
assertThat(output.getCode(), is(200)); assertThat(output.getCode(), is(200));
} }
} }
@@ -384,7 +383,7 @@ class RequestTest {
Request.Output output = task.run(runContext); Request.Output output = task.run(runContext);
assertThat(output.getBody(), is("world > " + IOUtils.toString(new FileInputStream(file), Charsets.UTF_8))); assertThat(output.getBody(), is("world > " + IOUtils.toString(new FileInputStream(file), StandardCharsets.UTF_8)));
assertThat(output.getCode(), is(200)); assertThat(output.getCode(), is(200));
} }
} }

5
tests/src/main/java/io/kestra/core/utils/TestsUtils.java
View File

@@ -1,7 +1,6 @@
package io.kestra.core.utils; package io.kestra.core.utils;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Charsets;
import com.google.common.io.Files; import com.google.common.io.Files;
import io.kestra.core.exceptions.DeserializationException; import io.kestra.core.exceptions.DeserializationException;
import io.kestra.core.models.conditions.ConditionContext; import io.kestra.core.models.conditions.ConditionContext;
@@ -13,7 +12,6 @@ import io.kestra.core.models.flows.State;
import io.kestra.core.models.tasks.Task; import io.kestra.core.models.tasks.Task;
import io.kestra.core.models.triggers.AbstractTrigger; import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.triggers.Trigger; import io.kestra.core.models.triggers.Trigger;
import io.kestra.core.models.triggers.TriggerContext;
import io.kestra.core.queues.QueueInterface; import io.kestra.core.queues.QueueInterface;
import io.kestra.core.repositories.LocalFlowRepositoryLoader; import io.kestra.core.repositories.LocalFlowRepositoryLoader;
import io.kestra.core.runners.DefaultRunContext; import io.kestra.core.runners.DefaultRunContext;
@@ -26,6 +24,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.time.Duration; import java.time.Duration;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.*; import java.util.*;
@@ -44,7 +43,7 @@ abstract public class TestsUtils {
URL resource = TestsUtils.class.getClassLoader().getResource(path); URL resource = TestsUtils.class.getClassLoader().getResource(path);
assert resource != null; assert resource != null;
String read = Files.asCharSource(new File(resource.getFile()), Charsets.UTF_8).read(); String read = Files.asCharSource(new File(resource.getFile()), StandardCharsets.UTF_8).read();
return mapper.readValue(read, cls); return mapper.readValue(read, cls);
} }

2
webserver/src/main/java/io/kestra/webserver/controllers/api/StaticFilter.java
View File

@@ -60,7 +60,7 @@ public class StaticFilter implements HttpServerFilter {
.filter(n -> n.getFile().getAbsoluteFile().toString().endsWith("ui/index.html")) .filter(n -> n.getFile().getAbsoluteFile().toString().endsWith("ui/index.html"))
.map(throwFunction(n -> IOUtils.toString( .map(throwFunction(n -> IOUtils.toString(
Objects.requireNonNull(StaticFilter.class.getClassLoader().getResourceAsStream("ui/index.html")), Objects.requireNonNull(StaticFilter.class.getClassLoader().getResourceAsStream("ui/index.html")),
Charsets.UTF_8 StandardCharsets.UTF_8
))) )))
) )
.filter(Optional::isPresent) .filter(Optional::isPresent)