Fix package structure of Kotlin serialization extensions

(cherry picked from commit bf2da28)
quarkusio · Oct 11, 2022 · 65f92e2 · 65f92e2
1 parent ee710b9
commit 65f92e2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/...n/KotlinSerializationCommonProcessor.java → ...t/KotlinSerializationCommonProcessor.java b/...n/KotlinSerializationCommonProcessor.java → ...t/KotlinSerializationCommonProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization;
+package io.quarkus.resteasy.reactive.kotlin.serialization.common.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 
@@ -7,6 +7,8 @@
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime.KotlinSerializationConfig;
+import io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime.KotlinSerializerRecorder;
 import kotlinx.serialization.json.Json;
 
 public class KotlinSerializationCommonProcessor {

diff --git a/...s/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/runtime/pom.xml b/...s/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/runtime/pom.xml
@@ -18,7 +18,6 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
                 <executions>
                     <execution>
                         <id>compile</id>

diff --git a/...rkus/kotlin/serialization/JsonConfig.java → ...ialization/common/runtime/JsonConfig.java b/...rkus/kotlin/serialization/JsonConfig.java → ...ialization/common/runtime/JsonConfig.java
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization;
+package io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime;
 
 import java.util.StringJoiner;
 

diff --git a/...ialization/KotlinSerializationConfig.java → ...on/runtime/KotlinSerializationConfig.java b/...ialization/KotlinSerializationConfig.java → ...on/runtime/KotlinSerializationConfig.java
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization;
+package io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime;
 
 import java.util.StringJoiner;
 

diff --git a/...serialization/KotlinSerializerRecorder.kt → ...ommon/runtime/KotlinSerializerRecorder.kt b/...serialization/KotlinSerializerRecorder.kt → ...ommon/runtime/KotlinSerializerRecorder.kt
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization
+package io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime
 
 import io.quarkus.runtime.annotations.Recorder
 import kotlinx.serialization.ExperimentalSerializationApi

diff --git a/...lization-common/runtime/src/test/java/io/quarkus/kotlin/serialization/JsonConfigTest.java b/...lization-common/runtime/src/test/java/io/quarkus/kotlin/serialization/JsonConfigTest.java
@@ -9,6 +9,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime.JsonConfig;
 import kotlinx.serialization.json.JsonConfiguration;
 
 public class JsonConfigTest {

diff --git a/...loyment/KotlinSerializationProcessor.java → ...loyment/KotlinSerializationProcessor.java b/...loyment/KotlinSerializationProcessor.java → ...loyment/KotlinSerializationProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization.deployment;
+package io.quarkus.resteasy.reactive.kotlin.serialization.deployment;
 
 import static io.quarkus.deployment.Feature.RESTEASY_REACTIVE_KOTLIN_SERIALIZATION;
 import static io.quarkus.resteasy.reactive.common.deployment.ServerDefaultProducesHandlerBuildItem.json;
@@ -20,9 +20,9 @@
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.kotlin.serialization.KotlinSerializationMessageBodyReader;
-import io.quarkus.kotlin.serialization.KotlinSerializationMessageBodyWriter;
 import io.quarkus.resteasy.reactive.common.deployment.ServerDefaultProducesHandlerBuildItem;
+import io.quarkus.resteasy.reactive.kotlin.serialization.runtime.KotlinSerializationMessageBodyReader;
+import io.quarkus.resteasy.reactive.kotlin.serialization.runtime.KotlinSerializationMessageBodyWriter;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
 

diff --git a/...n/KotlinSerializationMessageBodyReader.kt → ...e/KotlinSerializationMessageBodyReader.kt b/...n/KotlinSerializationMessageBodyReader.kt → ...e/KotlinSerializationMessageBodyReader.kt
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization
+package io.quarkus.resteasy.reactive.kotlin.serialization.runtime
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json

diff --git a/...n/KotlinSerializationMessageBodyWriter.kt → ...e/KotlinSerializationMessageBodyWriter.kt b/...n/KotlinSerializationMessageBodyWriter.kt → ...e/KotlinSerializationMessageBodyWriter.kt
@@ -1,4 +1,4 @@
-package io.quarkus.kotlin.serialization
+package io.quarkus.resteasy.reactive.kotlin.serialization.runtime
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json