com.diffplug.spotless:spotless-maven-plugin

Author: Vincent Potucek

.github/dependabot.yml

@@ -86,8 +86,7 @@ updates:
       - dependency-name: org.apache.maven.plugins:*
       - dependency-name: org.codehaus.mojo:*
       - dependency-name: io.fabric8:docker-maven-plugin
-      - dependency-name: net.revelc.code.formatter:formatter-maven-plugin
-      - dependency-name: net.revelc.code:impsort-maven-plugin
+      - dependency-name: com.diffplug.spotless:spotless-maven-plugin
       - dependency-name: eu.maveniverse.maven.njord:*
       # Narayana
       - dependency-name: org.jboss.narayana.jta:*

.gitignore

@@ -41,4 +41,4 @@ nb-configuration.xml
 .quarkus
 
 .goosehints
-.goose
+.goose

CONTRIBUTING.md

@@ -406,10 +406,6 @@ in `quarkus-parent` (root `pom.xml`).
 
 When contributing to Quarkus, it is recommended to respect the following rules.
 
-> **Note:** The `impsort-maven-plugin` uses the `.cache` directory on each module to speed up the build.
-> Because we have configured the plugin to store in a versioned directory, you may notice over time that the `.cache` directory grows in size. You can safely delete the `.cache` directory in each module to reclaim the space.
-> Running `./mvnw clean -Dclean-cache` automatically deletes that directory for you.
-
 **Contributing to an extension**
 
 When you contribute to an extension, after having applied your changes, run:

build-parent/pom.xml

@@ -723,46 +723,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>validate</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>no-format</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>net.revelc.code.formatter</groupId>
-                        <artifactId>formatter-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>process-sources</phase>
-                                <goals>
-                                    <goal>validate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>net.revelc.code</groupId>
-                        <artifactId>impsort-maven-plugin</artifactId>
-                        <configuration>
-                            <removeUnused>true</removeUnused>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>check-imports</id>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
 
         <profile>
             <id>format-kotlin</id>

devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java

@@ -1,8 +1,6 @@
 package io.quarkus.maven;
 
 import static io.quarkus.analytics.dto.segment.TrackEventType.DEV_MODE;
-import static io.quarkus.maven.QuarkusBootstrapMojo.CLOSE_BOOTSTRAPPED_APP_PARAM;
-import static io.quarkus.maven.QuarkusBootstrapMojo.MODE_PARAM;
 import static io.smallrye.common.expression.Expression.Flag.LENIENT_SYNTAX;
 import static io.smallrye.common.expression.Expression.Flag.NO_TRIM;
 import static java.util.Collections.emptyMap;

extensions/kubernetes/spi/src/test/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItemTest.java

@@ -13,10 +13,10 @@
  */
 package io.quarkus.kubernetes.spi;
 
-import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.create;
 import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.configmap;
 import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.secret;
 import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.var;
+import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.create;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 

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
 }

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)
+            }
     }
 }

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<MyEntity> {
-    }
+    companion object : PanacheCompanion<MyEntity> {}
 
     lateinit var name: String
 }

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) }
     }
 }

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())
     }
-}
+}

extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt

@@ -13,26 +13,26 @@ 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"))
     }
 
     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")
+            }
     }
 }

extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt

@@ -14,32 +14,36 @@ 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"))
     }
 
     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",
+                    )
+            }
     }
 }

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",
+                        )
                 }
     }
 }

extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt

@@ -15,26 +15,29 @@ 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"))
     }
 
     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",
+                    )
+            }
     }
 }

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<SecondEntity>
+    companion object : PanacheCompanion<SecondEntity>
+
     var name: String? = null
 }

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<MyEntity> {
-    }
+    companion object : PanacheCompanion<MyEntity> {}
 
     lateinit var name: String
 }

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())
     }
-}
+}