From 5d6f7f4072fcecc968b5731227a08de7bc56da46 Mon Sep 17 00:00:00 2001 From: tchiotludo Date: Sun, 21 Mar 2021 21:17:18 +0100 Subject: [PATCH] chore(core): move from org.kestra to io.kestra --- .github/workflows/main.yml | 38 ++++++-- README.md | 2 +- build.gradle | 96 ++++++++----------- gradle.properties | 4 +- settings.gradle | 2 +- .../plugin}/serdes/avro/AvroConverter.java | 4 +- .../serdes/avro/AvroSchemaValidation.java | 2 +- .../plugin}/serdes/avro/AvroWriter.java | 16 ++-- .../serdes/avro/DateFormatValidation.java | 2 +- .../plugin}/serdes/avro/ValidatorFactory.java | 2 +- .../kestra/plugin}/serdes/csv/CsvReader.java | 16 ++-- .../kestra/plugin}/serdes/csv/CsvWriter.java | 16 ++-- .../plugin}/serdes/json/JsonReader.java | 16 ++-- .../plugin}/serdes/json/JsonWriter.java | 18 ++-- .../kestra/plugin}/serdes/xml/XmlReader.java | 18 ++-- .../kestra/plugin}/serdes/xml/XmlWriter.java | 20 ++-- ...o.svg => io.kestra.plugin.serdes.avro.svg} | 0 ...sv.svg => io.kestra.plugin.serdes.csv.svg} | 0 ...n.svg => io.kestra.plugin.serdes.json.svg} | 0 ...ml.svg => io.kestra.plugin.serdes.xml.svg} | 0 .../kestra/plugin}/serdes/SerdesUtils.java | 4 +- .../serdes/avro/AvroConverterTest.java | 14 +-- .../plugin}/serdes/avro/AvroWriterTest.java | 8 +- .../serdes/avro/ValidationFactoryTest.java | 4 +- .../avro/converter/ComplexArrayTest.java | 4 +- .../avro/converter/ComplexEnumTest.java | 4 +- .../avro/converter/ComplexFixedTest.java | 4 +- .../serdes/avro/converter/ComplexMapTest.java | 4 +- .../avro/converter/ComplexUnionTest.java | 4 +- .../avro/converter/LogicalDateTest.java | 6 +- .../avro/converter/LogicalDateTimeTest.java | 6 +- .../avro/converter/LogicalDecimalTest.java | 6 +- .../avro/converter/LogicalTimeTest.java | 4 +- .../avro/converter/LogicalUuidTest.java | 4 +- .../avro/converter/PrimitiveBoolTest.java | 4 +- .../avro/converter/PrimitiveDoubleTest.java | 6 +- .../avro/converter/PrimitiveFloatTest.java | 6 +- .../avro/converter/PrimitiveIntTest.java | 4 +- .../avro/converter/PrimitiveLongTest.java | 4 +- .../avro/converter/PrimitiveNullTest.java | 4 +- .../converter/PrimitiveStringBytesTest.java | 4 +- .../serdes/csv/CsvReaderWriterTest.java | 14 +-- .../plugin}/serdes/csv/CsvWriterTest.java | 16 ++-- .../serdes/json/JsonReaderWriterTest.java | 12 +-- .../serdes/xml/XmlReaderWriterTest.java | 12 +-- src/test/resources/csv/full.avsc | 2 +- src/test/resources/csv/nested.avsc | 4 +- src/test/resources/logback.xml | 4 +- 48 files changed, 225 insertions(+), 219 deletions(-) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/AvroConverter.java (99%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/AvroSchemaValidation.java (85%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/AvroWriter.java (95%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/DateFormatValidation.java (88%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/ValidatorFactory.java (97%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/csv/CsvReader.java (92%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/csv/CsvWriter.java (92%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/json/JsonReader.java (89%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/json/JsonWriter.java (87%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/xml/XmlReader.java (87%) rename src/main/java/{org/kestra/task => io/kestra/plugin}/serdes/xml/XmlWriter.java (86%) rename src/main/resources/icons/{org.kestra.task.serdes.avro.svg => io.kestra.plugin.serdes.avro.svg} (100%) rename src/main/resources/icons/{org.kestra.task.serdes.csv.svg => io.kestra.plugin.serdes.csv.svg} (100%) rename src/main/resources/icons/{org.kestra.task.serdes.json.svg => io.kestra.plugin.serdes.json.svg} (100%) rename src/main/resources/icons/{org.kestra.task.serdes.xml.svg => io.kestra.plugin.serdes.xml.svg} (100%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/SerdesUtils.java (93%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/AvroConverterTest.java (98%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/AvroWriterTest.java (94%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/ValidationFactoryTest.java (96%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/ComplexArrayTest.java (93%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/ComplexEnumTest.java (93%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/ComplexFixedTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/ComplexMapTest.java (93%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/ComplexUnionTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/LogicalDateTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/LogicalDateTimeTest.java (96%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/LogicalDecimalTest.java (93%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/LogicalTimeTest.java (94%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/LogicalUuidTest.java (91%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveBoolTest.java (90%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveDoubleTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveFloatTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveIntTest.java (91%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveLongTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveNullTest.java (91%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/avro/converter/PrimitiveStringBytesTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/csv/CsvReaderWriterTest.java (90%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/csv/CsvWriterTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/json/JsonReaderWriterTest.java (92%) rename src/test/java/{org/kestra/task => io/kestra/plugin}/serdes/xml/XmlReaderWriterTest.java (91%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8dc9a6..0f644e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,8 @@ on: push: branches: - master + tags: + - v* pull_request: branches: @@ -36,15 +38,39 @@ jobs: # Gradle check - name: Build with Gradle - run: ./gradlew check --no-daemon + run: ./gradlew check - # Publish package - - name: Publish package + # Publish + - name: Publish package to Sonatype if: github.ref == 'refs/heads/master' 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 + + # 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 # Slack - name: Slack notification diff --git a/README.md b/README.md index 60746a7..fb6397b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ## Documentation * The official Kestra documentation can be found under: [kestra.io](https://kestra.io) -* This plugin documentation can be found [here](https://kestra.io/plugins/task-serdes/) +* This plugin documentation can be found [here](https://kestra.io/plugins/plugin-serdes/) ## License Apache 2.0 © [Nigh Tech](https://nigh.tech) diff --git a/build.gradle b/build.gradle index b4bc954..f45da05 100644 --- a/build.gradle +++ b/build.gradle @@ -3,25 +3,27 @@ plugins { id "idea" id "com.adarshr.test-logger" version "2.1.1" id "com.github.johnrengelman.shadow" version "6.1.0" - id "maven-publish" id 'ru.vyarus.java-lib' version '2.1.0' id 'ru.vyarus.github-info' version '1.2.0' - id "com.jfrog.bintray" version "1.8.5" + id 'signing' + id "io.github.gradle-nexus.publish-plugin" version "1.0.0" id "com.github.ben-manes.versions" version "0.36.0" id 'net.researchgate.release' version '2.8.1' } def isBuildSnapshot = version.toString().endsWith("-SNAPSHOT") -def publishVersion = isBuildSnapshot ? project.version.replaceAll(/-SNAPSHOT$/, "") : project.version; repositories { mavenCentral() jcenter() - maven { url "https://dl.bintray.com/kestra/maven" + (isBuildSnapshot ? "-snapshot" : "") } + if (isBuildSnapshot) { + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } + } } sourceCompatibility = 11 -group "org.kestra.task.serdes" +group "io.kestra.plugin" +description 'Serde plugin for Kestra' tasks.withType(JavaCompile) { options.encoding = "UTF-8" @@ -42,7 +44,7 @@ dependencies { compileOnly "io.micronaut:micronaut-validation" // kestra - compileOnly group: "org.kestra", name: "core", version: kestraVersion + compileOnly group: "io.kestra", name: "core", version: kestraVersion api 'de.siegmar:fastcsv:1.0.3' api 'org.apache.avro:avro:1.10.1' @@ -74,10 +76,10 @@ dependencies { testImplementation platform("io.micronaut:micronaut-bom:$micronautVersion") testImplementation "io.micronaut.test:micronaut-test-junit5" - testImplementation group: "org.kestra", name: "core", version: kestraVersion - testImplementation group: "org.kestra", name: "repository-memory", version: kestraVersion - testImplementation group: "org.kestra", name: "runner-memory", version: kestraVersion - testImplementation group: "org.kestra", name: "storage-local", version: kestraVersion + testImplementation group: "io.kestra", name: "core", version: kestraVersion + testImplementation group: "io.kestra", name: "repository-memory", version: kestraVersion + testImplementation group: "io.kestra", name: "runner-memory", version: kestraVersion + testImplementation group: "io.kestra", name: "storage-local", version: kestraVersion testImplementation "org.junit.jupiter:junit-jupiter-engine" testImplementation "org.hamcrest:hamcrest:2.2" @@ -91,16 +93,41 @@ dependencies { /**********************************************************************************************************************\ * Publish **********************************************************************************************************************/ +nexusPublishing { + repositoryDescription = "${project.group}:${rootProject.name}:${project.version}" + useStaging = !isBuildSnapshot + repositories { + sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + } + } +} + jar { manifest { attributes( "X-Kestra-Title": project.name, - "X-Kestra-Group": project.group, + "X-Kestra-Group": project.group + ".serdes", + "X-Kestra-Description": project.description, "X-Kestra-Version": project.version ) } } +pom { + developers { + developer { + id "tchiotludo" + name "Ludovic Dehon" + } + } +} + +signing { + sign publishing.publications.maven +} + shadowJar { archiveClassifier.set(null) mergeServiceFiles() @@ -111,53 +138,6 @@ github { license 'Apache' } -publishing { - publications { - BintrayMavenPublication(MavenPublication) { - version publishVersion - - groupId project.group - artifactId project.name - - artifact shadowJar - artifact sourcesJar - artifact javadocJar - - pom.withXml { - def dependenciesNode = asNode().getAt('dependencies')[0] ?: asNode().appendNode('dependencies') - - configurations.api.allDependencies.each { - if (it.name != 'unspecified') { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - } - } - } -} - -bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') - publications = ['BintrayMavenPublication'] - publish = true - override = isBuildSnapshot - pkg { - userOrg = 'kestra' - name = project.name - repo = isBuildSnapshot ? 'maven-snapshot' : 'maven' - publicDownloadNumbers = true - version { - name = publishVersion - released = new Date().format("yyyy-MM-dd'T'HH:mm:ss.SSSZ") - vcsTag = "v" + publishVersion - } - } -} - /**********************************************************************************************************************\ * Version **********************************************************************************************************************/ diff --git a/gradle.properties b/gradle.properties index 0ace1b4..01c7a70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.1.25-SNAPSHOT -kestraVersion=0.1.+ +version=0.2.0-SNAPSHOT +kestraVersion=0.2.+ micronautVersion=2.3.4 lombokVersion=1.18.18 diff --git a/settings.gradle b/settings.gradle index dc91128..1dabe28 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'task-serdes' +rootProject.name = 'plugin-serdes' diff --git a/src/main/java/org/kestra/task/serdes/avro/AvroConverter.java b/src/main/java/io/kestra/plugin/serdes/avro/AvroConverter.java similarity index 99% rename from src/main/java/org/kestra/task/serdes/avro/AvroConverter.java rename to src/main/java/io/kestra/plugin/serdes/avro/AvroConverter.java index 84bef37..ccac527 100644 --- a/src/main/java/org/kestra/task/serdes/avro/AvroConverter.java +++ b/src/main/java/io/kestra/plugin/serdes/avro/AvroConverter.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -11,7 +11,7 @@ import org.apache.avro.generic.GenericData; import org.apache.avro.util.Utf8; import org.apache.commons.lang3.StringUtils; -import org.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.annotations.PluginProperty; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/kestra/task/serdes/avro/AvroSchemaValidation.java b/src/main/java/io/kestra/plugin/serdes/avro/AvroSchemaValidation.java similarity index 85% rename from src/main/java/org/kestra/task/serdes/avro/AvroSchemaValidation.java rename to src/main/java/io/kestra/plugin/serdes/avro/AvroSchemaValidation.java index 3b77b8d..ac27fa6 100644 --- a/src/main/java/org/kestra/task/serdes/avro/AvroSchemaValidation.java +++ b/src/main/java/io/kestra/plugin/serdes/avro/AvroSchemaValidation.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import javax.validation.Constraint; import java.lang.annotation.*; diff --git a/src/main/java/org/kestra/task/serdes/avro/AvroWriter.java b/src/main/java/io/kestra/plugin/serdes/avro/AvroWriter.java similarity index 95% rename from src/main/java/org/kestra/task/serdes/avro/AvroWriter.java rename to src/main/java/io/kestra/plugin/serdes/avro/AvroWriter.java index a816cc9..cc56aac 100644 --- a/src/main/java/org/kestra/task/serdes/avro/AvroWriter.java +++ b/src/main/java/io/kestra/plugin/serdes/avro/AvroWriter.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; @@ -12,12 +12,12 @@ import org.apache.avro.generic.GenericDatumWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; import javax.validation.constraints.NotNull; import java.io.*; @@ -178,7 +178,7 @@ public Output run(RunContext runContext) throws Exception { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @io.swagger.v3.oas.annotations.media.Schema( title = "URI of a temporary result file" ) diff --git a/src/main/java/org/kestra/task/serdes/avro/DateFormatValidation.java b/src/main/java/io/kestra/plugin/serdes/avro/DateFormatValidation.java similarity index 88% rename from src/main/java/org/kestra/task/serdes/avro/DateFormatValidation.java rename to src/main/java/io/kestra/plugin/serdes/avro/DateFormatValidation.java index 99b34be..7ef66e0 100644 --- a/src/main/java/org/kestra/task/serdes/avro/DateFormatValidation.java +++ b/src/main/java/io/kestra/plugin/serdes/avro/DateFormatValidation.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/org/kestra/task/serdes/avro/ValidatorFactory.java b/src/main/java/io/kestra/plugin/serdes/avro/ValidatorFactory.java similarity index 97% rename from src/main/java/org/kestra/task/serdes/avro/ValidatorFactory.java rename to src/main/java/io/kestra/plugin/serdes/avro/ValidatorFactory.java index 0777796..a6e5911 100644 --- a/src/main/java/org/kestra/task/serdes/avro/ValidatorFactory.java +++ b/src/main/java/io/kestra/plugin/serdes/avro/ValidatorFactory.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import io.micronaut.context.annotation.Factory; import io.micronaut.validation.validator.constraints.ConstraintValidator; diff --git a/src/main/java/org/kestra/task/serdes/csv/CsvReader.java b/src/main/java/io/kestra/plugin/serdes/csv/CsvReader.java similarity index 92% rename from src/main/java/org/kestra/task/serdes/csv/CsvReader.java rename to src/main/java/io/kestra/plugin/serdes/csv/CsvReader.java index df7cb9d..1dd890e 100644 --- a/src/main/java/org/kestra/task/serdes/csv/CsvReader.java +++ b/src/main/java/io/kestra/plugin/serdes/csv/CsvReader.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.csv; +package io.kestra.plugin.serdes.csv; import de.siegmar.fastcsv.reader.CsvParser; import de.siegmar.fastcsv.reader.CsvRow; @@ -9,12 +9,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; import java.io.File; import java.io.FileOutputStream; @@ -134,7 +134,7 @@ public Output run(RunContext runContext) throws Exception { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @Schema( title = "URI of a temporary result file" ) diff --git a/src/main/java/org/kestra/task/serdes/csv/CsvWriter.java b/src/main/java/io/kestra/plugin/serdes/csv/CsvWriter.java similarity index 92% rename from src/main/java/org/kestra/task/serdes/csv/CsvWriter.java rename to src/main/java/io/kestra/plugin/serdes/csv/CsvWriter.java index 3bf3353..3e60a81 100644 --- a/src/main/java/org/kestra/task/serdes/csv/CsvWriter.java +++ b/src/main/java/io/kestra/plugin/serdes/csv/CsvWriter.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.csv; +package io.kestra.plugin.serdes.csv; import de.siegmar.fastcsv.writer.CsvAppender; import io.reactivex.BackpressureStrategy; @@ -9,12 +9,12 @@ import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.ArrayUtils; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; import java.io.BufferedReader; import java.io.File; @@ -151,7 +151,7 @@ public void accept(Object row) throws Exception { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @Schema( title = "URI of a temporary result file" ) diff --git a/src/main/java/org/kestra/task/serdes/json/JsonReader.java b/src/main/java/io/kestra/plugin/serdes/json/JsonReader.java similarity index 89% rename from src/main/java/org/kestra/task/serdes/json/JsonReader.java rename to src/main/java/io/kestra/plugin/serdes/json/JsonReader.java index 26843ef..f852a36 100644 --- a/src/main/java/org/kestra/task/serdes/json/JsonReader.java +++ b/src/main/java/io/kestra/plugin/serdes/json/JsonReader.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.json; +package io.kestra.plugin.serdes.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.reactivex.BackpressureStrategy; @@ -8,12 +8,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; import java.io.*; import java.net.URI; @@ -84,7 +84,7 @@ public Output run(RunContext runContext) throws Exception { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @Schema( title = "URI of a temporary result file" ) diff --git a/src/main/java/org/kestra/task/serdes/json/JsonWriter.java b/src/main/java/io/kestra/plugin/serdes/json/JsonWriter.java similarity index 87% rename from src/main/java/org/kestra/task/serdes/json/JsonWriter.java rename to src/main/java/io/kestra/plugin/serdes/json/JsonWriter.java index 52f5fa6..3189ae0 100644 --- a/src/main/java/org/kestra/task/serdes/json/JsonWriter.java +++ b/src/main/java/io/kestra/plugin/serdes/json/JsonWriter.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.json; +package io.kestra.plugin.serdes.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.reactivex.BackpressureStrategy; @@ -7,12 +7,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; import java.io.*; import java.net.URI; @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.validation.constraints.NotNull; -import static org.kestra.core.utils.Rethrow.throwConsumer; +import static io.kestra.core.utils.Rethrow.throwConsumer; @SuperBuilder @ToString @@ -104,7 +104,7 @@ public Output run(RunContext runContext) throws Exception { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @Schema( title = "URI of a temporary result file" ) diff --git a/src/main/java/org/kestra/task/serdes/xml/XmlReader.java b/src/main/java/io/kestra/plugin/serdes/xml/XmlReader.java similarity index 87% rename from src/main/java/org/kestra/task/serdes/xml/XmlReader.java rename to src/main/java/io/kestra/plugin/serdes/xml/XmlReader.java index f34d1ba..1cd20ee 100644 --- a/src/main/java/org/kestra/task/serdes/xml/XmlReader.java +++ b/src/main/java/io/kestra/plugin/serdes/xml/XmlReader.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.xml; +package io.kestra.plugin.serdes.xml; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -6,12 +6,12 @@ import org.json.JSONArray; import org.json.JSONObject; import org.json.XML; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; import java.io.*; import java.net.URI; @@ -20,7 +20,7 @@ import java.util.Map; import javax.validation.constraints.NotNull; -import static org.kestra.core.utils.Rethrow.throwConsumer; +import static io.kestra.core.utils.Rethrow.throwConsumer; @SuperBuilder @ToString @@ -109,7 +109,7 @@ private Object result(JSONObject jsonObject) { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @Schema( title = "URI of a temporary result file" ) diff --git a/src/main/java/org/kestra/task/serdes/xml/XmlWriter.java b/src/main/java/io/kestra/plugin/serdes/xml/XmlWriter.java similarity index 86% rename from src/main/java/org/kestra/task/serdes/xml/XmlWriter.java rename to src/main/java/io/kestra/plugin/serdes/xml/XmlWriter.java index e64dedd..555e7a1 100644 --- a/src/main/java/org/kestra/task/serdes/xml/XmlWriter.java +++ b/src/main/java/io/kestra/plugin/serdes/xml/XmlWriter.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.xml; +package io.kestra.plugin.serdes.xml; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; @@ -15,13 +15,13 @@ import org.json.JSONArray; import org.json.JSONObject; import org.json.XML; -import org.kestra.core.models.annotations.PluginProperty; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.models.tasks.RunnableTask; -import org.kestra.core.models.tasks.Task; -import org.kestra.core.runners.RunContext; -import org.kestra.core.serializers.FileSerde; -import org.kestra.task.serdes.json.JsonWriter; +import io.kestra.core.models.annotations.PluginProperty; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.models.tasks.RunnableTask; +import io.kestra.core.models.tasks.Task; +import io.kestra.core.runners.RunContext; +import io.kestra.core.serializers.FileSerde; +import io.kestra.plugin.serdes.json.JsonWriter; import java.io.*; import java.net.URI; @@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.validation.constraints.NotNull; -import static org.kestra.core.utils.Rethrow.throwConsumer; +import static io.kestra.core.utils.Rethrow.throwConsumer; @SuperBuilder @ToString @@ -104,7 +104,7 @@ public XmlWriter.Output run(RunContext runContext) throws Exception { @Builder @Getter - public static class Output implements org.kestra.core.models.tasks.Output { + public static class Output implements io.kestra.core.models.tasks.Output { @Schema( title = "URI of a temporary result file" ) diff --git a/src/main/resources/icons/org.kestra.task.serdes.avro.svg b/src/main/resources/icons/io.kestra.plugin.serdes.avro.svg similarity index 100% rename from src/main/resources/icons/org.kestra.task.serdes.avro.svg rename to src/main/resources/icons/io.kestra.plugin.serdes.avro.svg diff --git a/src/main/resources/icons/org.kestra.task.serdes.csv.svg b/src/main/resources/icons/io.kestra.plugin.serdes.csv.svg similarity index 100% rename from src/main/resources/icons/org.kestra.task.serdes.csv.svg rename to src/main/resources/icons/io.kestra.plugin.serdes.csv.svg diff --git a/src/main/resources/icons/org.kestra.task.serdes.json.svg b/src/main/resources/icons/io.kestra.plugin.serdes.json.svg similarity index 100% rename from src/main/resources/icons/org.kestra.task.serdes.json.svg rename to src/main/resources/icons/io.kestra.plugin.serdes.json.svg diff --git a/src/main/resources/icons/org.kestra.task.serdes.xml.svg b/src/main/resources/icons/io.kestra.plugin.serdes.xml.svg similarity index 100% rename from src/main/resources/icons/org.kestra.task.serdes.xml.svg rename to src/main/resources/icons/io.kestra.plugin.serdes.xml.svg diff --git a/src/test/java/org/kestra/task/serdes/SerdesUtils.java b/src/test/java/io/kestra/plugin/serdes/SerdesUtils.java similarity index 93% rename from src/test/java/org/kestra/task/serdes/SerdesUtils.java rename to src/test/java/io/kestra/plugin/serdes/SerdesUtils.java index 42e626a..86ee273 100644 --- a/src/test/java/org/kestra/task/serdes/SerdesUtils.java +++ b/src/test/java/io/kestra/plugin/serdes/SerdesUtils.java @@ -1,9 +1,9 @@ -package org.kestra.task.serdes; +package io.kestra.plugin.serdes; import com.devskiller.friendly_id.FriendlyId; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.kestra.core.storages.StorageInterface; +import io.kestra.core.storages.StorageInterface; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/org/kestra/task/serdes/avro/AvroConverterTest.java b/src/test/java/io/kestra/plugin/serdes/avro/AvroConverterTest.java similarity index 98% rename from src/test/java/org/kestra/task/serdes/avro/AvroConverterTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/AvroConverterTest.java index 338f2d5..d496634 100644 --- a/src/test/java/org/kestra/task/serdes/avro/AvroConverterTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/AvroConverterTest.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import com.google.common.collect.ImmutableMap; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; @@ -12,12 +12,12 @@ import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.*; import org.junit.jupiter.api.Test; -import org.kestra.core.runners.RunContextFactory; -import org.kestra.core.storages.StorageInterface; -import org.kestra.core.utils.TestsUtils; -import org.kestra.task.serdes.SerdesUtils; -import org.kestra.task.serdes.csv.CsvReader; -import org.kestra.task.serdes.json.JsonReader; +import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.storages.StorageInterface; +import io.kestra.core.utils.TestsUtils; +import io.kestra.plugin.serdes.SerdesUtils; +import io.kestra.plugin.serdes.csv.CsvReader; +import io.kestra.plugin.serdes.json.JsonReader; import javax.inject.Inject; import java.io.*; diff --git a/src/test/java/org/kestra/task/serdes/avro/AvroWriterTest.java b/src/test/java/io/kestra/plugin/serdes/avro/AvroWriterTest.java similarity index 94% rename from src/test/java/org/kestra/task/serdes/avro/AvroWriterTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/AvroWriterTest.java index 7e50b21..b9fb7cb 100644 --- a/src/test/java/org/kestra/task/serdes/avro/AvroWriterTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/AvroWriterTest.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import com.devskiller.friendly_id.FriendlyId; import com.google.common.base.Charsets; @@ -10,9 +10,9 @@ import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumReader; import org.junit.jupiter.api.Test; -import org.kestra.core.runners.RunContextFactory; -import org.kestra.core.storages.StorageInterface; -import org.kestra.core.utils.TestsUtils; +import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.storages.StorageInterface; +import io.kestra.core.utils.TestsUtils; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/org/kestra/task/serdes/avro/ValidationFactoryTest.java b/src/test/java/io/kestra/plugin/serdes/avro/ValidationFactoryTest.java similarity index 96% rename from src/test/java/org/kestra/task/serdes/avro/ValidationFactoryTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/ValidationFactoryTest.java index 7e13f6c..8748238 100644 --- a/src/test/java/org/kestra/task/serdes/avro/ValidationFactoryTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/ValidationFactoryTest.java @@ -1,9 +1,9 @@ -package org.kestra.task.serdes.avro; +package io.kestra.plugin.serdes.avro; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; -import org.kestra.core.models.validations.ModelValidator; +import io.kestra.core.models.validations.ModelValidator; import java.nio.charset.StandardCharsets; import java.util.Objects; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexArrayTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexArrayTest.java similarity index 93% rename from src/test/java/org/kestra/task/serdes/avro/converter/ComplexArrayTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexArrayTest.java index 031ad65..5754ec9 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexArrayTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexArrayTest.java @@ -1,8 +1,8 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; import org.apache.avro.SchemaBuilder; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexEnumTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexEnumTest.java similarity index 93% rename from src/test/java/org/kestra/task/serdes/avro/converter/ComplexEnumTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexEnumTest.java index 3e8f0b5..d87bf79 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexEnumTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexEnumTest.java @@ -1,9 +1,9 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; import org.apache.avro.SchemaBuilder; import org.apache.avro.generic.GenericData; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexFixedTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexFixedTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/ComplexFixedTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexFixedTest.java index 608ac8c..4a43816 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexFixedTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexFixedTest.java @@ -1,9 +1,9 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; import org.apache.avro.SchemaBuilder; import org.apache.avro.generic.GenericData; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexMapTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexMapTest.java similarity index 93% rename from src/test/java/org/kestra/task/serdes/avro/converter/ComplexMapTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexMapTest.java index dddc618..dcf0f50 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexMapTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexMapTest.java @@ -1,10 +1,10 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import com.google.common.collect.ImmutableMap; import org.apache.avro.Schema; import org.apache.avro.SchemaBuilder; import org.apache.avro.util.Utf8; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexUnionTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexUnionTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/ComplexUnionTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexUnionTest.java index 7333fe0..2933be6 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/ComplexUnionTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/ComplexUnionTest.java @@ -1,11 +1,11 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; import org.apache.avro.util.Utf8; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalDateTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDateTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/LogicalDateTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDateTest.java index df6827f..3676278 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalDateTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDateTest.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; @@ -7,8 +7,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.kestra.task.serdes.avro.AvroConverter; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverter; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalDateTimeTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDateTimeTest.java similarity index 96% rename from src/test/java/org/kestra/task/serdes/avro/converter/LogicalDateTimeTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDateTimeTest.java index 2c11d5c..8981d96 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalDateTimeTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDateTimeTest.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; @@ -6,8 +6,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.kestra.task.serdes.avro.AvroConverter; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverter; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import java.time.Instant; import java.time.LocalDateTime; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalDecimalTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDecimalTest.java similarity index 93% rename from src/test/java/org/kestra/task/serdes/avro/converter/LogicalDecimalTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDecimalTest.java index 5ec2946..38664b2 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalDecimalTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalDecimalTest.java @@ -1,9 +1,9 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverter; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverter; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalTimeTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalTimeTest.java similarity index 94% rename from src/test/java/org/kestra/task/serdes/avro/converter/LogicalTimeTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalTimeTest.java index 2cc948c..5049d5c 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalTimeTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalTimeTest.java @@ -1,8 +1,8 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalUuidTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalUuidTest.java similarity index 91% rename from src/test/java/org/kestra/task/serdes/avro/converter/LogicalUuidTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalUuidTest.java index 61e9a39..bd50154 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/LogicalUuidTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/LogicalUuidTest.java @@ -1,8 +1,8 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveBoolTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveBoolTest.java similarity index 90% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveBoolTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveBoolTest.java index 3fac5ba..9a31049 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveBoolTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveBoolTest.java @@ -1,7 +1,7 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveDoubleTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveDoubleTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveDoubleTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveDoubleTest.java index 936f341..7b1538f 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveDoubleTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveDoubleTest.java @@ -1,11 +1,11 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.kestra.task.serdes.avro.AvroConverter; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverter; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import java.util.stream.Stream; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveFloatTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveFloatTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveFloatTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveFloatTest.java index 05e64d5..0db82c4 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveFloatTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveFloatTest.java @@ -1,8 +1,8 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverter; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverter; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveIntTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveIntTest.java similarity index 91% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveIntTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveIntTest.java index 6ef091b..69175df 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveIntTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveIntTest.java @@ -1,7 +1,7 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveLongTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveLongTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveLongTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveLongTest.java index 9fe9245..a966250 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveLongTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveLongTest.java @@ -1,7 +1,7 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveNullTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveNullTest.java similarity index 91% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveNullTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveNullTest.java index 6f0484b..84fd7ad 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveNullTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveNullTest.java @@ -1,7 +1,7 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveStringBytesTest.java b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveStringBytesTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveStringBytesTest.java rename to src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveStringBytesTest.java index 042a339..c26452e 100644 --- a/src/test/java/org/kestra/task/serdes/avro/converter/PrimitiveStringBytesTest.java +++ b/src/test/java/io/kestra/plugin/serdes/avro/converter/PrimitiveStringBytesTest.java @@ -1,8 +1,8 @@ -package org.kestra.task.serdes.avro.converter; +package io.kestra.plugin.serdes.avro.converter; import org.apache.avro.Schema; import org.apache.avro.util.Utf8; -import org.kestra.task.serdes.avro.AvroConverterTest; +import io.kestra.plugin.serdes.avro.AvroConverterTest; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/kestra/task/serdes/csv/CsvReaderWriterTest.java b/src/test/java/io/kestra/plugin/serdes/csv/CsvReaderWriterTest.java similarity index 90% rename from src/test/java/org/kestra/task/serdes/csv/CsvReaderWriterTest.java rename to src/test/java/io/kestra/plugin/serdes/csv/CsvReaderWriterTest.java index 614abc6..7c2ebce 100644 --- a/src/test/java/org/kestra/task/serdes/csv/CsvReaderWriterTest.java +++ b/src/test/java/io/kestra/plugin/serdes/csv/CsvReaderWriterTest.java @@ -1,16 +1,16 @@ -package org.kestra.task.serdes.csv; +package io.kestra.plugin.serdes.csv; import com.google.common.collect.ImmutableMap; import com.google.common.io.CharStreams; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.apache.commons.lang3.ArrayUtils; import org.junit.jupiter.api.Test; -import org.kestra.core.models.executions.metrics.Counter; -import org.kestra.core.runners.RunContext; -import org.kestra.core.runners.RunContextFactory; -import org.kestra.core.storages.StorageInterface; -import org.kestra.core.utils.TestsUtils; -import org.kestra.task.serdes.SerdesUtils; +import io.kestra.core.models.executions.metrics.Counter; +import io.kestra.core.runners.RunContext; +import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.storages.StorageInterface; +import io.kestra.core.utils.TestsUtils; +import io.kestra.plugin.serdes.SerdesUtils; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/org/kestra/task/serdes/csv/CsvWriterTest.java b/src/test/java/io/kestra/plugin/serdes/csv/CsvWriterTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/csv/CsvWriterTest.java rename to src/test/java/io/kestra/plugin/serdes/csv/CsvWriterTest.java index d461226..c49a35d 100644 --- a/src/test/java/org/kestra/task/serdes/csv/CsvWriterTest.java +++ b/src/test/java/io/kestra/plugin/serdes/csv/CsvWriterTest.java @@ -1,15 +1,15 @@ -package org.kestra.task.serdes.csv; +package io.kestra.plugin.serdes.csv; import com.google.common.collect.ImmutableMap; import com.google.common.io.CharStreams; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; -import org.kestra.core.runners.RunContextFactory; -import org.kestra.core.serializers.FileSerde; -import org.kestra.core.storages.StorageInterface; -import org.kestra.core.utils.IdUtils; -import org.kestra.core.utils.TestsUtils; -import org.kestra.task.serdes.SerdesUtils; +import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.serializers.FileSerde; +import io.kestra.core.storages.StorageInterface; +import io.kestra.core.utils.IdUtils; +import io.kestra.core.utils.TestsUtils; +import io.kestra.plugin.serdes.SerdesUtils; import java.io.*; import java.net.URI; @@ -20,7 +20,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.kestra.core.utils.Rethrow.throwConsumer; +import static io.kestra.core.utils.Rethrow.throwConsumer; @MicronautTest class CsvWriterTest { diff --git a/src/test/java/org/kestra/task/serdes/json/JsonReaderWriterTest.java b/src/test/java/io/kestra/plugin/serdes/json/JsonReaderWriterTest.java similarity index 92% rename from src/test/java/org/kestra/task/serdes/json/JsonReaderWriterTest.java rename to src/test/java/io/kestra/plugin/serdes/json/JsonReaderWriterTest.java index aa897df..6ceb08a 100644 --- a/src/test/java/org/kestra/task/serdes/json/JsonReaderWriterTest.java +++ b/src/test/java/io/kestra/plugin/serdes/json/JsonReaderWriterTest.java @@ -1,14 +1,14 @@ -package org.kestra.task.serdes.json; +package io.kestra.plugin.serdes.json; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; -import org.kestra.core.runners.RunContextFactory; -import org.kestra.core.storages.StorageInterface; -import org.kestra.core.utils.TestsUtils; -import org.kestra.task.serdes.SerdesUtils; -import org.kestra.task.serdes.avro.AvroWriter; +import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.storages.StorageInterface; +import io.kestra.core.utils.TestsUtils; +import io.kestra.plugin.serdes.SerdesUtils; +import io.kestra.plugin.serdes.avro.AvroWriter; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/org/kestra/task/serdes/xml/XmlReaderWriterTest.java b/src/test/java/io/kestra/plugin/serdes/xml/XmlReaderWriterTest.java similarity index 91% rename from src/test/java/org/kestra/task/serdes/xml/XmlReaderWriterTest.java rename to src/test/java/io/kestra/plugin/serdes/xml/XmlReaderWriterTest.java index 883c20b..44ec7ca 100644 --- a/src/test/java/org/kestra/task/serdes/xml/XmlReaderWriterTest.java +++ b/src/test/java/io/kestra/plugin/serdes/xml/XmlReaderWriterTest.java @@ -1,4 +1,4 @@ -package org.kestra.task.serdes.xml; +package io.kestra.plugin.serdes.xml; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; @@ -6,11 +6,11 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; -import org.kestra.core.runners.RunContextFactory; -import org.kestra.core.storages.StorageInterface; -import org.kestra.core.utils.TestsUtils; -import org.kestra.task.serdes.SerdesUtils; -import org.kestra.task.serdes.json.JsonWriter; +import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.storages.StorageInterface; +import io.kestra.core.utils.TestsUtils; +import io.kestra.plugin.serdes.SerdesUtils; +import io.kestra.plugin.serdes.json.JsonWriter; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/resources/csv/full.avsc b/src/test/resources/csv/full.avsc index b153912..efdb12a 100644 --- a/src/test/resources/csv/full.avsc +++ b/src/test/resources/csv/full.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Full", - "namespace": "org.kestra", + "namespace": "io.kestra", "fields": [ { "name": "id", diff --git a/src/test/resources/csv/nested.avsc b/src/test/resources/csv/nested.avsc index 3554cf7..2e57767 100644 --- a/src/test/resources/csv/nested.avsc +++ b/src/test/resources/csv/nested.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Nested", - "namespace": "org.kestra", + "namespace": "io.kestra", "fields": [ { "name": "id", @@ -50,4 +50,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index 5e32621..3d4c518 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -16,6 +16,6 @@ - + - \ No newline at end of file +