Skip to content

Commit 5783bdd

Browse files
Vincent PotucekPankraz76
authored andcommitted
PoC: integrate Eclipse Formatter Profile into Maven Spotless Plugin
1 parent e58a5f3 commit 5783bdd

File tree

21 files changed

+47
-42
lines changed

21 files changed

+47
-42
lines changed

build-parent/pom.xml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,47 @@
677677
<artifactId>smallrye-certificate-generator-maven-plugin</artifactId>
678678
<version>${smallrye-certificate-generator.version}</version>
679679
</plugin>
680+
<plugin>
681+
<groupId>com.diffplug.spotless</groupId>
682+
<artifactId>spotless-maven-plugin</artifactId>
683+
<version>2.44.4</version>
684+
<configuration>
685+
<java>
686+
<removeUnusedImports />
687+
<formatAnnotations />
688+
<eclipse>
689+
<file>${maven.multiModuleProjectDirectory}/independent-projects/ide-config/src/main/resources/eclipse-format.xml</file>
690+
</eclipse>
691+
<importOrder>
692+
<file>${maven.multiModuleProjectDirectory}/independent-projects/ide-config/src/main/resources/eclipse.importorder</file>
693+
</importOrder>
694+
</java>
695+
</configuration>
696+
<executions>
697+
<!-- <execution>-->
698+
<!-- <id>spotless-check</id>-->
699+
<!-- <goals>-->
700+
<!-- <goal>apply</goal>-->
701+
<!-- </goals>-->
702+
<!-- <phase>verify</phase>-->
703+
<!-- </execution>-->
704+
<execution>
705+
<id>spotless-apply</id>
706+
<goals>
707+
<goal>apply</goal>
708+
</goals>
709+
<phase>verify</phase>
710+
</execution>
711+
</executions>
712+
</plugin>
680713
</plugins>
681714
</pluginManagement>
715+
<plugins>
716+
<plugin>
717+
<groupId>com.diffplug.spotless</groupId>
718+
<artifactId>spotless-maven-plugin</artifactId>
719+
</plugin>
720+
</plugins>
682721
</build>
683722

684723
<profiles>
@@ -779,7 +818,6 @@
779818
<plugin>
780819
<groupId>com.diffplug.spotless</groupId>
781820
<artifactId>spotless-maven-plugin</artifactId>
782-
<version>2.35.0</version>
783821
<executions>
784822
<execution>
785823
<id>format-kotlin</id>

extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/bd/ClientBlockingDeadlineTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.quarkus.grpc.client.bd;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
43
import static org.junit.jupiter.api.Assertions.assertNotNull;
54

65
import org.jboss.shrinkwrap.api.ShrinkWrap;

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/proxies/ProxyDefinitions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.hibernate.internal.util.ReflectHelper;
1414
import org.hibernate.internal.util.collections.ArrayHelper;
1515
import org.hibernate.mapping.PersistentClass;
16-
import org.hibernate.proxy.pojo.ProxyFactoryHelper;
1716
import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
1817
import org.jboss.logging.Logger;
1918

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/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/keys/KeyCommands.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.time.Duration;
44
import java.time.Instant;
55
import java.util.List;
6-
import java.util.Set;
76

87
import io.quarkus.redis.datasource.RedisCommands;
98

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/keys/ReactiveKeyCommands.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.time.Duration;
44
import java.time.Instant;
55
import java.util.List;
6-
import java.util.Set;
76

87
import io.quarkus.redis.datasource.ReactiveRedisCommands;
98
import io.smallrye.mutiny.Uni;

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/search/SummarizeArgs.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static io.quarkus.redis.runtime.datasource.Validation.notNullOrBlank;
44
import static io.quarkus.redis.runtime.datasource.Validation.notNullOrEmpty;
5-
import static io.smallrye.mutiny.helpers.ParameterValidation.doesNotContainNull;
65
import static io.smallrye.mutiny.helpers.ParameterValidation.positive;
76

87
import java.util.ArrayList;

extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/AutoSuggestCommandsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.quarkus.redis.datasource;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.awaitility.Awaitility.await;
54

65
import java.time.Duration;
76
import java.util.List;

extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/BitMapCommandsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.quarkus.redis.datasource;
22

3+
import static io.quarkus.redis.datasource.bitmap.BitFieldArgs.OverflowType.WRAP;
34
import static io.quarkus.redis.datasource.bitmap.BitFieldArgs.offset;
45
import static io.quarkus.redis.datasource.bitmap.BitFieldArgs.signed;
56
import static io.quarkus.redis.datasource.bitmap.BitFieldArgs.typeWidthBasedOffset;
67
import static io.quarkus.redis.datasource.bitmap.BitFieldArgs.unsigned;
7-
import static io.quarkus.redis.datasource.bitmap.BitFieldArgs.OverflowType.WRAP;
88
import static org.assertj.core.api.Assertions.assertThat;
99
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1010

extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/inheritance/AbstractImplMethodSecuredTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static io.quarkus.resteasy.test.security.inheritance.SubPaths.SUB_IMPL_ON_INTERFACE;
2222
import static io.quarkus.resteasy.test.security.inheritance.SubPaths.SUB_IMPL_ON_PARENT;
2323
import static io.restassured.RestAssured.given;
24-
import static org.hamcrest.Matchers.in;
2524
import static org.hamcrest.Matchers.is;
2625

2726
import org.jboss.shrinkwrap.api.asset.StringAsset;

0 commit comments

Comments
 (0)