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): move from org.kestra to io.kestra (#306)

Browse Source
This commit is contained in:
Ludovic DEHON
2021-03-19 22:30:15 +01:00
committed by tchiotludo
parent 9536ebca26
commit b55ac08ba9
510 changed files with 2693 additions and 2673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
.github/workflows/main.yml vendored
View File

@@ -100,12 +100,36 @@ jobs:
run: ./gradlew executableJar --no-daemon
# Publish
- name: Publish package to Bintray
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
- name: Publish package to Sonatype
if: github.ref == 'refs/heads/develop'
env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
run: ./gradlew bintrayUpload --parallel --no-daemon
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_GPG_KEYID: ${{ secrets.SONATYPE_GPG_KEYID }}
SONATYPE_GPG_PASSWORD: ${{ secrets.SONATYPE_GPG_PASSWORD }}
SONATYPE_GPG_FILE: ${{ secrets.SONATYPE_GPG_FILE }}
run: |
echo "signing.keyId=${SONATYPE_GPG_KEYID}" > ~/.gradle/gradle.properties
echo "signing.password=${SONATYPE_GPG_PASSWORD}" >> ~/.gradle/gradle.properties
echo "signing.secretKeyRingFile=${HOME}/.gradle/secring.gpg" >> ~/.gradle/gradle.properties
echo ${SONATYPE_GPG_FILE} | base64 -d > ~/.gradle/secring.gpg
./gradlew publishToSonatype --parallel --no-daemon
# Release
- name: Release package to Maven Central
if: startsWith(github.ref, 'refs/tags/v')
env:
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_GPG_KEYID: ${{ secrets.SONATYPE_GPG_KEYID }}
SONATYPE_GPG_PASSWORD: ${{ secrets.SONATYPE_GPG_PASSWORD }}
SONATYPE_GPG_FILE: ${{ secrets.SONATYPE_GPG_FILE }}
run: |
echo "signing.keyId=${SONATYPE_GPG_KEYID}" > ~/.gradle/gradle.properties
echo "signing.password=${SONATYPE_GPG_PASSWORD}" >> ~/.gradle/gradle.properties
echo "signing.secretKeyRingFile=${HOME}/.gradle/secring.gpg" >> ~/.gradle/gradle.properties
echo ${SONATYPE_GPG_FILE} | base64 -d > ~/.gradle/secring.gpg
./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon
# Upload artifacts
- name: Upload jar
@@ -167,7 +191,7 @@ jobs:
echo ::set-output name=plugins::
else
echo ::set-output name=tag::${TAG}
echo ::set-output name=plugins::--repositories=https://dl.bintray.com/kestra/maven-snapshot
echo ::set-output name=plugins::--repositories=https://s01.oss.sonatype.org/content/repositories/snapshots
fi
# Docker
@@ -197,7 +221,7 @@ jobs:
push: true
tags: ${{ format('kestra/kestra:{0}-full', steps.vars.outputs.tag) }}
build-args: |
KESTRA_PLUGINS=${{ steps.vars.outputs.plugins }} org.kestra.storage.gcs:storage-gcs:LATEST org.kestra.storage.minio:storage-minio:LATEST org.kestra.task.aws:task-aws:LATEST org.kestra.task.fs:task-fs:LATEST org.kestra.task.gcp:task-gcp:LATEST org.kestra.task.kubernetes:task-kubernetes:LATEST org.kestra.task.serdes:task-serdes:LATEST org.kestra.task.notifications:task-notifications:LATEST org.kestra.task.crypto:task-crypto:LATEST org.kestra.task.jdbc:mysql:LATEST org.kestra.task.jdbc:postgres:LATEST org.kestra.task.jdbc:vertica:LATEST org.kestra.task.jdbc:clickhouse:LATEST org.kestra.task.scripts:groovy:LATEST org.kestra.task.scripts:jython:LATEST org.kestra.task.scripts:nashorn:LATEST
KESTRA_PLUGINS=${{ steps.vars.outputs.plugins }} io.kestra.storage:storage-gcs:LATEST io.kestra.storage:storage-minio:LATEST io.kestra.plugin:plugin-aws:LATEST io.kestra.plugin:plugin-fs:LATEST io.kestra.plugin:plugin-gcp:LATEST io.kestra.plugin:plugin-kubernetes:LATEST io.kestra.plugin:plugin-serdes:LATEST io.kestra.plugin:plugin-notifications:LATEST io.kestra.plugin:plugin-crypto:LATEST io.kestra.plugin:plugin-jdbc-mysql:LATEST io.kestra.plugin:plugin-jdbc-postgres:LATEST io.kestra.plugin:plugin-jdbc-vertica:LATEST io.kestra.plugin:plugin-jdbc-clickhouse:LATEST io.kestra.plugin:plugin-script-groovy:LATEST io.kestra.plugin:plugin-script-jython:LATEST io.kestra.plugin:plugin-script-nashorn:LATEST
APT_PACKAGES=python3-pip python3-wheel python3-setuptools python3-virtualenv nodejs
# Slack

81
build.gradle
View File

@@ -17,9 +17,12 @@ plugins {
id 'org.siouan.frontend-jdk11' version '5.0.0' apply false
// release
id "com.jfrog.bintray" version "1.8.5" apply false
id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
id 'net.researchgate.release' version '2.8.1'
id "com.gorylenko.gradle-git-properties" version "2.2.4"
id 'signing'
id 'ru.vyarus.pom' version '2.1.0' apply false
id 'ru.vyarus.github-info' version '1.2.0' apply false
}
idea {
@@ -32,7 +35,7 @@ idea {
/**********************************************************************************************************************\
* Main
**********************************************************************************************************************/
mainClassName = "org.kestra.cli.App"
mainClassName = "io.kestra.cli.App"
sourceCompatibility = 11
dependencies {
@@ -44,7 +47,7 @@ dependencies {
* Dependencies
**********************************************************************************************************************/
allprojects {
group "org.kestra"
group "io.kestra"
sourceCompatibility = 11
@@ -305,12 +308,22 @@ task runStandalone(type: JavaExec) {
/**********************************************************************************************************************\
* Publish
**********************************************************************************************************************/
subprojects {
def isBuildSnapshot = version.toString().endsWith("-SNAPSHOT")
if (isBuildSnapshot) {
project.version = project.version.replaceAll(/-SNAPSHOT$/, "")
nexusPublishing {
repositoryDescription = "${project.group}:${rootProject.name}:${project.version}"
useStaging = !project.version.endsWith("-SNAPSHOT")
repositories {
sonatype {
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}
subprojects {
apply plugin: "maven-publish"
apply plugin: 'signing'
apply plugin: 'ru.vyarus.pom'
apply plugin: 'ru.vyarus.github-info'
javadoc {
options {
@@ -329,16 +342,31 @@ subprojects {
from javadoc
}
apply plugin: "maven-publish"
apply plugin: "com.jfrog.bintray"
github {
user 'kestra-io'
license 'Apache'
repository 'kestra'
site 'https://kestra.io'
}
pom {
description 'The modern, scalable orchestrator & scheduler open source platform'
developers {
developer {
id "tchiotludo"
name "Ludovic Dehon"
}
}
}
publishing {
publications {
BintrayMavenPublication(MavenPublication) {
sonatypePublication(MavenPublication) {
version project.version
if (project.name.contains('cli')) {
groupId "org.kestra"
groupId "io.kestra"
artifactId "kestra"
artifact shadowJar
@@ -352,36 +380,13 @@ subprojects {
artifact sourcesJar
artifact javadocJar
}
}
}
}
bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_KEY')
publications = ['BintrayMavenPublication']
publish = true
dryRun = false
override = isBuildSnapshot
pkg {
userOrg = 'kestra'
name = project.name.contains('cli') ? "kestra" : project.name
repo = isBuildSnapshot ? 'maven-snapshot' : 'maven'
websiteUrl = 'https://kestra.io'
issueTrackerUrl = 'https://github.com/kestra-io/kestra/issues'
vcsUrl = 'https://github.com/kestra-io/kestra'
licenses = ['Apache-2.0']
publicDownloadNumbers = true
githubRepo = 'kestra-io/kestra'
githubReleaseNotesFile = 'README.md'
version {
name = project.version
released = new Date().format("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
vcsTag = "v" + project.version
}
}
signing {
// required { !project.version.endsWith("-SNAPSHOT") && !project.hasProperty("skipSigning") }
sign publishing.publications.sonatypePublication
}
}

2
cli/src/main/java/org/kestra/cli/AbstractApiCommand.java → cli/src/main/java/io/kestra/cli/AbstractApiCommand.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli;
package io.kestra.cli;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.MutableHttpRequest;

14
cli/src/main/java/org/kestra/cli/AbstractCommand.java → cli/src/main/java/io/kestra/cli/AbstractCommand.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli;
package io.kestra.cli;
import ch.qos.logback.classic.LoggerContext;
import com.google.common.collect.ImmutableMap;
@@ -8,11 +8,11 @@ import io.micronaut.management.endpoint.EndpointDefaultConfiguration;
import io.micronaut.runtime.server.EmbeddedServer;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.client.utils.URIBuilder;
import org.kestra.core.contexts.KestraClassLoader;
import org.kestra.core.plugins.PluginRegistry;
import org.kestra.core.plugins.PluginScanner;
import org.kestra.core.plugins.RegisteredPlugin;
import org.kestra.core.utils.Rethrow;
import io.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.plugins.PluginRegistry;
import io.kestra.core.plugins.PluginScanner;
import io.kestra.core.plugins.RegisteredPlugin;
import io.kestra.core.utils.Rethrow;
import picocli.CommandLine;
import java.io.FileInputStream;
@@ -105,7 +105,7 @@ abstract public class AbstractCommand implements Callable<Integer> {
((LoggerContext) org.slf4j.LoggerFactory.getILoggerFactory())
.getLoggerList()
.stream()
.filter(logger -> (this.internalLog && logger.getName().startsWith("org.kestra")) || logger.getName().startsWith("flow"))
.filter(logger -> (this.internalLog && logger.getName().startsWith("io.kestra")) || logger.getName().startsWith("flow"))
.forEach(
logger -> logger.setLevel(ch.qos.logback.classic.Level.valueOf(this.logLevel.name()))
);

16
cli/src/main/java/org/kestra/cli/App.java → cli/src/main/java/io/kestra/cli/App.java
View File

@@ -1,16 +1,16 @@
package org.kestra.cli;
package io.kestra.cli;
import io.micronaut.configuration.picocli.MicronautFactory;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
import org.kestra.cli.commands.configs.sys.ConfigCommand;
import org.kestra.cli.commands.flows.FlowCommand;
import org.kestra.cli.commands.plugins.PluginCommand;
import org.kestra.cli.commands.servers.ServerCommand;
import org.kestra.cli.commands.sys.SysCommand;
import org.kestra.core.contexts.KestraApplicationContextBuilder;
import org.kestra.core.contexts.KestraClassLoader;
import io.kestra.cli.commands.configs.sys.ConfigCommand;
import io.kestra.cli.commands.flows.FlowCommand;
import io.kestra.cli.commands.plugins.PluginCommand;
import io.kestra.cli.commands.servers.ServerCommand;
import io.kestra.cli.commands.sys.SysCommand;
import io.kestra.core.contexts.KestraApplicationContextBuilder;
import io.kestra.core.contexts.KestraClassLoader;
import org.slf4j.bridge.SLF4JBridgeHandler;
import picocli.CommandLine;

6
cli/src/main/java/org/kestra/cli/VersionProvider.java → cli/src/main/java/io/kestra/cli/VersionProvider.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli;
package io.kestra.cli;
import io.micronaut.context.event.StartupEvent;
import io.micronaut.runtime.event.annotation.EventListener;
@@ -8,7 +8,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
class VersionProvider implements CommandLine.IVersionProvider {
private static org.kestra.core.utils.VersionProvider versionProvider;
private static io.kestra.core.utils.VersionProvider versionProvider;
public String[] getVersion() {
return new String[] { versionProvider.getVersion() };
@@ -17,7 +17,7 @@ class VersionProvider implements CommandLine.IVersionProvider {
@Singleton
public static class ContextHelper {
@Inject
private org.kestra.core.utils.VersionProvider versionProvider;
private io.kestra.core.utils.VersionProvider versionProvider;
@EventListener
void onStartup(final StartupEvent event) {

6
cli/src/main/java/org/kestra/cli/commands/configs/sys/ConfigCommand.java → cli/src/main/java/io/kestra/cli/commands/configs/sys/ConfigCommand.java
View File

@@ -1,9 +1,9 @@
package org.kestra.cli.commands.configs.sys;
package io.kestra.cli.commands.configs.sys;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.cli.App;
import io.kestra.cli.AbstractCommand;
import io.kestra.cli.App;
import picocli.CommandLine;
@CommandLine.Command(

6
cli/src/main/java/org/kestra/cli/commands/configs/sys/ConfigPropertiesCommand.java → cli/src/main/java/io/kestra/cli/commands/configs/sys/ConfigPropertiesCommand.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.configs.sys;
package io.kestra.cli.commands.configs.sys;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
@@ -6,8 +6,8 @@ import io.micronaut.context.env.PropertySource;
import io.micronaut.core.order.Ordered;
import io.micronaut.management.endpoint.env.EnvironmentEndpoint;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.serializers.JacksonMapper;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.serializers.JacksonMapper;
import picocli.CommandLine;
import java.util.*;

8
cli/src/main/java/org/kestra/cli/commands/flows/FlowCommand.java → cli/src/main/java/io/kestra/cli/commands/flows/FlowCommand.java
View File

@@ -1,11 +1,11 @@
package org.kestra.cli.commands.flows;
package io.kestra.cli.commands.flows;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.cli.App;
import org.kestra.cli.commands.flows.namespaces.FlowNamespaceCommand;
import io.kestra.cli.AbstractCommand;
import io.kestra.cli.App;
import io.kestra.cli.commands.flows.namespaces.FlowNamespaceCommand;
import picocli.CommandLine;
@CommandLine.Command(

16
cli/src/main/java/org/kestra/cli/commands/flows/FlowDotCommand.java → cli/src/main/java/io/kestra/cli/commands/flows/FlowDotCommand.java
View File

@@ -1,15 +1,15 @@
package org.kestra.cli.commands.flows;
package io.kestra.cli.commands.flows;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.annotation.Prototype;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.models.hierarchies.FlowGraph;
import org.kestra.core.models.hierarchies.GraphCluster;
import org.kestra.core.serializers.YamlFlowParser;
import org.kestra.core.services.Graph2DotService;
import org.kestra.core.services.GraphService;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.models.hierarchies.FlowGraph;
import io.kestra.core.models.hierarchies.GraphCluster;
import io.kestra.core.serializers.YamlFlowParser;
import io.kestra.core.services.Graph2DotService;
import io.kestra.core.services.GraphService;
import picocli.CommandLine;
import java.nio.file.Path;

16
cli/src/main/java/org/kestra/cli/commands/flows/FlowTestCommand.java → cli/src/main/java/io/kestra/cli/commands/flows/FlowTestCommand.java
View File

@@ -1,17 +1,17 @@
package org.kestra.cli.commands.flows;
package io.kestra.cli.commands.flows;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.annotation.Prototype;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.exceptions.MissingRequiredInput;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.repositories.FlowRepositoryInterface;
import org.kestra.core.repositories.LocalFlowRepositoryLoader;
import org.kestra.core.runners.RunnerUtils;
import org.kestra.runner.memory.MemoryRunner;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.exceptions.MissingRequiredInput;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.repositories.FlowRepositoryInterface;
import io.kestra.core.repositories.LocalFlowRepositoryLoader;
import io.kestra.core.runners.RunnerUtils;
import io.kestra.runner.memory.MemoryRunner;
import picocli.CommandLine;
import java.io.IOException;

10
cli/src/main/java/org/kestra/cli/commands/flows/ValidateCommand.java → cli/src/main/java/io/kestra/cli/commands/flows/ValidateCommand.java
View File

@@ -1,10 +1,10 @@
package org.kestra.cli.commands.flows;
package io.kestra.cli.commands.flows;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.serializers.JacksonMapper;
import org.kestra.core.serializers.YamlFlowParser;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.serializers.JacksonMapper;
import io.kestra.core.serializers.YamlFlowParser;
import picocli.CommandLine;
import java.nio.file.Path;

4
cli/src/main/java/org/kestra/cli/commands/flows/namespaces/FlowNamespaceCommand.java → cli/src/main/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceCommand.java
View File

@@ -1,7 +1,7 @@
package org.kestra.cli.commands.flows.namespaces;
package io.kestra.cli.commands.flows.namespaces;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import io.kestra.cli.AbstractCommand;
import picocli.CommandLine;
@CommandLine.Command(

12
cli/src/main/java/org/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommand.java → cli/src/main/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommand.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.flows.namespaces;
package io.kestra.cli.commands.flows.namespaces;
import io.micronaut.core.type.Argument;
import io.micronaut.http.HttpRequest;
@@ -6,10 +6,10 @@ import io.micronaut.http.MutableHttpRequest;
import io.micronaut.http.client.netty.DefaultHttpClient;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.kestra.cli.AbstractApiCommand;
import org.kestra.cli.commands.flows.ValidateCommand;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.serializers.YamlFlowParser;
import io.kestra.cli.AbstractApiCommand;
import io.kestra.cli.commands.flows.ValidateCommand;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.serializers.YamlFlowParser;
import picocli.CommandLine;
import java.nio.file.Files;
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.validation.ConstraintViolationException;
import static org.kestra.core.utils.Rethrow.throwFunction;
import static io.kestra.core.utils.Rethrow.throwFunction;
@CommandLine.Command(
name = "update",

6
cli/src/main/java/org/kestra/cli/commands/plugins/PluginCommand.java → cli/src/main/java/io/kestra/cli/commands/plugins/PluginCommand.java
View File

@@ -1,10 +1,10 @@
package org.kestra.cli.commands.plugins;
package io.kestra.cli.commands.plugins;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.cli.App;
import io.kestra.cli.AbstractCommand;
import io.kestra.cli.App;
import picocli.CommandLine;
@CommandLine.Command(

10
cli/src/main/java/org/kestra/cli/commands/plugins/PluginDocCommand.java → cli/src/main/java/io/kestra/cli/commands/plugins/PluginDocCommand.java
View File

@@ -1,10 +1,10 @@
package org.kestra.cli.commands.plugins;
package io.kestra.cli.commands.plugins;
import com.google.common.base.Charsets;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.docs.DocumentationGenerator;
import org.kestra.core.plugins.PluginScanner;
import org.kestra.core.plugins.RegisteredPlugin;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.docs.DocumentationGenerator;
import io.kestra.core.plugins.PluginScanner;
import io.kestra.core.plugins.RegisteredPlugin;
import picocli.CommandLine;
import java.io.File;

10
cli/src/main/java/org/kestra/cli/commands/plugins/PluginInstallCommand.java → cli/src/main/java/io/kestra/cli/commands/plugins/PluginInstallCommand.java
View File

@@ -1,10 +1,10 @@
package org.kestra.cli.commands.plugins;
package io.kestra.cli.commands.plugins;
import org.apache.commons.io.FilenameUtils;
import org.kestra.cli.AbstractCommand;
import org.kestra.cli.plugins.PluginDownloader;
import org.kestra.cli.plugins.RepositoryConfig;
import org.kestra.core.utils.IdUtils;
import io.kestra.cli.AbstractCommand;
import io.kestra.cli.plugins.PluginDownloader;
import io.kestra.cli.plugins.RepositoryConfig;
import io.kestra.core.utils.IdUtils;
import picocli.CommandLine;
import java.net.URI;

10
cli/src/main/java/org/kestra/cli/commands/plugins/PluginListCommand.java → cli/src/main/java/io/kestra/cli/commands/plugins/PluginListCommand.java
View File

@@ -1,9 +1,9 @@
package org.kestra.cli.commands.plugins;
package io.kestra.cli.commands.plugins;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.contexts.KestraClassLoader;
import org.kestra.core.plugins.PluginScanner;
import org.kestra.core.plugins.RegisteredPlugin;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.plugins.PluginScanner;
import io.kestra.core.plugins.RegisteredPlugin;
import picocli.CommandLine;
import java.util.List;

10
cli/src/main/java/org/kestra/cli/commands/servers/ExecutorCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/ExecutorCommand.java
View File

@@ -1,12 +1,12 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.ServerType;
import org.kestra.core.runners.AbstractExecutor;
import org.kestra.core.utils.Await;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.ServerType;
import io.kestra.core.runners.AbstractExecutor;
import io.kestra.core.utils.Await;
import picocli.CommandLine;
import java.util.Map;

12
cli/src/main/java/org/kestra/cli/commands/servers/IndexerCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/IndexerCommand.java
View File

@@ -1,13 +1,13 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.ServerType;
import org.kestra.core.runners.Indexer;
import org.kestra.core.runners.IndexerInterface;
import org.kestra.core.utils.Await;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.ServerType;
import io.kestra.core.runners.Indexer;
import io.kestra.core.runners.IndexerInterface;
import io.kestra.core.utils.Await;
import picocli.CommandLine;
import java.util.Map;

10
cli/src/main/java/org/kestra/cli/commands/servers/SchedulerCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/SchedulerCommand.java
View File

@@ -1,12 +1,12 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.ServerType;
import org.kestra.core.schedulers.AbstractScheduler;
import org.kestra.core.utils.Await;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.ServerType;
import io.kestra.core.schedulers.AbstractScheduler;
import io.kestra.core.utils.Await;
import picocli.CommandLine;
import java.util.Map;

6
cli/src/main/java/org/kestra/cli/commands/servers/ServerCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/ServerCommand.java
View File

@@ -1,10 +1,10 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.cli.App;
import io.kestra.cli.AbstractCommand;
import io.kestra.cli.App;
import picocli.CommandLine;
@CommandLine.Command(

16
cli/src/main/java/org/kestra/cli/commands/servers/StandAloneCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/StandAloneCommand.java
View File

@@ -1,15 +1,15 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.ServerType;
import org.kestra.core.repositories.LocalFlowRepositoryLoader;
import org.kestra.core.runners.AbstractExecutor;
import org.kestra.core.runners.StandAloneRunner;
import org.kestra.core.utils.Await;
import org.kestra.runner.kafka.KafkaExecutor;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.ServerType;
import io.kestra.core.repositories.LocalFlowRepositoryLoader;
import io.kestra.core.runners.AbstractExecutor;
import io.kestra.core.runners.StandAloneRunner;
import io.kestra.core.utils.Await;
import io.kestra.runner.kafka.KafkaExecutor;
import picocli.CommandLine;
import java.io.File;

8
cli/src/main/java/org/kestra/cli/commands/servers/WebServerCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/WebServerCommand.java
View File

@@ -1,11 +1,11 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.ServerType;
import org.kestra.core.utils.Await;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.ServerType;
import io.kestra.core.utils.Await;
import picocli.CommandLine;
import java.util.Map;

10
cli/src/main/java/org/kestra/cli/commands/servers/WorkerCommand.java → cli/src/main/java/io/kestra/cli/commands/servers/WorkerCommand.java
View File

@@ -1,12 +1,12 @@
package org.kestra.cli.commands.servers;
package io.kestra.cli.commands.servers;
import com.google.common.collect.ImmutableMap;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.ServerType;
import org.kestra.core.runners.Worker;
import org.kestra.core.utils.Await;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.ServerType;
import io.kestra.core.runners.Worker;
import io.kestra.core.utils.Await;
import picocli.CommandLine;
import java.util.Map;

8
cli/src/main/java/org/kestra/cli/commands/sys/FlowListenersRestoreCommand.java → cli/src/main/java/io/kestra/cli/commands/sys/FlowListenersRestoreCommand.java
View File

@@ -1,10 +1,10 @@
package org.kestra.cli.commands.sys;
package io.kestra.cli.commands.sys;
import io.micronaut.context.ApplicationContext;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.services.FlowListenersInterface;
import org.kestra.core.utils.Await;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.services.FlowListenersInterface;
import io.kestra.core.utils.Await;
import picocli.CommandLine;
import java.time.Duration;

22
cli/src/main/java/org/kestra/cli/commands/sys/RestoreQueueCommand.java → cli/src/main/java/io/kestra/cli/commands/sys/RestoreQueueCommand.java
View File

@@ -1,19 +1,19 @@
package org.kestra.cli.commands.sys;
package io.kestra.cli.commands.sys;
import io.micronaut.context.ApplicationContext;
import io.micronaut.inject.qualifiers.Qualifiers;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.models.templates.Template;
import org.kestra.core.models.triggers.Trigger;
import org.kestra.core.queues.QueueFactoryInterface;
import org.kestra.core.queues.QueueInterface;
import org.kestra.core.repositories.FlowRepositoryInterface;
import org.kestra.core.repositories.TemplateRepositoryInterface;
import org.kestra.core.repositories.TriggerRepositoryInterface;
import org.kestra.runner.kafka.services.KafkaAdminService;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.models.templates.Template;
import io.kestra.core.models.triggers.Trigger;
import io.kestra.core.queues.QueueFactoryInterface;
import io.kestra.core.queues.QueueInterface;
import io.kestra.core.repositories.FlowRepositoryInterface;
import io.kestra.core.repositories.TemplateRepositoryInterface;
import io.kestra.core.repositories.TriggerRepositoryInterface;
import io.kestra.runner.kafka.services.KafkaAdminService;
import picocli.CommandLine;
import java.util.ArrayList;

6
cli/src/main/java/org/kestra/cli/commands/sys/SysCommand.java → cli/src/main/java/io/kestra/cli/commands/sys/SysCommand.java
View File

@@ -1,9 +1,9 @@
package org.kestra.cli.commands.sys;
package io.kestra.cli.commands.sys;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.extern.slf4j.Slf4j;
import org.kestra.cli.AbstractCommand;
import org.kestra.cli.App;
import io.kestra.cli.AbstractCommand;
import io.kestra.cli.App;
import picocli.CommandLine;
@CommandLine.Command(

2
cli/src/main/java/org/kestra/cli/plugins/PluginDownloader.java → cli/src/main/java/io/kestra/cli/plugins/PluginDownloader.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.plugins;
package io.kestra.cli.plugins;
import com.google.common.collect.ImmutableList;
import io.micronaut.context.annotation.Value;

2
cli/src/main/java/org/kestra/cli/plugins/RepositoryConfig.java → cli/src/main/java/io/kestra/cli/plugins/RepositoryConfig.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.plugins;
package io.kestra.cli.plugins;
import io.micronaut.context.annotation.EachProperty;
import io.micronaut.context.annotation.Parameter;

46
cli/src/main/resources/application.yml
View File

@@ -72,14 +72,14 @@ kestra:
topics:
execution:
name: "${kestra.kafka.defaults.topic-prefix}execution"
cls: org.kestra.core.models.executions.Execution
cls: io.kestra.core.models.executions.Execution
properties:
cleanup.policy: "compact"
retention.ms: "-1"
flow:
name: "${kestra.kafka.defaults.topic-prefix}flow"
cls: org.kestra.core.models.flows.Flow
cls: io.kestra.core.models.flows.Flow
properties:
cleanup.policy: "compact"
retention.ms: "-1"
@@ -94,7 +94,7 @@ kestra:
template:
name: "${kestra.kafka.defaults.topic-prefix}template"
cls: org.kestra.core.models.templates.Template
cls: io.kestra.core.models.templates.Template
properties:
cleanup.policy: "compact"
retention.ms: "-1"
@@ -107,31 +107,31 @@ kestra:
killed:
name: "${kestra.kafka.defaults.topic-prefix}executor_killed"
cls: org.kestra.core.models.executions.ExecutionKilled
cls: io.kestra.core.models.executions.ExecutionKilled
properties:
cleanup.policy: "delete,compact"
executorflowtrigger:
name: "${kestra.kafka.defaults.topic-prefix}executor_flowtrigger"
cls: org.kestra.runner.kafka.streams.ExecutorFlowTrigger
cls: io.kestra.runner.kafka.streams.ExecutorFlowTrigger
properties:
cleanup.policy: "delete,compact"
workertask:
name: "${kestra.kafka.defaults.topic-prefix}workertask"
cls: org.kestra.core.runners.WorkerTask
cls: io.kestra.core.runners.WorkerTask
partitions: 64
properties:
cleanup.policy: "delete,compact"
workertaskresult:
name: "${kestra.kafka.defaults.topic-prefix}workertaskresult"
cls: org.kestra.core.runners.WorkerTaskResult
cls: io.kestra.core.runners.WorkerTaskResult
properties:
cleanup.policy: "delete,compact"
workerinstance:
cls: org.kestra.core.runners.WorkerInstance
cls: io.kestra.core.runners.WorkerInstance
name: "${kestra.kafka.defaults.topic-prefix}workerinstance"
properties:
cleanup.policy: "compact"
@@ -142,17 +142,17 @@ kestra:
cleanup.policy: "compact"
workertaskrunning:
cls: org.kestra.core.runners.WorkerTaskRunning
cls: io.kestra.core.runners.WorkerTaskRunning
name: "${kestra.kafka.defaults.topic-prefix}workertaskrunning"
properties:
cleanup.policy: "delete,compact"
logentry:
cls: org.kestra.core.models.executions.LogEntry
cls: io.kestra.core.models.executions.LogEntry
name: "${kestra.kafka.defaults.topic-prefix}logs"
trigger:
cls: org.kestra.core.models.triggers.Trigger
cls: io.kestra.core.models.triggers.Trigger
name: "${kestra.kafka.defaults.topic-prefix}trigger"
properties:
cleanup.policy: "compact"
@@ -163,43 +163,39 @@ kestra:
indices:
flows:
index: "${kestra.elasticsearch.defaults.indice-prefix}flows"
cls: org.kestra.core.models.flows.Flow
cls: io.kestra.core.models.flows.Flow
mapping-file: flow
flows-revisions:
index: "${kestra.elasticsearch.defaults.indice-prefix}flows_revisions"
cls: org.kestra.core.models.flows.Flow
cls: io.kestra.core.models.flows.Flow
mapping-file: flow
executions:
index: "${kestra.elasticsearch.defaults.indice-prefix}executions"
cls: org.kestra.core.models.executions.Execution
cls: io.kestra.core.models.executions.Execution
mapping-file: execution
templates:
index: "${kestra.elasticsearch.defaults.indice-prefix}templates"
cls: org.kestra.core.models.templates.Template
cls: io.kestra.core.models.templates.Template
mapping-file: template
triggers:
index: "${kestra.elasticsearch.defaults.indice-prefix}triggers"
cls: org.kestra.core.models.triggers.Trigger
cls: io.kestra.core.models.triggers.Trigger
mapping-file: trigger
logs:
index: "${kestra.elasticsearch.defaults.indice-prefix}logs"
cls: org.kestra.core.models.executions.LogEntry
cls: io.kestra.core.models.executions.LogEntry
mapping-file: log
indexer:
models:
- org.kestra.core.models.executions.Execution
- org.kestra.core.models.triggers.Trigger
- org.kestra.core.models.executions.LogEntry
- io.kestra.core.models.executions.Execution
- io.kestra.core.models.triggers.Trigger
- io.kestra.core.models.executions.LogEntry
plugins:
repositories:
central:
url: https://repo.maven.apache.org/maven2/
jcenter:
url: https://jcenter.bintray.com/
kestra:
url: https://dl.bintray.com/kestra/maven
variables:
env-vars-prefix: KESTRA_
@@ -211,7 +207,7 @@ kestra:
server:
access-log:
enabled: true
name: org.kestra.webserver.access
name: io.kestra.webserver.access
format: "[Date: {}] [Duration: {} ms] [Method: {}] [Url: {}] [Status: {}] [Length: {}] [Ip: {}] [Port: {}]"
filters:
- ".*\\[Url: /api/.*"

2
cli/src/test/java/AppTest.java
View File

@@ -2,7 +2,7 @@ import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
import org.junit.jupiter.api.Test;
import org.kestra.cli.App;
import io.kestra.cli.App;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

2
cli/src/test/java/org/kestra/cli/commands/configs/sys/ConfigPropertiesCommandTest.java → cli/src/test/java/io/kestra/cli/commands/configs/sys/ConfigPropertiesCommandTest.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.configs.sys;
package io.kestra.cli.commands.configs.sys;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;

2
cli/src/test/java/org/kestra/cli/commands/flows/FlowDotCommandTest.java → cli/src/test/java/io/kestra/cli/commands/flows/FlowDotCommandTest.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.flows;
package io.kestra.cli.commands.flows;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;

2
cli/src/test/java/org/kestra/cli/commands/flows/ValidateCommandTest.java → cli/src/test/java/io/kestra/cli/commands/flows/ValidateCommandTest.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.flows;
package io.kestra.cli.commands.flows;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;

8
cli/src/test/java/org/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommandTest.java → cli/src/test/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommandTest.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.flows.namespaces;
package io.kestra.cli.commands.flows.namespaces;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
@@ -6,7 +6,7 @@ import io.micronaut.context.env.Environment;
import io.micronaut.runtime.server.EmbeddedServer;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.contexts.KestraClassLoader;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -33,7 +33,7 @@ class FlowNamespaceUpdateCommandTest {
embeddedServer.getURL().toString(),
"--user",
"myuser:pass:word",
"org.kestra.cli",
"io.kestra.cli",
directory.getPath(),
};
@@ -59,7 +59,7 @@ class FlowNamespaceUpdateCommandTest {
embeddedServer.getURL().toString(),
"--user",
"myuser:pass:word",
"org.kestra.cli",
"io.kestra.cli",
directory.getPath(),
};

8
cli/src/test/java/org/kestra/cli/commands/plugins/PluginInstallCommandTest.java → cli/src/test/java/io/kestra/cli/commands/plugins/PluginInstallCommandTest.java
View File

@@ -1,11 +1,11 @@
package org.kestra.cli.commands.plugins;
package io.kestra.cli.commands.plugins;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.contexts.KestraClassLoader;
import java.io.IOException;
import java.nio.file.Files;
@@ -30,13 +30,13 @@ class PluginInstallCommandTest {
pluginsPath.toFile().deleteOnExit();
try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
String[] args = {"--plugins", pluginsPath.toAbsolutePath().toString(), "org.kestra.task.notifications:task-notifications:0.1.0"};
String[] args = {"--plugins", pluginsPath.toAbsolutePath().toString(), "io.kestra.plugin:plugin-notifications:0.2.0-SNAPSHOT"};
PicocliRunner.call(PluginInstallCommand.class, ctx, args);
List<Path> files = Files.list(pluginsPath).collect(Collectors.toList());
assertThat(files.size(), is(1));
assertThat(files.get(0).getFileName().toString(), is("task-notifications-0.1.0.jar"));
assertThat(files.get(0).getFileName().toString(), is("plugin-notifications-0.2.0-SNAPSHOT.jar"));
}
}
}

10
cli/src/test/java/org/kestra/cli/commands/plugins/PluginListCommandTest.java → cli/src/test/java/io/kestra/cli/commands/plugins/PluginListCommandTest.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.plugins;
package io.kestra.cli.commands.plugins;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
@@ -6,7 +6,7 @@ import io.micronaut.context.env.Environment;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.contexts.KestraClassLoader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -36,8 +36,8 @@ class PluginListCommandTest {
FileUtils.copyFile(
new File(Objects.requireNonNull(PluginListCommandTest.class.getClassLoader()
.getResource("plugins/plugin-template-test-0.1.0-SNAPSHOT.jar")).toURI()),
new File(URI.create("file://" + pluginsPath.toAbsolutePath() + "/plugin-template-test-0.1.0-SNAPSHOT.jar"))
.getResource("plugins/plugin-template-test-0.2.0-SNAPSHOT.jar")).toURI()),
new File(URI.create("file://" + pluginsPath.toAbsolutePath() + "/plugin-template-test-0.2.0-SNAPSHOT.jar"))
);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -47,7 +47,7 @@ class PluginListCommandTest {
String[] args = {"--plugins", pluginsPath.toAbsolutePath().toString()};
PicocliRunner.call(PluginListCommand.class, ctx, args);
assertThat(out.toString(), containsString("io.kestra.task.templates.Example"));
assertThat(out.toString(), containsString("io.kestra.plugin.templates.Example"));
}
}
}

6
cli/src/test/java/org/kestra/cli/commands/sys/FlowListenersRestoreCommandTest.java → cli/src/test/java/io/kestra/cli/commands/sys/FlowListenersRestoreCommandTest.java
View File

@@ -1,12 +1,12 @@
package org.kestra.cli.commands.sys;
package io.kestra.cli.commands.sys;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kestra.core.contexts.KestraClassLoader;
import org.kestra.core.repositories.FlowRepositoryInterface;
import io.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.repositories.FlowRepositoryInterface;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

18
cli/src/test/java/org/kestra/cli/commands/sys/RestoreQueueCommandTest.java → cli/src/test/java/io/kestra/cli/commands/sys/RestoreQueueCommandTest.java
View File

@@ -1,4 +1,4 @@
package org.kestra.cli.commands.sys;
package io.kestra.cli.commands.sys;
import io.micronaut.configuration.picocli.PicocliRunner;
import io.micronaut.context.ApplicationContext;
@@ -6,13 +6,13 @@ import io.micronaut.context.env.Environment;
import io.micronaut.inject.qualifiers.Qualifiers;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kestra.core.contexts.KestraClassLoader;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.queues.QueueFactoryInterface;
import org.kestra.core.queues.QueueInterface;
import org.kestra.core.repositories.FlowRepositoryInterface;
import org.kestra.core.tasks.debugs.Return;
import org.kestra.core.utils.IdUtils;
import io.kestra.core.contexts.KestraClassLoader;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.queues.QueueFactoryInterface;
import io.kestra.core.queues.QueueInterface;
import io.kestra.core.repositories.FlowRepositoryInterface;
import io.kestra.core.tasks.debugs.Return;
import io.kestra.core.utils.IdUtils;
import java.util.Collections;
import java.util.concurrent.CountDownLatch;
@@ -32,7 +32,7 @@ class RestoreQueueCommandTest {
static Flow create() {
return Flow.builder()
.id(IdUtils.create())
.namespace("org.kestra.unittest")
.namespace("io.kestra.unittest")
.revision(1)
.tasks(Collections.singletonList(Return.builder().id("test").type(Return.class.getName()).format("test").build()))
.build();

6
cli/src/test/resources/application.yml
View File

@@ -8,7 +8,5 @@ kestra:
repositories:
central:
url: https://repo.maven.apache.org/maven2/
jcenter:
url: https://jcenter.bintray.com/
kestra:
url: https://dl.bintray.com/kestra/maven
sonatype:
url: https://s01.oss.sonatype.org/content/repositories/snapshots/

4
cli/src/test/resources/flows/first.yaml
View File

@@ -1,7 +1,7 @@
id: first
namespace: org.kestra.cli
namespace: io.kestra.cli
tasks:
- id: date
type: org.kestra.core.tasks.debugs.Return
type: io.kestra.core.tasks.debugs.Return
format: "{{taskrun.startDate}}"

4
cli/src/test/resources/flows/second.yaml
View File

@@ -1,7 +1,7 @@
id: second
namespace: org.kestra.cli
namespace: io.kestra.cli
tasks:
- id: date
type: org.kestra.core.tasks.debugs.Return
type: io.kestra.core.tasks.debugs.Return
format: "{{taskrun.startDate}}"

2
cli/src/test/resources/invalids/empty.yaml
View File

@@ -1,2 +1,2 @@
id: empty
namespace: org.kestra.tests
namespace: io.kestra.tests

BIN
core/src/test/resources/plugins/plugin-template-test-0.1.0-SNAPSHOT.jar → cli/src/test/resources/plugins/plugin-template-test-0.2.0-SNAPSHOT.jar
View File

Binary file not shown.

4
core/src/main/java/org/kestra/core/contexts/KestraApplicationContext.java → core/src/main/java/io/kestra/core/contexts/KestraApplicationContext.java
View File

@@ -1,11 +1,11 @@
package org.kestra.core.contexts;
package io.kestra.core.contexts;
import io.micronaut.context.ApplicationContextConfiguration;
import io.micronaut.context.DefaultApplicationContext;
import io.micronaut.core.io.service.ServiceDefinition;
import io.micronaut.core.io.service.SoftServiceLoader;
import io.micronaut.inject.BeanDefinitionReference;
import org.kestra.core.plugins.PluginRegistry;
import io.kestra.core.plugins.PluginRegistry;
import javax.annotation.Nonnull;
import javax.inject.Singleton;

4
core/src/main/java/org/kestra/core/contexts/KestraApplicationContextBuilder.java → core/src/main/java/io/kestra/core/contexts/KestraApplicationContextBuilder.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.contexts;
package io.kestra.core.contexts;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.ApplicationContextBuilder;
@@ -10,7 +10,7 @@ import io.micronaut.context.env.SystemPropertiesPropertySource;
import io.micronaut.core.convert.ConversionService;
import io.micronaut.core.io.scan.ClassPathResourceLoader;
import io.micronaut.core.util.StringUtils;
import org.kestra.core.plugins.PluginRegistry;
import io.kestra.core.plugins.PluginRegistry;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

6
core/src/main/java/org/kestra/core/contexts/KestraClassLoader.java → core/src/main/java/io/kestra/core/contexts/KestraClassLoader.java
View File

@@ -1,8 +1,8 @@
package org.kestra.core.contexts;
package io.kestra.core.contexts;
import lombok.extern.slf4j.Slf4j;
import org.kestra.core.plugins.PluginRegistry;
import org.kestra.core.plugins.RegisteredPlugin;
import io.kestra.core.plugins.PluginRegistry;
import io.kestra.core.plugins.RegisteredPlugin;
import java.util.Optional;

6
core/src/main/java/org/kestra/core/contexts/KestraValidator.java → core/src/main/java/io/kestra/core/contexts/KestraValidator.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.contexts;
package io.kestra.core.contexts;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
@@ -12,8 +12,8 @@ import io.micronaut.core.util.ArgumentUtils;
import io.micronaut.validation.validator.DefaultValidator;
import io.micronaut.validation.validator.ValidatorConfiguration;
import lombok.extern.slf4j.Slf4j;
import org.kestra.core.plugins.PluginRegistry;
import org.kestra.core.plugins.RegisteredPlugin;
import io.kestra.core.plugins.PluginRegistry;
import io.kestra.core.plugins.RegisteredPlugin;
import java.util.HashMap;
import java.util.Map;

4
core/src/main/java/org/kestra/core/docs/ClassPluginDocumentation.java → core/src/main/java/io/kestra/core/docs/ClassPluginDocumentation.java
View File

@@ -1,9 +1,9 @@
package org.kestra.core.docs;
package io.kestra.core.docs;
import com.google.common.base.CaseFormat;
import lombok.*;
import org.apache.commons.lang3.ArrayUtils;
import org.kestra.core.plugins.RegisteredPlugin;
import io.kestra.core.plugins.RegisteredPlugin;
import java.util.*;
import java.util.stream.Collectors;

2
core/src/main/java/org/kestra/core/docs/Document.java → core/src/main/java/io/kestra/core/docs/Document.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.docs;
package io.kestra.core.docs;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;

18
core/src/main/java/org/kestra/core/docs/DocumentationGenerator.java → core/src/main/java/io/kestra/core/docs/DocumentationGenerator.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.docs;
package io.kestra.core.docs;
import com.github.jknack.handlebars.EscapingStrategy;
import com.github.jknack.handlebars.Handlebars;
@@ -9,14 +9,14 @@ import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
import org.apache.commons.io.IOUtils;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.tasks.Task;
import org.kestra.core.models.triggers.AbstractTrigger;
import org.kestra.core.plugins.RegisteredPlugin;
import org.kestra.core.runners.handlebars.helpers.DateHelper;
import org.kestra.core.runners.handlebars.helpers.JsonHelper;
import org.kestra.core.serializers.JacksonMapper;
import org.kestra.core.utils.Slugify;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.tasks.Task;
import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.plugins.RegisteredPlugin;
import io.kestra.core.runners.handlebars.helpers.DateHelper;
import io.kestra.core.runners.handlebars.helpers.JsonHelper;
import io.kestra.core.serializers.JacksonMapper;
import io.kestra.core.utils.Slugify;
import java.io.IOException;
import java.io.InputStream;

10
core/src/main/java/org/kestra/core/docs/JsonSchemaGenerator.java → core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.docs;
package io.kestra.core.docs;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -9,10 +9,10 @@ import com.github.victools.jsonschema.module.javax.validation.JavaxValidationOpt
import com.github.victools.jsonschema.module.swagger2.Swagger2Module;
import com.google.common.collect.ImmutableMap;
import io.swagger.v3.oas.annotations.media.Schema;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.annotations.PluginProperty;
import org.kestra.core.models.tasks.Output;
import org.kestra.core.serializers.JacksonMapper;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.annotations.PluginProperty;
import io.kestra.core.models.tasks.Output;
import io.kestra.core.serializers.JacksonMapper;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

4
core/src/main/java/org/kestra/core/docs/PluginDocumentation.java → core/src/main/java/io/kestra/core/docs/PluginDocumentation.java
View File

@@ -1,7 +1,7 @@
package org.kestra.core.docs;
package io.kestra.core.docs;
import lombok.*;
import org.kestra.core.plugins.RegisteredPlugin;
import io.kestra.core.plugins.RegisteredPlugin;
import java.util.Comparator;
import java.util.List;

8
core/src/main/java/org/kestra/core/endpoints/SchedulerEndpoint.java → core/src/main/java/io/kestra/core/endpoints/SchedulerEndpoint.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.endpoints;
package io.kestra.core.endpoints;
import io.micronaut.context.annotation.Requires;
import io.micronaut.management.endpoint.annotation.Endpoint;
@@ -6,9 +6,9 @@ import io.micronaut.management.endpoint.annotation.Read;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import org.kestra.core.models.triggers.AbstractTrigger;
import org.kestra.core.models.triggers.Trigger;
import org.kestra.core.schedulers.AbstractScheduler;
import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.triggers.Trigger;
import io.kestra.core.schedulers.AbstractScheduler;
import java.time.ZonedDateTime;
import java.util.List;

8
core/src/main/java/org/kestra/core/endpoints/WorkerEndpoint.java → core/src/main/java/io/kestra/core/endpoints/WorkerEndpoint.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.endpoints;
package io.kestra.core.endpoints;
import io.micronaut.context.annotation.Requires;
import io.micronaut.management.endpoint.annotation.Endpoint;
@@ -6,9 +6,9 @@ import io.micronaut.management.endpoint.annotation.Read;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import org.kestra.core.models.executions.TaskRun;
import org.kestra.core.models.tasks.Task;
import org.kestra.core.runners.Worker;
import io.kestra.core.models.executions.TaskRun;
import io.kestra.core.models.tasks.Task;
import io.kestra.core.runners.Worker;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

2
core/src/main/java/org/kestra/core/events/CrudEvent.java → core/src/main/java/io/kestra/core/events/CrudEvent.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.events;
package io.kestra.core.events;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
core/src/main/java/org/kestra/core/events/CrudEventType.java → core/src/main/java/io/kestra/core/events/CrudEventType.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.events;
package io.kestra.core.events;
public enum CrudEventType {
READ,

2
core/src/main/java/org/kestra/core/exceptions/IllegalVariableEvaluationException.java → core/src/main/java/io/kestra/core/exceptions/IllegalVariableEvaluationException.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.exceptions;
package io.kestra.core.exceptions;
public class IllegalVariableEvaluationException extends InternalException {
private static final long serialVersionUID = 1L;

2
core/src/main/java/org/kestra/core/exceptions/InternalException.java → core/src/main/java/io/kestra/core/exceptions/InternalException.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.exceptions;
package io.kestra.core.exceptions;
public class InternalException extends Exception {
private static final long serialVersionUID = 1L;

2
core/src/main/java/org/kestra/core/exceptions/MissingRequiredInput.java → core/src/main/java/io/kestra/core/exceptions/MissingRequiredInput.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.exceptions;
package io.kestra.core.exceptions;
public class MissingRequiredInput extends IllegalArgumentException {
private static final long serialVersionUID = 1L;

2
core/src/main/java/org/kestra/core/exceptions/TimeoutExceededException.java → core/src/main/java/io/kestra/core/exceptions/TimeoutExceededException.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.exceptions;
package io.kestra.core.exceptions;
import org.apache.commons.lang3.time.DurationFormatUtils;

2
core/src/main/java/org/kestra/core/metrics/GlobalTagsConfigurer.java → core/src/main/java/io/kestra/core/metrics/GlobalTagsConfigurer.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.metrics;
package io.kestra.core.metrics;
import io.micrometer.core.instrument.MeterRegistry;
import io.micronaut.configuration.metrics.aggregator.MeterRegistryConfigurer;

2
core/src/main/java/org/kestra/core/metrics/MetricConfig.java → core/src/main/java/io/kestra/core/metrics/MetricConfig.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.metrics;
package io.kestra.core.metrics;
import io.micronaut.context.annotation.ConfigurationProperties;
import io.micronaut.core.convert.format.MapFormat;

14
core/src/main/java/org/kestra/core/metrics/MetricRegistry.java → core/src/main/java/io/kestra/core/metrics/MetricRegistry.java
View File

@@ -1,16 +1,16 @@
package org.kestra.core.metrics;
package io.kestra.core.metrics;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.binder.MeterBinder;
import io.micrometer.core.lang.Nullable;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.kestra.core.models.executions.Execution;
import org.kestra.core.models.tasks.Task;
import org.kestra.core.models.triggers.TriggerContext;
import org.kestra.core.runners.WorkerTask;
import org.kestra.core.runners.WorkerTaskResult;
import org.kestra.core.schedulers.SchedulerExecutionWithTrigger;
import io.kestra.core.models.executions.Execution;
import io.kestra.core.models.tasks.Task;
import io.kestra.core.models.triggers.TriggerContext;
import io.kestra.core.runners.WorkerTask;
import io.kestra.core.runners.WorkerTaskResult;
import io.kestra.core.schedulers.SchedulerExecutionWithTrigger;
import javax.inject.Inject;
import javax.inject.Singleton;

2
core/src/main/java/org/kestra/core/models/DeletedInterface.java → core/src/main/java/io/kestra/core/models/DeletedInterface.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models;
package io.kestra.core.models;
public interface DeletedInterface {
boolean isDeleted();

2
core/src/main/java/org/kestra/core/models/ServerType.java → core/src/main/java/io/kestra/core/models/ServerType.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models;
package io.kestra.core.models;
public enum ServerType {
EXECUTOR,

2
core/src/main/java/org/kestra/core/models/annotations/Example.java → core/src/main/java/io/kestra/core/models/annotations/Example.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.annotations;
package io.kestra.core.models.annotations;
import java.lang.annotation.*;

2
core/src/main/java/org/kestra/core/models/annotations/Examples.java → core/src/main/java/io/kestra/core/models/annotations/Examples.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.annotations;
package io.kestra.core.models.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
core/src/main/java/org/kestra/core/models/annotations/Plugin.java → core/src/main/java/io/kestra/core/models/annotations/Plugin.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.annotations;
package io.kestra.core.models.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
core/src/main/java/org/kestra/core/models/annotations/PluginProperty.java → core/src/main/java/io/kestra/core/models/annotations/PluginProperty.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.annotations;
package io.kestra.core.models.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
core/src/main/java/org/kestra/core/models/conditions/Condition.java → core/src/main/java/io/kestra/core/models/conditions/Condition.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.conditions;
package io.kestra.core.models.conditions;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.micronaut.core.annotation.Introspected;

10
core/src/main/java/org/kestra/core/models/conditions/ConditionContext.java → core/src/main/java/io/kestra/core/models/conditions/ConditionContext.java
View File

@@ -1,13 +1,13 @@
package org.kestra.core.models.conditions;
package io.kestra.core.models.conditions;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.kestra.core.models.executions.Execution;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.models.triggers.multipleflows.MultipleConditionStorageInterface;
import org.kestra.core.runners.RunContext;
import io.kestra.core.models.executions.Execution;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.models.triggers.multipleflows.MultipleConditionStorageInterface;
import io.kestra.core.runners.RunContext;
import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;

14
core/src/main/java/org/kestra/core/models/conditions/types/ExecutionFlowCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/ExecutionFlowCondition.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
@@ -6,10 +6,10 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import javax.validation.constraints.NotNull;
@@ -27,8 +27,8 @@ import javax.validation.constraints.NotNull;
full = true,
code = {
"- conditions:",
" - type: org.kestra.core.models.conditions.types.ExecutionFlowCondition",
" namespace: org.kestra.tests",
" - type: io.kestra.core.models.conditions.types.ExecutionFlowCondition",
" namespace: io.kestra.tests",
" flowId: my-current-flow"
}
)

14
core/src/main/java/org/kestra/core/models/conditions/types/ExecutionNamespaceCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/ExecutionNamespaceCondition.java
View File

@@ -1,12 +1,12 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@@ -25,8 +25,8 @@ import javax.validation.constraints.NotNull;
full = true,
code = {
"- conditions:",
" - type: org.kestra.core.models.conditions.types.ExecutionNamespaceCondition",
" namespace: org.kestra.tests",
" - type: io.kestra.core.models.conditions.types.ExecutionNamespaceCondition",
" namespace: io.kestra.tests",
" prefix: true",
}

14
core/src/main/java/org/kestra/core/models/conditions/types/ExecutionStatusCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/ExecutionStatusCondition.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
@@ -6,11 +6,11 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
import org.kestra.core.models.flows.State;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import io.kestra.core.models.flows.State;
import java.util.List;
import javax.validation.Valid;
@@ -27,7 +27,7 @@ import javax.validation.Valid;
full = true,
code = {
"- conditions:",
" - type: org.kestra.core.models.conditions.types.ExecutionStatusCondition",
" - type: io.kestra.core.models.conditions.types.ExecutionStatusCondition",
" in:",
" - SUCCESS",
" notIn: ",

14
core/src/main/java/org/kestra/core/models/conditions/types/FlowCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/FlowCondition.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
@@ -6,10 +6,10 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import javax.validation.constraints.NotNull;
@@ -27,8 +27,8 @@ import javax.validation.constraints.NotNull;
full = true,
code = {
"- conditions:",
" - type: org.kestra.core.models.conditions.types.FlowCondition",
" namespace: org.kestra.tests",
" - type: io.kestra.core.models.conditions.types.FlowCondition",
" namespace: io.kestra.tests",
" flowId: my-current-flow"
}
)

14
core/src/main/java/org/kestra/core/models/conditions/types/FlowNamespaceCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/FlowNamespaceCondition.java
View File

@@ -1,12 +1,12 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@@ -25,8 +25,8 @@ import javax.validation.constraints.NotNull;
full = true,
code = {
"- conditions:",
" - type: org.kestra.core.models.conditions.types.FlowNamespaceCondition",
" namespace: org.kestra.tests",
" - type: io.kestra.core.models.conditions.types.FlowNamespaceCondition",
" namespace: io.kestra.tests",
" prefix: true",
}

36
core/src/main/java/org/kestra/core/models/conditions/types/MultipleCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/MultipleCondition.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
@@ -6,16 +6,16 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.annotations.PluginProperty;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
import org.kestra.core.models.executions.Execution;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.models.triggers.multipleflows.MultipleConditionStorageInterface;
import org.kestra.core.models.triggers.multipleflows.MultipleConditionWindow;
import org.kestra.core.services.FlowService;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.annotations.PluginProperty;
import io.kestra.core.models.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import io.kestra.core.models.executions.Execution;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.models.triggers.multipleflows.MultipleConditionStorageInterface;
import io.kestra.core.models.triggers.multipleflows.MultipleConditionWindow;
import io.kestra.core.services.FlowService;
import org.slf4j.Logger;
import java.time.Duration;
@@ -47,24 +47,24 @@ import javax.validation.constraints.Pattern;
code = {
"triggers:" +
" - id: multiple-listen-flow" +
" type: org.kestra.core.models.triggers.types.Flow" +
" type: io.kestra.core.models.triggers.types.Flow" +
" conditions:" +
" - id: multiple" +
" type: org.kestra.core.models.conditions.types.MultipleCondition" +
" type: io.kestra.core.models.conditions.types.MultipleCondition" +
" window: P1D" +
" windowAdvance: P0D" +
" conditions:" +
" success:" +
" type: org.kestra.core.models.conditions.types.ExecutionStatusCondition" +
" type: io.kestra.core.models.conditions.types.ExecutionStatusCondition" +
" in:" +
" - SUCCESS" +
" flow-a:" +
" type: org.kestra.core.models.conditions.types.ExecutionFlowCondition" +
" namespace: org.kestra.tests" +
" type: io.kestra.core.models.conditions.types.ExecutionFlowCondition" +
" namespace: io.kestra.tests" +
" flowId: trigger-multiplecondition-flow-a" +
" flow-b:" +
" type: org.kestra.core.models.conditions.types.ExecutionFlowCondition" +
" namespace: org.kestra.tests" +
" type: io.kestra.core.models.conditions.types.ExecutionFlowCondition" +
" namespace: io.kestra.tests" +
" flowId: trigger-multiplecondition-flow-b"
}
)

14
core/src/main/java/org/kestra/core/models/conditions/types/VariableCondition.java → core/src/main/java/io/kestra/core/models/conditions/types/VariableCondition.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.conditions.types;
package io.kestra.core.models.conditions.types;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
@@ -6,11 +6,11 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.kestra.core.exceptions.IllegalVariableEvaluationException;
import org.kestra.core.models.annotations.Example;
import org.kestra.core.models.annotations.Plugin;
import org.kestra.core.models.conditions.Condition;
import org.kestra.core.models.conditions.ConditionContext;
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.conditions.Condition;
import io.kestra.core.models.conditions.ConditionContext;
import org.slf4j.Logger;
import javax.validation.constraints.NotNull;
@@ -31,7 +31,7 @@ import javax.validation.constraints.NotNull;
full = true,
code = {
"- conditions:",
" - type: org.kestra.core.models.conditions.types.VariableCondition",
" - type: io.kestra.core.models.conditions.types.VariableCondition",
" expression: {{ and unknown }}",
}
)

8
core/src/main/java/org/kestra/core/models/executions/AbstractMetricEntry.java → core/src/main/java/io/kestra/core/models/executions/AbstractMetricEntry.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -6,9 +6,9 @@ import com.google.common.collect.ImmutableMap;
import io.micronaut.core.annotation.Introspected;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.kestra.core.metrics.MetricRegistry;
import org.kestra.core.models.executions.metrics.Counter;
import org.kestra.core.models.executions.metrics.Timer;
import io.kestra.core.metrics.MetricRegistry;
import io.kestra.core.models.executions.metrics.Counter;
import io.kestra.core.models.executions.metrics.Timer;
import javax.validation.constraints.NotNull;
import java.util.Map;

24
core/src/main/java/org/kestra/core/models/executions/Execution.java → core/src/main/java/io/kestra/core/models/executions/Execution.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.classic.spi.LoggingEvent;
@@ -10,14 +10,14 @@ import lombok.Builder;
import lombok.Value;
import lombok.With;
import lombok.extern.slf4j.Slf4j;
import org.kestra.core.exceptions.InternalException;
import org.kestra.core.models.DeletedInterface;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.models.flows.State;
import org.kestra.core.models.tasks.ResolvedTask;
import org.kestra.core.runners.FlowableUtils;
import org.kestra.core.runners.RunContextLogger;
import org.kestra.core.utils.MapUtils;
import io.kestra.core.exceptions.InternalException;
import io.kestra.core.models.DeletedInterface;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.models.flows.State;
import io.kestra.core.models.tasks.ResolvedTask;
import io.kestra.core.runners.FlowableUtils;
import io.kestra.core.runners.RunContextLogger;
import io.kestra.core.utils.MapUtils;
import java.time.Instant;
import java.util.*;
@@ -405,13 +405,13 @@ public class Execution implements DeletedInterface {
}
/**
* Convert an exception on {@link org.kestra.core.runners.AbstractExecutor} and add log to the current
* Convert an exception on {@link io.kestra.core.runners.AbstractExecutor} and add log to the current
* {@code RUNNING} taskRun, on the lastAttempts.
* If no Attempt is found, we create one (must be nominal case).
* The executor will catch the {@code FAILED} taskRun emitted and will failed the execution.
* In the worst case, we FAILED the execution (only from {@link org.kestra.core.models.triggers.types.Flow}).
* In the worst case, we FAILED the execution (only from {@link io.kestra.core.models.triggers.types.Flow}).
*
* @param e the exception throw from {@link org.kestra.core.runners.AbstractExecutor}
* @param e the exception throw from {@link io.kestra.core.runners.AbstractExecutor}
* @return a new execution with taskrun failed if possible or execution failed is other case
*/
public FailedExecutionWithLog failedExecutionFromExecutor(Exception e) {

2
core/src/main/java/org/kestra/core/models/executions/ExecutionKilled.java → core/src/main/java/io/kestra/core/models/executions/ExecutionKilled.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import lombok.Builder;
import lombok.EqualsAndHashCode;

6
core/src/main/java/org/kestra/core/models/executions/ExecutionTrigger.java → core/src/main/java/io/kestra/core/models/executions/ExecutionTrigger.java
View File

@@ -1,10 +1,10 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import io.micronaut.core.annotation.Introspected;
import lombok.Builder;
import lombok.Value;
import org.kestra.core.models.tasks.Output;
import org.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.tasks.Output;
import io.kestra.core.models.triggers.AbstractTrigger;
import java.util.Map;
import javax.validation.constraints.NotNull;

8
core/src/main/java/org/kestra/core/models/executions/LogEntry.java → core/src/main/java/io/kestra/core/models/executions/LogEntry.java
View File

@@ -1,10 +1,10 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import lombok.Builder;
import lombok.Value;
import org.kestra.core.models.DeletedInterface;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.DeletedInterface;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.models.triggers.AbstractTrigger;
import org.slf4j.event.Level;
import java.time.Instant;

4
core/src/main/java/org/kestra/core/models/executions/NextTaskRun.java → core/src/main/java/io/kestra/core/models/executions/NextTaskRun.java
View File

@@ -1,8 +1,8 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import lombok.AllArgsConstructor;
import lombok.Value;
import org.kestra.core.models.tasks.Task;
import io.kestra.core.models.tasks.Task;
import javax.validation.constraints.NotNull;

8
core/src/main/java/org/kestra/core/models/executions/TaskRun.java → core/src/main/java/io/kestra/core/models/executions/TaskRun.java
View File

@@ -1,11 +1,11 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import lombok.Builder;
import lombok.Value;
import lombok.With;
import org.kestra.core.models.flows.State;
import org.kestra.core.models.tasks.ResolvedTask;
import org.kestra.core.utils.IdUtils;
import io.kestra.core.models.flows.State;
import io.kestra.core.models.tasks.ResolvedTask;
import io.kestra.core.utils.IdUtils;
import java.util.List;
import java.util.Map;

4
core/src/main/java/org/kestra/core/models/executions/TaskRunAttempt.java → core/src/main/java/io/kestra/core/models/executions/TaskRunAttempt.java
View File

@@ -1,9 +1,9 @@
package org.kestra.core.models.executions;
package io.kestra.core.models.executions;
import lombok.Builder;
import lombok.Value;
import lombok.With;
import org.kestra.core.models.flows.State;
import io.kestra.core.models.flows.State;
import java.util.List;
import java.util.Optional;

6
core/src/main/java/org/kestra/core/models/executions/metrics/Counter.java → core/src/main/java/io/kestra/core/models/executions/metrics/Counter.java
View File

@@ -1,11 +1,11 @@
package org.kestra.core.models.executions.metrics;
package io.kestra.core.models.executions.metrics;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.kestra.core.metrics.MetricRegistry;
import org.kestra.core.models.executions.AbstractMetricEntry;
import io.kestra.core.metrics.MetricRegistry;
import io.kestra.core.models.executions.AbstractMetricEntry;
import javax.validation.constraints.NotNull;
import java.util.Map;

2
core/src/main/java/org/kestra/core/models/executions/metrics/Stats.java → core/src/main/java/io/kestra/core/models/executions/metrics/Stats.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.executions.metrics;
package io.kestra.core.models.executions.metrics;
import lombok.Builder;
import lombok.Value;

6
core/src/main/java/org/kestra/core/models/executions/metrics/Timer.java → core/src/main/java/io/kestra/core/models/executions/metrics/Timer.java
View File

@@ -1,11 +1,11 @@
package org.kestra.core.models.executions.metrics;
package io.kestra.core.models.executions.metrics;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.kestra.core.metrics.MetricRegistry;
import org.kestra.core.models.executions.AbstractMetricEntry;
import io.kestra.core.metrics.MetricRegistry;
import io.kestra.core.models.executions.AbstractMetricEntry;
import javax.validation.constraints.NotNull;
import java.util.Map;

4
core/src/main/java/org/kestra/core/models/executions/statistics/DailyExecutionStatistics.java → core/src/main/java/io/kestra/core/models/executions/statistics/DailyExecutionStatistics.java
View File

@@ -1,9 +1,9 @@
package org.kestra.core.models.executions.statistics;
package io.kestra.core.models.executions.statistics;
import lombok.Builder;
import lombok.Data;
import lombok.Value;
import org.kestra.core.models.flows.State;
import io.kestra.core.models.flows.State;
import java.time.LocalDate;
import java.util.HashMap;

22
core/src/main/java/org/kestra/core/models/flows/Flow.java → core/src/main/java/io/kestra/core/models/flows/Flow.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.flows;
package io.kestra.core.models.flows;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -9,16 +9,16 @@ import io.micronaut.core.annotation.Introspected;
import lombok.Builder;
import lombok.Value;
import lombok.With;
import org.kestra.core.exceptions.InternalException;
import org.kestra.core.models.DeletedInterface;
import org.kestra.core.models.executions.Execution;
import org.kestra.core.models.listeners.Listener;
import org.kestra.core.models.tasks.FlowableTask;
import org.kestra.core.models.tasks.Task;
import org.kestra.core.models.tasks.TaskValidationInterface;
import org.kestra.core.models.triggers.AbstractTrigger;
import org.kestra.core.models.validations.ManualConstraintViolation;
import org.kestra.core.serializers.JacksonMapper;
import io.kestra.core.exceptions.InternalException;
import io.kestra.core.models.DeletedInterface;
import io.kestra.core.models.executions.Execution;
import io.kestra.core.models.listeners.Listener;
import io.kestra.core.models.tasks.FlowableTask;
import io.kestra.core.models.tasks.Task;
import io.kestra.core.models.tasks.TaskValidationInterface;
import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.validations.ManualConstraintViolation;
import io.kestra.core.serializers.JacksonMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/src/main/java/org/kestra/core/models/flows/Input.java → core/src/main/java/io/kestra/core/models/flows/Input.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.flows;
package io.kestra.core.models.flows;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.micronaut.core.annotation.Introspected;

2
core/src/main/java/org/kestra/core/models/flows/State.java → core/src/main/java/io/kestra/core/models/flows/State.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.flows;
package io.kestra.core.models.flows;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;

2
core/src/main/java/org/kestra/core/models/flows/TaskDefault.java → core/src/main/java/io/kestra/core/models/flows/TaskDefault.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.flows;
package io.kestra.core.models.flows;
import io.micronaut.core.convert.format.MapFormat;
import io.micronaut.core.naming.conventions.StringConvention;

8
core/src/main/java/org/kestra/core/models/hierarchies/AbstractGraphTask.java → core/src/main/java/io/kestra/core/models/hierarchies/AbstractGraphTask.java
View File

@@ -1,12 +1,12 @@
package org.kestra.core.models.hierarchies;
package io.kestra.core.models.hierarchies;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.micronaut.core.annotation.Introspected;
import lombok.Getter;
import lombok.ToString;
import org.kestra.core.models.executions.TaskRun;
import org.kestra.core.models.tasks.Task;
import org.kestra.core.utils.IdUtils;
import io.kestra.core.models.executions.TaskRun;
import io.kestra.core.models.tasks.Task;
import io.kestra.core.utils.IdUtils;
import java.util.ArrayList;
import java.util.List;

10
core/src/main/java/org/kestra/core/models/hierarchies/FlowGraph.java → core/src/main/java/io/kestra/core/models/hierarchies/FlowGraph.java
View File

@@ -1,14 +1,14 @@
package org.kestra.core.models.hierarchies;
package io.kestra.core.models.hierarchies;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.Value;
import org.apache.commons.lang3.tuple.Pair;
import org.kestra.core.exceptions.IllegalVariableEvaluationException;
import org.kestra.core.models.executions.Execution;
import org.kestra.core.models.flows.Flow;
import org.kestra.core.services.GraphService;
import io.kestra.core.exceptions.IllegalVariableEvaluationException;
import io.kestra.core.models.executions.Execution;
import io.kestra.core.models.flows.Flow;
import io.kestra.core.services.GraphService;
import java.util.ArrayList;
import java.util.List;

2
core/src/main/java/org/kestra/core/models/hierarchies/Graph.java → core/src/main/java/io/kestra/core/models/hierarchies/Graph.java
View File

@@ -1,4 +1,4 @@
package org.kestra.core.models.hierarchies;
package io.kestra.core.models.hierarchies;
import com.google.common.graph.MutableValueGraph;
import com.google.common.graph.ValueGraphBuilder;

6
core/src/main/java/org/kestra/core/models/hierarchies/GraphCluster.java → core/src/main/java/io/kestra/core/models/hierarchies/GraphCluster.java
View File

@@ -1,9 +1,9 @@
package org.kestra.core.models.hierarchies;
package io.kestra.core.models.hierarchies;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
import org.kestra.core.models.executions.TaskRun;
import org.kestra.core.models.tasks.Task;
import io.kestra.core.models.executions.TaskRun;
import io.kestra.core.models.tasks.Task;
import java.util.List;

Some files were not shown because too many files have changed in this diff Show More