Merge branch 'hibernate:main' into HV-2053

Author: Maharramoff

.git-blame-ignore-revs

@@ -2,3 +2,9 @@
 0caebd08d86a7b95f4ad654bce952b80f6f99327
 7fe0c66d69ae352d9c86da7280b9d06e25f38c9e
 38b56206a9db2e0b93f5da122735a725d89ba516
+# Switch to spotless maven plugin and additional code reformatting:
+ad925a4974454fa36cce296ea18efd9bade21d7c
+8dc7102745b44020769fb14e8d9c724820eb755b
+26e305f5fbeed20c23ea05ef2b2b1e60993d9a17
+a96de990009411ced75eef8c1db0aafc6661b861
+86381b010be89bc801b745aeda40f1541fbcf664

CONTRIBUTING.md

@@ -59,14 +59,33 @@ Code away...
 
 ## Formatting rules and style conventions
 
-The Hibernate family projects share the same style conventions. You can download the appropriate configuration
-files for your IDE from [the IDE codestyles GitHub repository](https://github.com/hibernate/hibernate-ide-codestyles).
+The project build comes with preconfigured plugins that apply automatic formatting/sorting of imports and
+a set of other checks. Running a simple build should automatically apply all the formatting rules and checks:
 
-You can very quickly check that you have respected the formatting rules by running Checkstyle:
 ```shell
-mvn checkstyle:check
+mvn clean verify
 ```
 
+Alternatively, if only applying the formatting is required, you could run the next command:
+
+```shell
+mvn spotless:apply checkstyle:check
+```
+
+---
+**NOTE**: running the above command requires the `org.hibernate.validator:hibernate-validator-build-config`
+being available. If it is a first time building the project you may need to execute:
+```shell
+mvn clean install -am -pl build/build-config
+```
+---
+
+The project comes with formatting files located in:
+- [hibernate_validator_style.xml](build/build-config/src/main/resources/hibernate_validator_style.xml)
+- [hibernate_validator_style.importorder](build/build-config/src/main/resources/hibernate_validator_style.importorder)
+
+These files can be used in the IDE if applying formatting as-you-code within the IDE is something you'd prefer.
+
 ## Commit
 
 * Make commits of logical units.

annotation-processor/pom.xml

@@ -83,14 +83,6 @@
                     <proc>none</proc>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>de.thetaphi</groupId>
-                <artifactId>forbiddenapis</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>

annotation-processor/src/main/java/org/hibernate/validator/ap/internal/AbstractElementVisitor.java

@@ -62,4 +62,3 @@ else if ( issue.isWarning() ) {
 		messager.reportWarnings( warnings );
 	}
 }
-

annotation-processor/src/main/java/org/hibernate/validator/ap/internal/checks/GetterCheck.java

@@ -63,4 +63,3 @@ private boolean isJavaBeanGetterName(String methodName) {
 	}
 
 }
-

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/BazDefaultGroupSequenceProvider.java

@@ -16,5 +16,5 @@
  */
 public interface BazDefaultGroupSequenceProvider extends DefaultGroupSequenceProvider<Baz> {
 	@Override
-	List<Class<?>> getValidationGroups(GroupSequenceProviderDefinition.Baz object);
+	List<Class<?>> getValidationGroups(Class<?> klass, GroupSequenceProviderDefinition.Baz object);
 }

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/FooBarBazDefaultGroupSequenceProvider.java

@@ -20,7 +20,7 @@ public FooBarBazDefaultGroupSequenceProvider(FooBarBaz fooBarBaz) {
 	}
 
 	@Override
-	public List<Class<?>> getValidationGroups(FooBarBaz object) {
+	public List<Class<?>> getValidationGroups(Class<?> klass, FooBarBaz object) {
 		return null;
 	}
 }

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/FooBarDefaultGroupSequenceProvider.java

@@ -17,5 +17,5 @@
 public abstract class FooBarDefaultGroupSequenceProvider implements DefaultGroupSequenceProvider<FooBar> {
 
 	@Override
-	public abstract List<Class<?>> getValidationGroups(FooBar object);
+	public abstract List<Class<?>> getValidationGroups(Class<?> klass, FooBar object);
 }

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/FooDefaultGroupSequenceProvider.java

@@ -17,7 +17,7 @@
 public class FooDefaultGroupSequenceProvider implements DefaultGroupSequenceProvider<Foo> {
 
 	@Override
-	public List<Class<?>> getValidationGroups(Foo object) {
+	public List<Class<?>> getValidationGroups(Class<?> klass, Foo object) {
 		return null;
 	}
 }

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/QuxDefaultGroupSequenceProvider.java

@@ -17,7 +17,7 @@
 public class QuxDefaultGroupSequenceProvider implements DefaultGroupSequenceProvider<Qux> {
 
 	@Override
-	public List<Class<?>> getValidationGroups(Qux object) {
+	public List<Class<?>> getValidationGroups(Class<?> klass, Qux object) {
 		return null;
 	}
 }