From 71bbc3f22c242e2d511528fa91f6c9fcc1b22378 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 2 Jun 2025 14:23:09 +0200 Subject: [PATCH] format-kotlin --- .../deployment/test/DuplicateIdEntity.kt | 3 +- .../deployment/test/DuplicateIdEntityTest.kt | 12 +- .../kotlin/deployment/test/MyEntity.kt | 3 +- .../kotlin/deployment/test/NoConfigTest.kt | 3 +- .../test/config/ConfigEnabledFalseTest.kt | 18 +- .../DefaultPersistenceUnitConfigTest.kt | 24 +-- .../DefaultPersistenceUnitFileTest.kt | 36 ++-- .../ErroneousPersistenceUnitConfigTest.kt | 14 +- .../MultiplePersistenceUnitConfigTest.kt | 27 +-- .../test/multiple_pu/second/SecondEntity.kt | 3 +- .../kotlin/deployment/test/MyEntity.kt | 3 +- .../test/config/ConfigEnabledFalseTest.kt | 17 +- .../mongodb/panache/kotlin/deployment/Book.kt | 192 +++++++++--------- .../kotlin/deployment/StudentRepository.kt | 92 ++++----- .../kotlin/test/EncodeDefaultValuesTest.kt | 15 +- .../reactive/kotlin/test/ExplicitNullsTest.kt | 14 +- .../reactive/kotlin/test/LenientTest.kt | 12 +- .../reactive/kotlin/test/PrettyPrintTest.kt | 19 +- .../kotlin/serialization/common/BasicTest.kt | 33 ++- .../serialization/common/CustomBeanTest.kt | 22 +- .../kotlin/serialization/common/Greeting.kt | 3 +- .../common/JsonBuilderCustomizerTest.kt | 60 ++++-- .../websockets/next/test/kotlin/BinaryEcho.kt | 5 +- .../next/test/kotlin/BinaryEchoUni.kt | 2 - .../websockets/next/test/kotlin/Echo.kt | 4 +- .../test/kotlin/KotlinWebSocketClientTest.kt | 18 +- .../KotlinWebSocketSessionContextTest.kt | 17 +- .../KotlinWebSocketSuspendingClientTest.kt | 18 +- .../next/test/kotlin/KotlinWebSocketTest.kt | 40 ++-- 29 files changed, 371 insertions(+), 358 deletions(-) diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt index 19672d65310b9..6a7d6ba8ebafa 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt @@ -4,6 +4,5 @@ import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity import jakarta.persistence.Id class DuplicateIdEntity : PanacheEntity() { - @Id - var customId: String? = null + @Id var customId: String? = null } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt index 01210bd3b4be9..bebdf4c573840 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt @@ -2,8 +2,8 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test import io.quarkus.builder.BuildException import io.quarkus.test.QuarkusUnitTest -import org.jboss.shrinkwrap.api.spec.JavaArchive import org.jboss.shrinkwrap.api.ShrinkWrap +import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension @@ -17,11 +17,9 @@ class DuplicateIdEntityTest { companion object { @RegisterExtension @JvmField - var runner = QuarkusUnitTest() - .setExpectedException(BuildException::class.java) - .setArchiveProducer { - ShrinkWrap.create(JavaArchive::class.java) - .addClasses(DuplicateIdEntity::class.java) - } + var runner = + QuarkusUnitTest().setExpectedException(BuildException::class.java).setArchiveProducer { + ShrinkWrap.create(JavaArchive::class.java).addClasses(DuplicateIdEntity::class.java) + } } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt index a3f88d987aaad..8a92c699927c0 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt @@ -6,8 +6,7 @@ import jakarta.persistence.Entity @Entity class MyEntity : PanacheEntity() { - companion object: PanacheCompanion { - } + companion object : PanacheCompanion {} lateinit var name: String } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt index b06fcc295c8db..cdeca3829cf93 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt @@ -15,6 +15,7 @@ class NoConfigTest { companion object { @RegisterExtension @JvmField - val config = QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) } + val config = + QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) } } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt index 38bd7a486eaea..8c0dd6ef6d8b5 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt @@ -3,21 +3,23 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.config import io.quarkus.arc.Arc import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.MyEntity import io.quarkus.test.QuarkusUnitTest +import jakarta.persistence.EntityManagerFactory import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.persistence.EntityManagerFactory class ConfigEnabledFalseTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) } - .withConfigurationResource("application-test.properties") - // We shouldn't get any build error caused by Panache consuming build items that are not produced - // See https://github.com/quarkusio/quarkus/issues/28842 - .overrideConfigKey("quarkus.hibernate-orm.enabled", "false") + val config = + QuarkusUnitTest() + .withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) } + .withConfigurationResource("application-test.properties") + // We shouldn't get any build error caused by Panache consuming build items that are + // not produced + // See https://github.com/quarkusio/quarkus/issues/28842 + .overrideConfigKey("quarkus.hibernate-orm.enabled", "false") } @Test @@ -26,4 +28,4 @@ class ConfigEnabledFalseTest { // Just check that Hibernate ORM is disabled. Assertions.assertNull(Arc.container().instance(EntityManagerFactory::class.java).get()) } -} \ No newline at end of file +} diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt index 8995066f030f4..be914b03fafcc 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt @@ -13,14 +13,10 @@ import org.junit.jupiter.api.extension.RegisterExtension class DefaultPersistenceUnitConfigTest { @Test fun panacheOperations() { - /** - * First entity operations - */ + /** First entity operations */ RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1")) RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2")) - /** - * second entity operations - */ + /** second entity operations */ RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1")) RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2")) } @@ -28,11 +24,15 @@ class DefaultPersistenceUnitConfigTest { companion object { @RegisterExtension @JvmField - var runner = QuarkusUnitTest() - .setArchiveProducer { - ShrinkWrap.create(JavaArchive::class.java) - .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java) - .addAsResource("application-test.properties", "application.properties") - } + var runner = + QuarkusUnitTest().setArchiveProducer { + ShrinkWrap.create(JavaArchive::class.java) + .addClasses( + FirstEntity::class.java, + SecondEntity::class.java, + PanacheTestResource::class.java, + ) + .addAsResource("application-test.properties", "application.properties") + } } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt index 6cb8d033d3f41..90a39ecfa3ba8 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt @@ -14,14 +14,10 @@ import org.junit.jupiter.api.extension.RegisterExtension class DefaultPersistenceUnitFileTest { @Test fun panacheOperations() { - /** - * First entity operations - */ + /** First entity operations */ RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1")) RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2")) - /** - * second entity operations - */ + /** second entity operations */ RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1")) RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2")) } @@ -29,17 +25,25 @@ class DefaultPersistenceUnitFileTest { companion object { @RegisterExtension @JvmField - var runner = QuarkusUnitTest() - .setArchiveProducer { - ShrinkWrap.create(JavaArchive::class.java) - .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java) - .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") - .addAsResource(StringAsset( - """ + var runner = + QuarkusUnitTest().setArchiveProducer { + ShrinkWrap.create(JavaArchive::class.java) + .addClasses( + FirstEntity::class.java, + SecondEntity::class.java, + PanacheTestResource::class.java, + ) + .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") + .addAsResource( + StringAsset( + """ quarkus.datasource.db-kind=h2 quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 - """.trimIndent()), - "application.properties") - } + """ + .trimIndent() + ), + "application.properties", + ) + } } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt index d227bbeb51a29..af1412af1e969 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt @@ -18,12 +18,20 @@ class ErroneousPersistenceUnitConfigTest { companion object { @RegisterExtension @JvmField - var runner = QuarkusUnitTest() + var runner = + QuarkusUnitTest() .setExpectedException(IllegalStateException::class.java) .setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) - .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java) - .addAsResource("application-erroneous-multiple-persistence-units.properties", "application.properties") + .addClasses( + FirstEntity::class.java, + SecondEntity::class.java, + PanacheTestResource::class.java, + ) + .addAsResource( + "application-erroneous-multiple-persistence-units.properties", + "application.properties", + ) } } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt index a0ab9389da80b..a3a990317c803 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt @@ -15,14 +15,10 @@ class MultiplePersistenceUnitConfigTest { @Test @Disabled("fix in a separate PR") fun panacheOperations() { - /** - * First entity operations - */ + /** First entity operations */ RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1")) RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2")) - /** - * second entity operations - */ + /** second entity operations */ RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1")) RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2")) } @@ -30,11 +26,18 @@ class MultiplePersistenceUnitConfigTest { companion object { @RegisterExtension @JvmField - var runner = QuarkusUnitTest() - .setArchiveProducer { - ShrinkWrap.create(JavaArchive::class.java) - .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java) - .addAsResource("application-multiple-persistence-units.properties", "application.properties") - } + var runner = + QuarkusUnitTest().setArchiveProducer { + ShrinkWrap.create(JavaArchive::class.java) + .addClasses( + FirstEntity::class.java, + SecondEntity::class.java, + PanacheTestResource::class.java, + ) + .addAsResource( + "application-multiple-persistence-units.properties", + "application.properties", + ) + } } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt index 615a70dbc1a38..62c08edcb0e1d 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt @@ -6,6 +6,7 @@ import jakarta.persistence.Entity @Entity class SecondEntity : PanacheEntity() { - companion object: PanacheCompanion + companion object : PanacheCompanion + var name: String? = null } diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt index e22eb58a2b786..6de37e4b075a3 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt @@ -6,8 +6,7 @@ import jakarta.persistence.Entity @Entity class MyEntity : PanacheEntity() { - companion object: PanacheCompanion { - } + companion object : PanacheCompanion {} lateinit var name: String } diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt index bf749e2304a50..370909bdf9bcf 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt @@ -4,7 +4,6 @@ import io.quarkus.arc.Arc import io.quarkus.hibernate.reactive.panache.kotlin.deployment.test.MyEntity import io.quarkus.test.QuarkusUnitTest import org.hibernate.reactive.mutiny.Mutiny -import org.hibernate.reactive.mutiny.impl.MutinySessionFactoryImpl import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test @@ -13,12 +12,14 @@ import org.junit.jupiter.api.extension.RegisterExtension class ConfigEnabledFalseTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) } - .withConfigurationResource("application.properties") - // We shouldn't get any build error caused by Panache consuming build items that are not produced - // See https://github.com/quarkusio/quarkus/issues/28842 - .overrideConfigKey("quarkus.hibernate-orm.enabled", "false") + val config = + QuarkusUnitTest() + .withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) } + .withConfigurationResource("application.properties") + // We shouldn't get any build error caused by Panache consuming build items that are + // not produced + // See https://github.com/quarkusio/quarkus/issues/28842 + .overrideConfigKey("quarkus.hibernate-orm.enabled", "false") } @Test @@ -27,4 +28,4 @@ class ConfigEnabledFalseTest { // Just check that Hibernate Reactive is disabled. Assertions.assertNull(Arc.container().instance(Mutiny.SessionFactory::class.java).get()) } -} \ No newline at end of file +} diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt index 922b50930d8db..e5e1af55c8cdd 100644 --- a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt +++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt @@ -6,162 +6,152 @@ import io.quarkus.mongodb.panache.common.PanacheUpdate import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity import io.quarkus.mongodb.panache.kotlin.PanacheQuery - import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE +import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort +import java.util.stream.Stream import org.bson.Document import org.bson.types.ObjectId -import java.util.stream.Stream /** - * This class is used by TestEnhancers to validate the bytecode generation. Each method on PanacheMongoCompanion is - * manually implemented to give us a compiler generated metric against which to validate the quarkus generated bytecode. - * TestEnhancers further validates that all @GenerateBridge annotated methods are represented by a 'target_' method - * here. + * This class is used by TestEnhancers to validate the bytecode generation. Each method on + * PanacheMongoCompanion is manually implemented to give us a compiler generated metric against + * which to validate the quarkus generated bytecode. TestEnhancers further validates that + * all @GenerateBridge annotated methods are represented by a 'target_' method here. */ @Suppress("UNCHECKED_CAST", "unused") class Book : PanacheMongoEntity() { companion object : PanacheMongoCompanion { - fun target_count(): Long - = INSTANCE.count(Book::class.java) - - fun target_count(query: Document): Long - = INSTANCE.count(Book::class.java, query) + fun target_count(): Long = INSTANCE.count(Book::class.java) - fun target_count(query: String, params: Map): Long - = INSTANCE.count(Book::class.java, query, params) + fun target_count(query: Document): Long = INSTANCE.count(Book::class.java, query) - fun target_count(query: String, params: Parameters): Long - = INSTANCE.count(Book::class.java, query, params) + fun target_count(query: String, params: Map): Long = + INSTANCE.count(Book::class.java, query, params) - fun target_count(query: String, vararg params: Any?): Long - = INSTANCE.count(Book::class.java, query, *params) + fun target_count(query: String, params: Parameters): Long = + INSTANCE.count(Book::class.java, query, params) - fun target_delete(query: Document): Long - = INSTANCE.delete(Book::class.java, query) + fun target_count(query: String, vararg params: Any?): Long = + INSTANCE.count(Book::class.java, query, *params) - fun target_delete(query: String, params: Map): Long - = INSTANCE.delete(Book::class.java, query, params) + fun target_delete(query: Document): Long = INSTANCE.delete(Book::class.java, query) - fun target_delete(query: String, params: Parameters): Long - = INSTANCE.delete(Book::class.java, query, params) + fun target_delete(query: String, params: Map): Long = + INSTANCE.delete(Book::class.java, query, params) - fun target_delete(query: String, vararg params: Any?): Long - = INSTANCE.delete(Book::class.java, query, *params) + fun target_delete(query: String, params: Parameters): Long = + INSTANCE.delete(Book::class.java, query, params) - fun target_deleteAll(): Long - = INSTANCE.deleteAll(Book::class.java) + fun target_delete(query: String, vararg params: Any?): Long = + INSTANCE.delete(Book::class.java, query, *params) - fun target_deleteById(id: ObjectId): Boolean - = INSTANCE.deleteById(Book::class.java, id) + fun target_deleteAll(): Long = INSTANCE.deleteAll(Book::class.java) - fun target_find(query: Document): PanacheQuery - = INSTANCE.find(Book::class.java, query) as PanacheQuery + fun target_deleteById(id: ObjectId): Boolean = INSTANCE.deleteById(Book::class.java, id) - fun target_find(query: Document, sort: Document): PanacheQuery - = INSTANCE.find(Book::class.java, query, sort) as PanacheQuery + fun target_find(query: Document): PanacheQuery = + INSTANCE.find(Book::class.java, query) as PanacheQuery - fun target_find(query: String, params: Map): PanacheQuery - = INSTANCE.find(Book::class.java, query, params) as PanacheQuery + fun target_find(query: Document, sort: Document): PanacheQuery = + INSTANCE.find(Book::class.java, query, sort) as PanacheQuery - fun target_find(query: String, params: Parameters): PanacheQuery - = INSTANCE.find(Book::class.java, query, params) as PanacheQuery + fun target_find(query: String, params: Map): PanacheQuery = + INSTANCE.find(Book::class.java, query, params) as PanacheQuery - fun target_find(query: String, sort: Sort, params: Map): PanacheQuery - = INSTANCE.find(Book::class.java, query, sort, params) as PanacheQuery + fun target_find(query: String, params: Parameters): PanacheQuery = + INSTANCE.find(Book::class.java, query, params) as PanacheQuery - fun target_find(query: String, sort: Sort, params: Parameters): PanacheQuery - = INSTANCE.find(Book::class.java, query, sort, params) as PanacheQuery + fun target_find(query: String, sort: Sort, params: Map): PanacheQuery = + INSTANCE.find(Book::class.java, query, sort, params) as PanacheQuery - fun target_find(query: String, sort: Sort, vararg params: Any?): PanacheQuery - = INSTANCE.find(Book::class.java, query, sort, *params) as PanacheQuery + fun target_find(query: String, sort: Sort, params: Parameters): PanacheQuery = + INSTANCE.find(Book::class.java, query, sort, params) as PanacheQuery - fun target_find(query: String, vararg params: Any?): PanacheQuery - = INSTANCE.find(Book::class.java, query, *params) as PanacheQuery + fun target_find(query: String, sort: Sort, vararg params: Any?): PanacheQuery = + INSTANCE.find(Book::class.java, query, sort, *params) as PanacheQuery - fun target_findAll(): PanacheQuery - = INSTANCE.findAll(Book::class.java) as PanacheQuery + fun target_find(query: String, vararg params: Any?): PanacheQuery = + INSTANCE.find(Book::class.java, query, *params) as PanacheQuery - fun target_findAll(sort: Sort): PanacheQuery - = INSTANCE.findAll(Book::class.java, sort) as PanacheQuery + fun target_findAll(): PanacheQuery = + INSTANCE.findAll(Book::class.java) as PanacheQuery - fun target_findById(id: ObjectId): Book? - = INSTANCE.findById(Book::class.java, id) as Book? + fun target_findAll(sort: Sort): PanacheQuery = + INSTANCE.findAll(Book::class.java, sort) as PanacheQuery - fun target_list(query: Document): List - = INSTANCE.list(Book::class.java, query) as List + fun target_findById(id: ObjectId): Book? = INSTANCE.findById(Book::class.java, id) as Book? - fun target_list(query: Document, sort: Document): List - = INSTANCE.list(Book::class.java, query, sort) as List + fun target_list(query: Document): List = + INSTANCE.list(Book::class.java, query) as List - fun target_list(query: String, params: Map): List - = INSTANCE.list(Book::class.java, query, params) as List + fun target_list(query: Document, sort: Document): List = + INSTANCE.list(Book::class.java, query, sort) as List - fun target_list(query: String, params: Parameters): List - = INSTANCE.list(Book::class.java, query, params) as List + fun target_list(query: String, params: Map): List = + INSTANCE.list(Book::class.java, query, params) as List - fun target_list(query: String, sort: Sort, params: Map): List - = INSTANCE.list(Book::class.java, query, sort, params) as List + fun target_list(query: String, params: Parameters): List = + INSTANCE.list(Book::class.java, query, params) as List - fun target_list(query: String, sort: Sort, params: Parameters): List - = INSTANCE.list(Book::class.java, query, sort, params) as List + fun target_list(query: String, sort: Sort, params: Map): List = + INSTANCE.list(Book::class.java, query, sort, params) as List - fun target_list(query: String, sort: Sort, vararg params: Any?): List - = INSTANCE.list(Book::class.java, query, sort, *params) as List + fun target_list(query: String, sort: Sort, params: Parameters): List = + INSTANCE.list(Book::class.java, query, sort, params) as List - fun target_list(query: String, vararg params: Any?): List - = INSTANCE.list(Book::class.java, query, *params) as List + fun target_list(query: String, sort: Sort, vararg params: Any?): List = + INSTANCE.list(Book::class.java, query, sort, *params) as List - fun target_listAll(): List - = INSTANCE.listAll(Book::class.java) as List + fun target_list(query: String, vararg params: Any?): List = + INSTANCE.list(Book::class.java, query, *params) as List - fun target_listAll(sort: Sort): List - = INSTANCE.listAll(Book::class.java, sort) as List + fun target_listAll(): List = INSTANCE.listAll(Book::class.java) as List - fun target_mongoCollection(): MongoCollection - = INSTANCE.mongoCollection(Book::class.java) as MongoCollection + fun target_listAll(sort: Sort): List = + INSTANCE.listAll(Book::class.java, sort) as List - fun target_mongoDatabase(): MongoDatabase - = INSTANCE.mongoDatabase(Book::class.java) + fun target_mongoCollection(): MongoCollection = + INSTANCE.mongoCollection(Book::class.java) as MongoCollection - fun target_stream(query: Document): Stream - = INSTANCE.stream(Book::class.java, query) as Stream + fun target_mongoDatabase(): MongoDatabase = INSTANCE.mongoDatabase(Book::class.java) - fun target_stream(query: Document, sort: Document): Stream - = INSTANCE.stream(Book::class.java, query, sort) as Stream + fun target_stream(query: Document): Stream = + INSTANCE.stream(Book::class.java, query) as Stream - fun target_stream(query: String, params: Map): Stream - = INSTANCE.stream(Book::class.java, query, params) as Stream + fun target_stream(query: Document, sort: Document): Stream = + INSTANCE.stream(Book::class.java, query, sort) as Stream - fun target_stream(query: String, params: Parameters): Stream - = INSTANCE.stream(Book::class.java, query, params) as Stream + fun target_stream(query: String, params: Map): Stream = + INSTANCE.stream(Book::class.java, query, params) as Stream - fun target_stream(query: String, sort: Sort, params: Map): Stream - = INSTANCE.stream(Book::class.java, query, sort, params) as Stream + fun target_stream(query: String, params: Parameters): Stream = + INSTANCE.stream(Book::class.java, query, params) as Stream - fun target_stream(query: String, sort: Sort, params: Parameters): Stream - = INSTANCE.stream(Book::class.java, query, sort, params) as Stream + fun target_stream(query: String, sort: Sort, params: Map): Stream = + INSTANCE.stream(Book::class.java, query, sort, params) as Stream - fun target_stream(query: String, sort: Sort, vararg params: Any?): Stream - = INSTANCE.stream(Book::class.java, query, sort, *params) as Stream + fun target_stream(query: String, sort: Sort, params: Parameters): Stream = + INSTANCE.stream(Book::class.java, query, sort, params) as Stream - fun target_stream(query: String, vararg params: Any?): Stream - = INSTANCE.stream(Book::class.java, query, *params) as Stream + fun target_stream(query: String, sort: Sort, vararg params: Any?): Stream = + INSTANCE.stream(Book::class.java, query, sort, *params) as Stream - fun target_streamAll(): Stream - = INSTANCE.streamAll(Book::class.java) as Stream + fun target_stream(query: String, vararg params: Any?): Stream = + INSTANCE.stream(Book::class.java, query, *params) as Stream - fun target_streamAll(sort: Sort): Stream - = INSTANCE.streamAll(Book::class.java, sort) as Stream + fun target_streamAll(): Stream = INSTANCE.streamAll(Book::class.java) as Stream - fun target_update(update: String, params: Map): PanacheUpdate - = INSTANCE.update(Book::class.java, update, params) + fun target_streamAll(sort: Sort): Stream = + INSTANCE.streamAll(Book::class.java, sort) as Stream - fun target_update(update: String, params: Parameters): PanacheUpdate - = INSTANCE.update(Book::class.java, update, params) + fun target_update(update: String, params: Map): PanacheUpdate = + INSTANCE.update(Book::class.java, update, params) - fun target_update(update: String, vararg params: Any?): PanacheUpdate - = INSTANCE.update(Book::class.java, update, *params) + fun target_update(update: String, params: Parameters): PanacheUpdate = + INSTANCE.update(Book::class.java, update, params) + fun target_update(update: String, vararg params: Any?): PanacheUpdate = + INSTANCE.update(Book::class.java, update, *params) } } diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt index 868560dd488ce..02b0f21749eab 100644 --- a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt +++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt @@ -8,27 +8,27 @@ import io.quarkus.mongodb.panache.kotlin.PanacheQuery import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort -import org.bson.Document import java.util.stream.Stream +import org.bson.Document /** - * This class is used by TestEnhancers to validate the bytecode generation. Each method on PanacheMongoRepositoryBase - * is manually implemented to give us a compiler generated metric against which to validate the quarkus generated - * bytecode. TestEnhancers further validates that all @GenerateBridge annotated methods are represented by a 'target_' - * method here. + * This class is used by TestEnhancers to validate the bytecode generation. Each method on + * PanacheMongoRepositoryBase is manually implemented to give us a compiler generated metric against + * which to validate the quarkus generated bytecode. TestEnhancers further validates that + * all @GenerateBridge annotated methods are represented by a 'target_' method here. */ @Suppress("unused", "UNCHECKED_CAST") class StudentRepository : PanacheMongoRepositoryBase { fun target_count(): Long = INSTANCE.count(Student::class.java) fun target_count(query: String, vararg params: Any?): Long = - INSTANCE.count(Student::class.java, query, *params) + INSTANCE.count(Student::class.java, query, *params) fun target_count(query: String, params: Map): Long = - INSTANCE.count(Student::class.java, query, params) + INSTANCE.count(Student::class.java, query, params) fun target_count(query: String, params: Parameters): Long = - INSTANCE.count(Student::class.java, query, params) + INSTANCE.count(Student::class.java, query, params) fun target_count(query: Document): Long = INSTANCE.count(Student::class.java, query) @@ -37,120 +37,120 @@ class StudentRepository : PanacheMongoRepositoryBase { fun target_deleteById(id: Long): Boolean = INSTANCE.deleteById(Student::class.java, id) fun target_delete(query: String, vararg params: Any?): Long = - INSTANCE.delete(Student::class.java, query, *params) + INSTANCE.delete(Student::class.java, query, *params) fun target_delete(query: String, params: Map): Long = - INSTANCE.delete(Student::class.java, query, params) + INSTANCE.delete(Student::class.java, query, params) fun target_delete(query: String, params: Parameters): Long = - INSTANCE.delete(Student::class.java, query, params) + INSTANCE.delete(Student::class.java, query, params) fun target_delete(query: Document): Long = INSTANCE.delete(Student::class.java, query) - fun target_findById(id: Long): Student? = - INSTANCE.findById(Student::class.java, id) as Student? + fun target_findById(id: Long): Student? = INSTANCE.findById(Student::class.java, id) as Student? fun target_find(query: String, vararg params: Any?): PanacheQuery = - INSTANCE.find(Student::class.java, query, *params) as PanacheQuery + INSTANCE.find(Student::class.java, query, *params) as PanacheQuery fun target_find(query: String, sort: Sort, vararg params: Any?): PanacheQuery = - INSTANCE.find(Student::class.java, query, sort, *params) as PanacheQuery + INSTANCE.find(Student::class.java, query, sort, *params) as PanacheQuery fun target_find(query: String, params: Map): PanacheQuery = - INSTANCE.find(Student::class.java, query, params) as PanacheQuery + INSTANCE.find(Student::class.java, query, params) as PanacheQuery fun target_find(query: String, sort: Sort, params: Map): PanacheQuery = - INSTANCE.find(Student::class.java, query, sort, params) as PanacheQuery + INSTANCE.find(Student::class.java, query, sort, params) as PanacheQuery fun target_find(query: String, params: Parameters): PanacheQuery = - INSTANCE.find(Student::class.java, query, params) as PanacheQuery + INSTANCE.find(Student::class.java, query, params) as PanacheQuery fun target_find(query: String, sort: Sort, params: Parameters): PanacheQuery = - INSTANCE.find(Student::class.java, query, sort, params) as PanacheQuery + INSTANCE.find(Student::class.java, query, sort, params) as PanacheQuery fun target_find(query: Document): PanacheQuery = - INSTANCE.find(Student::class.java, query) as PanacheQuery + INSTANCE.find(Student::class.java, query) as PanacheQuery fun target_find(query: Document, sort: Document): PanacheQuery = - INSTANCE.find(Student::class.java, query, sort) as PanacheQuery + INSTANCE.find(Student::class.java, query, sort) as PanacheQuery fun target_findAll(): PanacheQuery = - INSTANCE.findAll(Student::class.java) as PanacheQuery + INSTANCE.findAll(Student::class.java) as PanacheQuery fun target_findAll(sort: Sort): PanacheQuery = - INSTANCE.findAll(Student::class.java, sort) as PanacheQuery + INSTANCE.findAll(Student::class.java, sort) as PanacheQuery fun target_list(query: String, vararg params: Any?): List = - INSTANCE.list(Student::class.java, query, *params) as List + INSTANCE.list(Student::class.java, query, *params) as List fun target_list(query: String, sort: Sort, vararg params: Any?): List = - INSTANCE.list(Student::class.java, query, sort, *params) as List + INSTANCE.list(Student::class.java, query, sort, *params) as List fun target_list(query: String, params: Map): List = - INSTANCE.list(Student::class.java, query, params) as List + INSTANCE.list(Student::class.java, query, params) as List fun target_list(query: String, sort: Sort, params: Map): List = - INSTANCE.list(Student::class.java, query, sort, params) as List + INSTANCE.list(Student::class.java, query, sort, params) as List fun target_list(query: String, params: Parameters): List = - INSTANCE.list(Student::class.java, query, params) as List + INSTANCE.list(Student::class.java, query, params) as List fun target_list(query: String, sort: Sort, params: Parameters): List = - INSTANCE.list(Student::class.java, query, sort, params) as List + INSTANCE.list(Student::class.java, query, sort, params) as List fun target_list(query: Document): List = - INSTANCE.list(Student::class.java, query) as List + INSTANCE.list(Student::class.java, query) as List fun target_list(query: Document, sort: Document): List = - INSTANCE.list(Student::class.java, query, sort) as List + INSTANCE.list(Student::class.java, query, sort) as List fun target_listAll(): List = INSTANCE.listAll(Student::class.java) as List fun target_listAll(sort: Sort): List = - INSTANCE.listAll(Student::class.java, sort) as List + INSTANCE.listAll(Student::class.java, sort) as List fun target_mongoCollection(): MongoCollection = - INSTANCE.mongoCollection(Student::class.java) as MongoCollection + INSTANCE.mongoCollection(Student::class.java) as MongoCollection fun target_mongoDatabase(): MongoDatabase = INSTANCE.mongoDatabase(Student::class.java) fun target_stream(query: String, vararg params: Any?): Stream = - INSTANCE.stream(Student::class.java, query, *params) as Stream + INSTANCE.stream(Student::class.java, query, *params) as Stream fun target_stream(query: String, sort: Sort, vararg params: Any?): Stream = - INSTANCE.stream(Student::class.java, query, sort, *params) as Stream + INSTANCE.stream(Student::class.java, query, sort, *params) as Stream fun target_stream(query: String, params: Map): Stream = - INSTANCE.stream(Student::class.java, query, params) as Stream + INSTANCE.stream(Student::class.java, query, params) as Stream fun target_stream(query: String, sort: Sort, params: Map): Stream = - INSTANCE.stream(Student::class.java, query, sort, params) as Stream + INSTANCE.stream(Student::class.java, query, sort, params) as Stream fun target_stream(query: String, params: Parameters): Stream = - INSTANCE.stream(Student::class.java, query, params) as Stream + INSTANCE.stream(Student::class.java, query, params) as Stream fun target_stream(query: String, sort: Sort, params: Parameters): Stream = - INSTANCE.stream(Student::class.java, query, sort, params) as Stream + INSTANCE.stream(Student::class.java, query, sort, params) as Stream fun target_stream(query: Document): Stream = - INSTANCE.stream(Student::class.java, query) as Stream + INSTANCE.stream(Student::class.java, query) as Stream fun target_stream(query: Document, sort: Document): Stream = - INSTANCE.stream(Student::class.java, query, sort) as Stream + INSTANCE.stream(Student::class.java, query, sort) as Stream fun target_streamAll(sort: Sort): Stream = - INSTANCE.streamAll(Student::class.java, sort) as Stream + INSTANCE.streamAll(Student::class.java, sort) as Stream fun target_streamAll(): Stream = - INSTANCE.streamAll(Student::class.java) as Stream + INSTANCE.streamAll(Student::class.java) as Stream fun target_update(update: String, vararg params: Any?): PanacheUpdate = - INSTANCE.update(Student::class.java, update, *params) + INSTANCE.update(Student::class.java, update, *params) fun target_update(update: String, params: Map): PanacheUpdate = - INSTANCE.update(Student::class.java, update, params) + INSTANCE.update(Student::class.java, update, params) fun target_update(update: String, params: Parameters): PanacheUpdate = - INSTANCE.update(Student::class.java, update, params) + INSTANCE.update(Student::class.java, update, params) } + class Student diff --git a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt index bdb50b859821d..bcc6bba6040ea 100644 --- a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt +++ b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt @@ -1,33 +1,30 @@ package io.quarkus.rest.client.reactive.kotlin.test import io.quarkus.test.QuarkusUnitTest +import jakarta.inject.Inject import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.inject.Inject class EncodeDefaultValuesTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withConfigurationResource("encode-default-values.properties") + val config = QuarkusUnitTest().withConfigurationResource("encode-default-values.properties") } - @Inject - lateinit var json: Json + @Inject lateinit var json: Json @Test fun testNoDefaults() { - assertThat(json.encodeToString(TestObject())) - .isEqualTo("{}") + assertThat(json.encodeToString(TestObject())).isEqualTo("{}") } + @Test fun testExplicitNulls() { - assertThat(json.encodeToString(TestObject(blank = null))) - .isEqualTo("{\"blank\":null}") + assertThat(json.encodeToString(TestObject(blank = null))).isEqualTo("{\"blank\":null}") } @Serializable diff --git a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt index 0c816f080622f..052e802741845 100644 --- a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt +++ b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt @@ -1,30 +1,26 @@ package io.quarkus.rest.client.reactive.kotlin.test import io.quarkus.test.QuarkusUnitTest +import jakarta.inject.Inject import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.inject.Inject class ExplicitNullsTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withConfigurationResource("explicit-nulls.properties") + val config = QuarkusUnitTest().withConfigurationResource("explicit-nulls.properties") } - @Inject - lateinit var json: Json + @Inject lateinit var json: Json @Test fun testExplicitNulls() { - assertThat(json.encodeToString(TestObject(blank = null))) - .isEqualTo("{}") + assertThat(json.encodeToString(TestObject(blank = null))).isEqualTo("{}") } - @Serializable - private class TestObject(var blank: String? = "") + @Serializable private class TestObject(var blank: String? = "") } diff --git a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt index 91213df829fd1..4bd3c999471b8 100644 --- a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt +++ b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt @@ -1,24 +1,21 @@ package io.quarkus.rest.client.reactive.kotlin.test import io.quarkus.test.QuarkusUnitTest +import jakarta.inject.Inject import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.inject.Inject class LenientTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withConfigurationResource("lenient.properties") + val config = QuarkusUnitTest().withConfigurationResource("lenient.properties") } - @Inject - lateinit var json: Json + @Inject lateinit var json: Json @Test fun testLenient() { @@ -26,6 +23,5 @@ class LenientTest { .isEqualTo(TestObject("json")) } - @Serializable - private data class TestObject(var name: String) + @Serializable private data class TestObject(var name: String) } diff --git a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt index 45234612beb90..5dc8eb975debf 100644 --- a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt +++ b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt @@ -1,7 +1,7 @@ - package io.quarkus.rest.client.reactive.kotlin.test import io.quarkus.test.QuarkusUnitTest +import jakarta.inject.Inject import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString @@ -10,28 +10,27 @@ import kotlinx.serialization.json.JsonNames import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.inject.Inject @OptIn(ExperimentalSerializationApi::class) class PrettyPrintTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withConfigurationResource("pretty-print.properties") + val config = QuarkusUnitTest().withConfigurationResource("pretty-print.properties") } - @Inject - lateinit var json: Json + @Inject lateinit var json: Json @Test fun testAlternateNames() { assertThat(json.encodeToString(TestObject("John Doe"))) - .isEqualTo(""" + .isEqualTo( + """ { "name": "John Doe" - }""".trimIndent()) + }""" + .trimIndent() + ) } - @Serializable - private data class TestObject(@JsonNames("label") var name: String) + @Serializable private data class TestObject(@JsonNames("label") var name: String) } diff --git a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/BasicTest.kt b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/BasicTest.kt index 3da9f4d62f527..33af17e3ff633 100644 --- a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/BasicTest.kt +++ b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/BasicTest.kt @@ -2,39 +2,52 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.common import io.quarkus.arc.Arc import io.quarkus.test.QuarkusUnitTest +import kotlin.reflect.full.createType import kotlinx.serialization.json.Json import kotlinx.serialization.serializer import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import kotlin.reflect.full.createType class BasicTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withApplicationRoot { jar: JavaArchive -> jar.addClass(Greeting::class.java) } - .withConfigurationResource("basic.properties") + val config = + QuarkusUnitTest() + .withApplicationRoot { jar: JavaArchive -> jar.addClass(Greeting::class.java) } + .withConfigurationResource("basic.properties") } @Test fun testSerialization() { // Aside from the CDI integration, this tests that the configured pretty-print is used Assertions.assertEquals( -"""{ + """{ "name": "foo", "message": "hello" }""", - Arc.container().instance(Json::class.java).get().encodeToString(serializer(), Greeting("foo", "hello"))) + Arc.container() + .instance(Json::class.java) + .get() + .encodeToString(serializer(), Greeting("foo", "hello")), + ) } @Test fun testDeserialization() { - // Aside from the CDI integration, this tests that the configured ignore-unknown-keys is used - Assertions.assertEquals(Greeting("foo", "hello"), - Arc.container().instance(Json::class.java).get().decodeFromString(serializer(Greeting::class.createType()), """{"name" : "foo", "message" : "hello", "test": "dummy"}""")) + // Aside from the CDI integration, this tests that the configured ignore-unknown-keys is + // used + Assertions.assertEquals( + Greeting("foo", "hello"), + Arc.container() + .instance(Json::class.java) + .get() + .decodeFromString( + serializer(Greeting::class.createType()), + """{"name" : "foo", "message" : "hello", "test": "dummy"}""", + ), + ) } - } diff --git a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt index 708e02079679c..ab2a1dc3dd324 100644 --- a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt +++ b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt @@ -1,7 +1,9 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.common -import io.quarkus.arc.Arc import io.quarkus.test.QuarkusUnitTest +import jakarta.enterprise.inject.Produces +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.serializer @@ -9,30 +11,28 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.enterprise.inject.Produces -import jakarta.inject.Inject -import jakarta.inject.Singleton -import kotlin.reflect.full.createType class CustomBeanTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withApplicationRoot { jar: JavaArchive -> jar.addClasses(Greeting::class.java, CustomJsonProducer::class.java) } + val config = + QuarkusUnitTest().withApplicationRoot { jar: JavaArchive -> + jar.addClasses(Greeting::class.java, CustomJsonProducer::class.java) + } } - @Inject - lateinit var json: Json + @Inject lateinit var json: Json @Test fun test() { Assertions.assertEquals( -"""{ + """{ "name": "foo", "message": "hello" }""", - json.encodeToString(serializer(), Greeting("foo", "hello"))) + json.encodeToString(serializer(), Greeting("foo", "hello")), + ) } @Singleton diff --git a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/Greeting.kt b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/Greeting.kt index 0f4bb1df7e3fb..3ea19ffe715c7 100644 --- a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/Greeting.kt +++ b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/Greeting.kt @@ -2,5 +2,4 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.common import kotlinx.serialization.Serializable -@Serializable -data class Greeting(val name: String, val message: String) +@Serializable data class Greeting(val name: String, val message: String) diff --git a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt index a80d9930cdc1d..a88b02570fd37 100644 --- a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt +++ b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt @@ -2,6 +2,10 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.common import io.quarkus.arc.Arc import io.quarkus.test.QuarkusUnitTest +import jakarta.annotation.Priority +import jakarta.inject.Inject +import jakarta.inject.Singleton +import kotlin.reflect.full.createType import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonBuilder @@ -10,40 +14,56 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import jakarta.annotation.Priority -import jakarta.inject.Inject -import jakarta.inject.Singleton -import kotlin.reflect.full.createType class JsonBuilderCustomizerTest { companion object { @RegisterExtension - val config = QuarkusUnitTest() - .withApplicationRoot { jar: JavaArchive -> jar.addClasses(Greeting::class.java, HighPriorityCustomizer::class.java, LowPriorityCustomizer::class.java) } - .withConfigurationResource("basic.properties") + val config = + QuarkusUnitTest() + .withApplicationRoot { jar: JavaArchive -> + jar.addClasses( + Greeting::class.java, + HighPriorityCustomizer::class.java, + LowPriorityCustomizer::class.java, + ) + } + .withConfigurationResource("basic.properties") } - @Inject - lateinit var json: Json + @Inject lateinit var json: Json @Test fun testSerialization() { - // prettyPrint should be set to false, because HighPriorityCustomizer overrides the value set in config - Assertions.assertEquals("""{"name":"foo","message":"hello"}""", - Arc.container().instance(Json::class.java).get().encodeToString(serializer(), Greeting("foo", "hello"))) + // prettyPrint should be set to false, because HighPriorityCustomizer overrides the value + // set in config + Assertions.assertEquals( + """{"name":"foo","message":"hello"}""", + Arc.container() + .instance(Json::class.java) + .get() + .encodeToString(serializer(), Greeting("foo", "hello")), + ) } @Test fun testDeserialization() { - // isLenient should be set to true, because LowPriorityCustomizer overrides the value set in HighPriorityCustomizer - Assertions.assertEquals(Greeting("foo", "hello"), - json.decodeFromString(serializer(Greeting::class.createType()), """{name : "foo", "message" : "hello", "test": "dummy"}""")) + // isLenient should be set to true, because LowPriorityCustomizer overrides the value set in + // HighPriorityCustomizer + Assertions.assertEquals( + Greeting("foo", "hello"), + json.decodeFromString( + serializer(Greeting::class.createType()), + """{name : "foo", "message" : "hello", "test": "dummy"}""", + ), + ) } @Singleton - @Priority(JsonBuilderCustomizer.DEFAULT_PRIORITY + 100) // this impl will be called before HighPriorityCustomizer - class HighPriorityCustomizer : JsonBuilderCustomizer{ + @Priority( + JsonBuilderCustomizer.DEFAULT_PRIORITY + 100 + ) // this impl will be called before HighPriorityCustomizer + class HighPriorityCustomizer : JsonBuilderCustomizer { @ExperimentalSerializationApi override fun customize(jsonBuilder: JsonBuilder) { @@ -53,8 +73,10 @@ class JsonBuilderCustomizerTest { } @Singleton - @Priority(JsonBuilderCustomizer.DEFAULT_PRIORITY + 10) // this impl will be called after HighPriorityCustomizer - class LowPriorityCustomizer : JsonBuilderCustomizer{ + @Priority( + JsonBuilderCustomizer.DEFAULT_PRIORITY + 10 + ) // this impl will be called after HighPriorityCustomizer + class LowPriorityCustomizer : JsonBuilderCustomizer { @ExperimentalSerializationApi override fun customize(jsonBuilder: JsonBuilder) { diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEcho.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEcho.kt index 587145700bcb4..2d8dbda9feefc 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEcho.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEcho.kt @@ -4,7 +4,6 @@ import io.quarkus.websockets.next.OnBinaryMessage import io.quarkus.websockets.next.OnClose import io.quarkus.websockets.next.WebSocket import io.vertx.core.buffer.Buffer -import kotlinx.coroutines.delay @WebSocket(path = "/binary-echo") class BinaryEcho { @@ -13,7 +12,5 @@ class BinaryEcho { return msg } - @OnClose - fun close() { - } + @OnClose fun close() {} } diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEchoUni.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEchoUni.kt index 8fa01ae1e8c6d..f03f912b595ca 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEchoUni.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/BinaryEchoUni.kt @@ -5,7 +5,6 @@ import io.quarkus.websockets.next.OnClose import io.quarkus.websockets.next.WebSocket import io.smallrye.mutiny.Uni import io.vertx.core.buffer.Buffer -import kotlinx.coroutines.delay @WebSocket(path = "/binary-echo-uni") class BinaryEchoUni { @@ -14,7 +13,6 @@ class BinaryEchoUni { return Uni.createFrom().item(msg) } - @OnClose fun close(): Uni { return Uni.createFrom().voidItem() diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/Echo.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/Echo.kt index 330b9fe94e093..97e194fcf54c6 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/Echo.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/Echo.kt @@ -11,7 +11,5 @@ class Echo { return msg } - @OnClose - fun close() { - } + @OnClose fun close() {} } diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketClientTest.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketClientTest.kt index 9ec2cd00baf2c..113810ba1cbd4 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketClientTest.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketClientTest.kt @@ -9,29 +9,27 @@ import io.quarkus.websockets.next.WebSocket import io.quarkus.websockets.next.WebSocketClient import io.quarkus.websockets.next.WebSocketConnector import jakarta.inject.Inject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.RegisterExtension import java.net.URI import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.RegisterExtension class KotlinWebSocketClientTest { companion object { @RegisterExtension - val test = QuarkusUnitTest() - .withApplicationRoot { jar -> + val test = + QuarkusUnitTest().withApplicationRoot { jar -> jar.addClasses(ServerEndpoint::class.java, ClientEndpoint::class.java) } } - @Inject - lateinit var connector: WebSocketConnector + @Inject lateinit var connector: WebSocketConnector - @TestHTTPResource("/") - lateinit var uri: URI + @TestHTTPResource("/") lateinit var uri: URI @Test fun test() { diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSessionContextTest.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSessionContextTest.kt index 4fd8f29d1b03a..11d458c7d2050 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSessionContextTest.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSessionContextTest.kt @@ -8,29 +8,27 @@ import io.quarkus.websockets.next.test.utils.WSClient import io.vertx.core.Vertx import jakarta.enterprise.context.SessionScoped import jakarta.inject.Inject +import java.net.URI +import java.util.UUID import kotlinx.coroutines.delay import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotEquals import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import java.net.URI -import java.util.UUID class KotlinWebSocketSessionContextTest { companion object { @RegisterExtension - val test = QuarkusUnitTest() - .withApplicationRoot { jar -> + val test = + QuarkusUnitTest().withApplicationRoot { jar -> jar.addClasses(MyData::class.java, Endpoint::class.java, WSClient::class.java) } } - @Inject - lateinit var vertx: Vertx + @Inject lateinit var vertx: Vertx - @TestHTTPResource("endpoint") - lateinit var endpoint: URI + @TestHTTPResource("endpoint") lateinit var endpoint: URI @Test fun testEcho() { @@ -71,8 +69,7 @@ class KotlinWebSocketSessionContextTest { @WebSocket(path = "/endpoint") class Endpoint { - @Inject - lateinit var data: MyData + @Inject lateinit var data: MyData @OnTextMessage suspend fun echo(message: String): String { diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSuspendingClientTest.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSuspendingClientTest.kt index 9c4a8fdc9051a..704eb361fb20f 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSuspendingClientTest.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketSuspendingClientTest.kt @@ -9,30 +9,28 @@ import io.quarkus.websockets.next.WebSocket import io.quarkus.websockets.next.WebSocketClient import io.quarkus.websockets.next.WebSocketConnector import jakarta.inject.Inject +import java.net.URI +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit import kotlinx.coroutines.delay import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import java.net.URI -import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit class KotlinWebSocketSuspendingClientTest { companion object { @RegisterExtension - val test = QuarkusUnitTest() - .withApplicationRoot { jar -> + val test = + QuarkusUnitTest().withApplicationRoot { jar -> jar.addClasses(ServerEndpoint::class.java, ClientEndpoint::class.java) } } - @Inject - lateinit var connector: WebSocketConnector + @Inject lateinit var connector: WebSocketConnector - @TestHTTPResource("/") - lateinit var uri: URI + @TestHTTPResource("/") lateinit var uri: URI @Test fun test() { diff --git a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketTest.kt b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketTest.kt index d29dbcf931073..d621f8613bfe0 100644 --- a/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketTest.kt +++ b/extensions/websockets-next/deployment/src/test/kotlin/io/quarkus/websockets/next/test/kotlin/KotlinWebSocketTest.kt @@ -7,42 +7,42 @@ import io.vertx.core.Vertx import io.vertx.core.buffer.Buffer import io.vertx.core.json.JsonObject import jakarta.inject.Inject +import java.net.URI import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import java.net.URI class KotlinWebSocketTest { companion object { @RegisterExtension - val test = QuarkusUnitTest() - .withApplicationRoot { jar -> - jar.addClasses(Echo::class.java, EchoSuspend::class.java, EchoUni::class.java, - BinaryEcho::class.java, BinaryEchoSuspend::class.java, BinaryEchoUni::class.java, - Message::class.java, WSClient::class.java) + val test = + QuarkusUnitTest().withApplicationRoot { jar -> + jar.addClasses( + Echo::class.java, + EchoSuspend::class.java, + EchoUni::class.java, + BinaryEcho::class.java, + BinaryEchoSuspend::class.java, + BinaryEchoUni::class.java, + Message::class.java, + WSClient::class.java, + ) } } - @Inject - lateinit var vertx: Vertx + @Inject lateinit var vertx: Vertx - @TestHTTPResource("echo") - lateinit var echo: URI + @TestHTTPResource("echo") lateinit var echo: URI - @TestHTTPResource("echo-suspend") - lateinit var echoSuspend: URI + @TestHTTPResource("echo-suspend") lateinit var echoSuspend: URI - @TestHTTPResource("echo-uni") - lateinit var echoUni: URI + @TestHTTPResource("echo-uni") lateinit var echoUni: URI - @TestHTTPResource("binary-echo") - lateinit var binaryEcho: URI + @TestHTTPResource("binary-echo") lateinit var binaryEcho: URI - @TestHTTPResource("binary-echo-suspend") - lateinit var binaryEchoSuspend: URI + @TestHTTPResource("binary-echo-suspend") lateinit var binaryEchoSuspend: URI - @TestHTTPResource("binary-echo-uni") - lateinit var binaryEchoUni: URI + @TestHTTPResource("binary-echo-uni") lateinit var binaryEchoUni: URI @Test fun testEcho() {