[prone] diable warning CollectorMutability, fix warning MissingOverride

- #2745

Signed-off-by: Vincent Potucek <[email protected]>

Author: Vincent Potucek

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  sanityCheck:
+  sanity-check:
     runs-on: ubuntu-latest
     env:
       buildcacheuser: ${{ secrets.BUILDCACHE_USER }}
@@ -35,7 +35,7 @@ jobs:
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
   build:
-    needs: sanityCheck
+    needs: sanity-check
     strategy:
       fail-fast: false
       matrix:
@@ -107,7 +107,7 @@ jobs:
   # Status check that is required in branch protection rules.
   final-status:
     needs:
-      - sanityCheck
+      - sanity-check
       - build
     runs-on: ubuntu-latest
     if: always()

gradle/error-prone.gradle

@@ -1,16 +1,27 @@
-apply plugin: 'net.ltgt.errorprone'
+import static java.lang.System.getenv
 
-dependencies {
-	errorprone('com.google.errorprone:error_prone_core:2.42.0')
-	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.26.0')
-}
+apply plugin: 'net.ltgt.errorprone'
 
 tasks.withType(JavaCompile).configureEach {
 	options.errorprone {
-		disable( // consider fix, or reasoning.
+		disableAllWarnings = true // https://github.com/diffplug/spotless/issues/2745 https://github.com/google/error-prone/issues/5365
+		disable(
+				// consider fix, or reasoning.
+				'AnnotateFormatMethod', // We don`t want to use ErrorProne's annotations.
+				'CheckReturnValue', // We don`t want to use ErrorProne's annotations.
+				'CollectorMutability', // for freedom global exclude, might whitelist. https://github.com/diffplug/spotless/pull/2744#discussion_r2553042130
+				'DoNotCallSuggester', // We don`t want to use ErrorProne's annotations.
 				'FunctionalInterfaceMethodChanged',
+				'ImmutableEnumChecker', // We don`t want to use ErrorProne's annotations.
+				'InlineMeSuggester', // We don`t want to use ErrorProne's annotations.
 				'JavaxInjectOnAbstractMethod',
 				'OverridesJavaxInjectableMethod',
+				'ReturnValueIgnored', // We don`t want to use ErrorProne's annotations.
+				// bug
+				'FieldMissingNullable',
+				'Slf4jLogStatement',
+				'Slf4jLoggerDeclaration',
+				'Var'
 				)
 		error(
 				'AmbiguousJsonCreator',
@@ -26,6 +37,7 @@ tasks.withType(JavaCompile).configureEach {
 				'IdentityConversion',
 				'ImmutablesSortedSetComparator',
 				'IsInstanceLambdaUsage',
+				'MissingOverride',
 				'MockitoMockClassReference',
 				'MockitoStubbing',
 				'NestedOptionals',
@@ -41,10 +53,22 @@ tasks.withType(JavaCompile).configureEach {
 				)
 		// bug: this only happens when the file is dirty.
 		// might be an up2date (caching) issue, as file is currently in corrupt state.
-		// ForbidGradleInternal(import org.gradle.api.internal.project.ProjectInternal;)
-		errorproneArgs.add('-XepExcludedPaths:' +
-				'.*/SelfTest.java|' +
-				'.*/GradleIntegrationHarness.java'
+		// ForbidGradleInternal(import
+		excludedPaths.set(
+				'.*/GradleIntegrationHarness.java|'+
+				'.*/SelfTest.java'
 				)
+		if (!getenv().containsKey('CI') && getenv('IN_PLACE')?.toBoolean()) {
+			errorproneArgs.addAll(
+					'-XepPatchLocation:IN_PLACE', // how to prevent/ignore? @CanIgnoreReturnValue
+					'-XepPatchChecks:' +
+					'MissingOverride'
+					)
+		}
 	}
 }
+
+dependencies {
+	errorprone('com.google.errorprone:error_prone_core:2.42.0')
+	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.26.0')
+}

lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java

@@ -98,64 +98,84 @@ private static class Buffer implements IBuffer {
 			this.contents = contents;
 		}
 
+		@Override
 		public void addBufferChangedListener(IBufferChangedListener listener) {}
 
+		@Override
 		public void append(char[] text) {}
 
+		@Override
 		public void append(String text) {}
 
+		@Override
 		public void close() {}
 
+		@Override
 		public char getChar(int position) {
 			return '\u0000';
 		}
 
+		@Override
 		public char[] getCharacters() {
 			return contents.toCharArray();
 		}
 
+		@Override
 		public String getContents() {
 			return contents;
 		}
 
+		@Override
 		public int getLength() {
 			return 0;
 		}
 
+		@Override
 		public IOpenable getOwner() {
 			return null;
 		}
 
+		@Override
 		public String getText(int offset, int length) {
 			return null;
 		}
 
+		@Override
 		public IResource getUnderlyingResource() {
 			return null;
 		}
 
+		@Override
 		public boolean hasUnsavedChanges() {
 			return false;
 		}
 
+		@Override
 		public boolean isClosed() {
 			return false;
 		}
 
+		@Override
 		public boolean isReadOnly() {
 			return true;
 		}
 
+		@Override
 		public void removeBufferChangedListener(IBufferChangedListener listener) {}
 
+		@Override
 		public void replace(int position, int length, char[] text) {}
 
+		@Override
 		public void replace(int position, int length, String text) {}
 
+		@Override
 		public void save(IProgressMonitor progress, boolean force) {}
 
+		@Override
 		public void setContents(char[] contents) {}
 
+		@Override
 		public void setContents(String contents) {
 			this.contents = contents;
 		}

lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ public JacksonYamlFormatterFunc(JacksonYamlConfig jacksonConfig) {
 		}
 	}
 
+	@Override
 	protected JsonFactory makeJsonFactory() {
 		YAMLFactoryBuilder yamlFactoryBuilder = new YAMLFactoryBuilder(new YAMLFactory());