Skip to content

Commit bf76cb0

Browse files
author
Vincent Potucek
committed
PoC: integrate Eclipse Formatter Profile into Maven Spotless Plugin - apply
1 parent 990825b commit bf76cb0

File tree

33 files changed

+373
-380
lines changed

33 files changed

+373
-380
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
*/
1414
package io.quarkus.kubernetes.spi;
1515

16-
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.create;
1716
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.configmap;
1817
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.secret;
1918
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.var;
19+
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.create;
2020
import static org.junit.jupiter.api.Assertions.assertEquals;
2121
import static org.junit.jupiter.api.Assertions.assertNull;
2222

‎extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
44
import jakarta.persistence.Id
55

66
class DuplicateIdEntity : PanacheEntity() {
7-
@Id
8-
var customId: String? = null
7+
@Id var customId: String? = null
98
}

‎extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test
22

33
import io.quarkus.builder.BuildException
44
import io.quarkus.test.QuarkusUnitTest
5-
import org.jboss.shrinkwrap.api.spec.JavaArchive
65
import org.jboss.shrinkwrap.api.ShrinkWrap
6+
import org.jboss.shrinkwrap.api.spec.JavaArchive
77
import org.junit.jupiter.api.Assertions
88
import org.junit.jupiter.api.Test
99
import org.junit.jupiter.api.extension.RegisterExtension
@@ -17,11 +17,9 @@ class DuplicateIdEntityTest {
1717
companion object {
1818
@RegisterExtension
1919
@JvmField
20-
var runner = QuarkusUnitTest()
21-
.setExpectedException(BuildException::class.java)
22-
.setArchiveProducer {
23-
ShrinkWrap.create(JavaArchive::class.java)
24-
.addClasses(DuplicateIdEntity::class.java)
25-
}
20+
var runner =
21+
QuarkusUnitTest().setExpectedException(BuildException::class.java).setArchiveProducer {
22+
ShrinkWrap.create(JavaArchive::class.java).addClasses(DuplicateIdEntity::class.java)
23+
}
2624
}
2725
}

‎extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import jakarta.persistence.Entity
66

77
@Entity
88
class MyEntity : PanacheEntity() {
9-
companion object: PanacheCompanion<MyEntity> {
10-
}
9+
companion object : PanacheCompanion<MyEntity> {}
1110

1211
lateinit var name: String
1312
}

‎extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class NoConfigTest {
1515
companion object {
1616
@RegisterExtension
1717
@JvmField
18-
val config = QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) }
18+
val config =
19+
QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) }
1920
}
2021
}

‎extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.config
33
import io.quarkus.arc.Arc
44
import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.MyEntity
55
import io.quarkus.test.QuarkusUnitTest
6+
import jakarta.persistence.EntityManagerFactory
67
import org.jboss.shrinkwrap.api.spec.JavaArchive
78
import org.junit.jupiter.api.Assertions
89
import org.junit.jupiter.api.Test
910
import org.junit.jupiter.api.extension.RegisterExtension
10-
import jakarta.persistence.EntityManagerFactory
1111

1212
class ConfigEnabledFalseTest {
1313
companion object {
1414
@RegisterExtension
15-
val config = QuarkusUnitTest()
16-
.withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) }
17-
.withConfigurationResource("application-test.properties")
18-
// We shouldn't get any build error caused by Panache consuming build items that are not produced
19-
// See https://github.com/quarkusio/quarkus/issues/28842
20-
.overrideConfigKey("quarkus.hibernate-orm.enabled", "false")
15+
val config =
16+
QuarkusUnitTest()
17+
.withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) }
18+
.withConfigurationResource("application-test.properties")
19+
// We shouldn't get any build error caused by Panache consuming build items that are
20+
// not produced
21+
// See https://github.com/quarkusio/quarkus/issues/28842
22+
.overrideConfigKey("quarkus.hibernate-orm.enabled", "false")
2123
}
2224

2325
@Test
@@ -26,4 +28,4 @@ class ConfigEnabledFalseTest {
2628
// Just check that Hibernate ORM is disabled.
2729
Assertions.assertNull(Arc.container().instance(EntityManagerFactory::class.java).get())
2830
}
29-
}
31+
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ import org.junit.jupiter.api.extension.RegisterExtension
1313
class DefaultPersistenceUnitConfigTest {
1414
@Test
1515
fun panacheOperations() {
16-
/**
17-
* First entity operations
18-
*/
16+
/** First entity operations */
1917
RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
2018
RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
21-
/**
22-
* second entity operations
23-
*/
19+
/** second entity operations */
2420
RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
2521
RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
2622
}
2723

2824
companion object {
2925
@RegisterExtension
3026
@JvmField
31-
var runner = QuarkusUnitTest()
32-
.setArchiveProducer {
33-
ShrinkWrap.create(JavaArchive::class.java)
34-
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
35-
.addAsResource("application-test.properties", "application.properties")
36-
}
27+
var runner =
28+
QuarkusUnitTest().setArchiveProducer {
29+
ShrinkWrap.create(JavaArchive::class.java)
30+
.addClasses(
31+
FirstEntity::class.java,
32+
SecondEntity::class.java,
33+
PanacheTestResource::class.java,
34+
)
35+
.addAsResource("application-test.properties", "application.properties")
36+
}
3737
}
3838
}

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,36 @@ import org.junit.jupiter.api.extension.RegisterExtension
1414
class DefaultPersistenceUnitFileTest {
1515
@Test
1616
fun panacheOperations() {
17-
/**
18-
* First entity operations
19-
*/
17+
/** First entity operations */
2018
RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
2119
RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
22-
/**
23-
* second entity operations
24-
*/
20+
/** second entity operations */
2521
RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
2622
RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
2723
}
2824

2925
companion object {
3026
@RegisterExtension
3127
@JvmField
32-
var runner = QuarkusUnitTest()
33-
.setArchiveProducer {
34-
ShrinkWrap.create(JavaArchive::class.java)
35-
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
36-
.addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml")
37-
.addAsResource(StringAsset(
38-
"""
28+
var runner =
29+
QuarkusUnitTest().setArchiveProducer {
30+
ShrinkWrap.create(JavaArchive::class.java)
31+
.addClasses(
32+
FirstEntity::class.java,
33+
SecondEntity::class.java,
34+
PanacheTestResource::class.java,
35+
)
36+
.addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml")
37+
.addAsResource(
38+
StringAsset(
39+
"""
3940
quarkus.datasource.db-kind=h2
4041
quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
41-
""".trimIndent()),
42-
"application.properties")
43-
}
42+
"""
43+
.trimIndent()
44+
),
45+
"application.properties",
46+
)
47+
}
4448
}
4549
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,20 @@ class ErroneousPersistenceUnitConfigTest {
1818
companion object {
1919
@RegisterExtension
2020
@JvmField
21-
var runner = QuarkusUnitTest()
21+
var runner =
22+
QuarkusUnitTest()
2223
.setExpectedException(IllegalStateException::class.java)
2324
.setArchiveProducer {
2425
ShrinkWrap.create(JavaArchive::class.java)
25-
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
26-
.addAsResource("application-erroneous-multiple-persistence-units.properties", "application.properties")
26+
.addClasses(
27+
FirstEntity::class.java,
28+
SecondEntity::class.java,
29+
PanacheTestResource::class.java,
30+
)
31+
.addAsResource(
32+
"application-erroneous-multiple-persistence-units.properties",
33+
"application.properties",
34+
)
2735
}
2836
}
2937
}

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,29 @@ class MultiplePersistenceUnitConfigTest {
1515
@Test
1616
@Disabled("fix in a separate PR")
1717
fun panacheOperations() {
18-
/**
19-
* First entity operations
20-
*/
18+
/** First entity operations */
2119
RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
2220
RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
23-
/**
24-
* second entity operations
25-
*/
21+
/** second entity operations */
2622
RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
2723
RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
2824
}
2925

3026
companion object {
3127
@RegisterExtension
3228
@JvmField
33-
var runner = QuarkusUnitTest()
34-
.setArchiveProducer {
35-
ShrinkWrap.create(JavaArchive::class.java)
36-
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
37-
.addAsResource("application-multiple-persistence-units.properties", "application.properties")
38-
}
29+
var runner =
30+
QuarkusUnitTest().setArchiveProducer {
31+
ShrinkWrap.create(JavaArchive::class.java)
32+
.addClasses(
33+
FirstEntity::class.java,
34+
SecondEntity::class.java,
35+
PanacheTestResource::class.java,
36+
)
37+
.addAsResource(
38+
"application-multiple-persistence-units.properties",
39+
"application.properties",
40+
)
41+
}
3942
}
4043
}

0 commit comments

Comments
 (0)