[prone] Apply NonStaticImport & StaticImport

Author: Vincent Potucek

gradle/error-prone.gradle

@@ -29,8 +29,6 @@ tasks.withType(JavaCompile).configureEach {
 				)
 		error(
 				'AmbiguousJsonCreator',
-//				'NonStaticImport',
-//				'StaticImport',
 				'AssertJNullnessAssertion',
 				'AutowiredConstructor',
 				'CanonicalAnnotationSyntax',
@@ -46,10 +44,12 @@ tasks.withType(JavaCompile).configureEach {
 				'MockitoMockClassReference',
 				'MockitoStubbing',
 				'NestedOptionals',
+				'NonStaticImport',
 				'PrimitiveComparison',
 				'RedundantStringConversion',
 				'RedundantStringEscape',
 				'SelfAssignment',
+				'StaticImport',
 				'StringJoin',
 				'StringJoining',
 				)
@@ -80,12 +80,12 @@ tasks.withType(JavaCompile).configureEach {
 					'MockitoStubbing,' +
 					'NestedOptionals,' +
 					'NonStaticImport,' +
-					'StaticImport,' +
 					'PrimitiveComparison,' +
 					'RedundantStringConversion,' +
 					'RedundantStringEscape,' +
 					'SelfAssignment,' +
 					'Slf4jLogStatement,' +
+					'StaticImport,' +
 					'StringJoin,' +
 					'StringJoining,' +
 					'TimeZoneUsage,'

lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java

@@ -15,12 +15,13 @@
  */
 package com.diffplug.spotless.extra.glue.cdt;
 
+import static java.util.stream.Collectors.toMap;
+
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.cdt.core.formatter.CodeFormatter;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -32,7 +33,7 @@ public class EclipseCdtFormatterStepImpl {
 
 	public EclipseCdtFormatterStepImpl(Properties settings) throws Exception {
 		Stream<Entry<Object, Object>> stream = settings.entrySet().stream();
-		Map<String, String> settingsMap = stream.collect(Collectors.toMap(
+		Map<String, String> settingsMap = stream.collect(toMap(
 				e -> String.valueOf(e.getKey()),
 				e -> String.valueOf(e.getValue())));
 		codeFormatter = org.eclipse.cdt.core.ToolFactory.createDefaultCodeFormatter(settingsMap);

lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java

@@ -15,6 +15,12 @@
  */
 package com.diffplug.spotless.extra.glue.groovy;
 
+import static java.util.Collections.synchronizedList;
+
+import dev.equo.solstice.NestedJars;
+import dev.equo.solstice.ShimIdeBootstrapServices;
+import dev.equo.solstice.Solstice;
+import dev.equo.solstice.p2.CacheLocations;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -24,7 +30,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import org.codehaus.groovy.eclipse.GroovyLogManager;
 import org.codehaus.groovy.eclipse.IGroovyLogger;
 import org.codehaus.groovy.eclipse.TraceCategory;
@@ -43,11 +48,6 @@
 import org.eclipse.text.edits.TextEdit;
 import org.osgi.framework.Constants;
 
-import dev.equo.solstice.NestedJars;
-import dev.equo.solstice.ShimIdeBootstrapServices;
-import dev.equo.solstice.Solstice;
-import dev.equo.solstice.p2.CacheLocations;
-
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	static {
@@ -111,7 +111,7 @@ public GroovyErrorListener() {
 			 * We need a synchronized list here, in case multiple instantiations
 			 * run in parallel.
 			 */
-			errors = Collections.synchronizedList(new ArrayList<>());
+			errors = synchronizedList(new ArrayList<>());
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.addLogListener(this);
 			synchronized (GroovyLogManager.manager) {

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

@@ -15,12 +15,13 @@
  */
 package com.diffplug.spotless.extra.glue.jdt;
 
+import static java.util.stream.Collectors.toMap;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
-
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.internal.compiler.env.IModule;
 import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
@@ -37,7 +38,7 @@ public class EclipseJdtFormatterStepImpl {
 	private final EclipseJdtSortMembers.SortProperties sortProperties;
 
 	public EclipseJdtFormatterStepImpl(Properties formatterSettings, Map<String, String> sortProperties) {
-		Map<String, String> options = formatterSettings.entrySet().stream().collect(Collectors.toMap(
+		Map<String, String> options = formatterSettings.entrySet().stream().collect(toMap(
 				e -> String.valueOf(e.getKey()),
 				e -> String.valueOf(e.getValue()),
 				(prev, next) -> next,

lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java

@@ -15,6 +15,17 @@
  */
 package com.diffplug.spotless.extra;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
+
+import com.diffplug.common.base.Errors;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterProperties;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.SerializedFunction;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -26,15 +37,6 @@
 import java.util.Objects;
 import java.util.Properties;
 
-import com.diffplug.common.base.Errors;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterProperties;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.JarState;
-import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.SerializedFunction;
-
 /**
  * Generic Eclipse based formatter step {@link State} builder.
  */
@@ -69,10 +71,10 @@ public EclipseBasedStepBuilder(String formatterName, Provisioner jarProvisioner,
 
 	/** Initialize valid default configuration, taking latest version */
 	public EclipseBasedStepBuilder(String formatterName, String formatterStepExt, Provisioner jarProvisioner, SerializedFunction<State, FormatterFunc> stateToFormatter) {
-		this.formatterName = Objects.requireNonNull(formatterName, "formatterName");
-		this.formatterStepExt = Objects.requireNonNull(formatterStepExt, "formatterStepExt");
-		this.jarProvisioner = Objects.requireNonNull(jarProvisioner, "jarProvisioner");
-		this.stateToFormatter = Objects.requireNonNull(stateToFormatter, "stateToFormatter");
+		this.formatterName = requireNonNull(formatterName, "formatterName");
+		this.formatterStepExt = requireNonNull(formatterStepExt, "formatterStepExt");
+		this.jarProvisioner = requireNonNull(jarProvisioner, "jarProvisioner");
+		this.stateToFormatter = requireNonNull(stateToFormatter, "stateToFormatter");
 		formatterVersion = "No version set"; //Will fail creation
 	}
 
@@ -91,7 +93,7 @@ public void setVersion(String version) {
 			throw new IllegalArgumentException("No such version " + version + ", expected at " + url);
 		}
 		byte[] content = toByteArray(depsFile);
-		String allLines = new String(content, StandardCharsets.UTF_8);
+		String allLines = new String(content, UTF_8);
 		String[] lines = allLines.split("\n");
 		dependencies.clear();
 		for (String line : lines) {

lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java

@@ -15,20 +15,9 @@
  */
 package com.diffplug.spotless.extra;
 
+import static java.util.Objects.requireNonNullElse;
 import static java.util.stream.Collectors.toMap;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-
-import javax.annotation.Nullable;
-
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
@@ -37,13 +26,22 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.SerializedFunction;
-
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.p2.CacheLocations;
 import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
 import dev.equo.solstice.p2.P2QueryCache;
 import dev.equo.solstice.p2.P2QueryResult;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import javax.annotation.Nullable;
 
 /**
  * Generic Eclipse based formatter step {@link State} builder.
@@ -190,8 +188,8 @@ static class EquoStep implements Serializable {
 				ImmutableMap<String, String> stepProperties) {
 
 			this.semanticVersion = semanticVersion;
-			this.settingProperties = Objects.requireNonNullElse(settingProperties, new ArrayList<>());
-			this.settingXml = Objects.requireNonNullElse(settingXml, new ArrayList<>());
+			this.settingProperties = requireNonNullElse(settingProperties, new ArrayList<>());
+			this.settingXml = requireNonNullElse(settingXml, new ArrayList<>());
 			this.settingsPromise = settingsPromise;
 			this.jarPromise = jarPromise;
 			this.stepProperties = stepProperties;
@@ -218,8 +216,8 @@ public static class State implements Serializable {
 		public State(String semanticVersion, JarState jarState, List<String> settingProperties, List<String> settingXml, FileSignature settingsFiles, ImmutableMap<String, String> stepProperties) {
 			this.semanticVersion = semanticVersion;
 			this.jarState = jarState;
-			this.settingProperties = Objects.requireNonNullElse(settingProperties, new ArrayList<>());
-			this.settingXml = Objects.requireNonNullElse(settingXml, new ArrayList<>());
+			this.settingProperties = requireNonNullElse(settingProperties, new ArrayList<>());
+			this.settingXml = requireNonNullElse(settingXml, new ArrayList<>());
 			this.settingsFiles = settingsFiles;
 			this.stepProperties = stepProperties;
 		}

lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java

@@ -15,6 +15,17 @@
  */
 package com.diffplug.spotless.extra;
 
+import static java.util.Collections.emptyList;
+import static java.util.Objects.requireNonNull;
+
+import com.diffplug.common.base.Errors;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.LazyForwardingEquality;
+import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.extra.GitWorkarounds.RepositorySpecificResolver;
+import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree;
+import com.googlecode.concurrenttrees.radix.node.concrete.DefaultCharSequenceNodeFactory;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -27,9 +38,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.eclipse.jgit.attributes.Attribute;
 import org.eclipse.jgit.attributes.AttributesNode;
 import org.eclipse.jgit.attributes.AttributesRule;
@@ -45,17 +54,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree;
-import com.googlecode.concurrenttrees.radix.node.concrete.DefaultCharSequenceNodeFactory;
-
-import com.diffplug.common.base.Errors;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.LazyForwardingEquality;
-import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.extra.GitWorkarounds.RepositorySpecificResolver;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Uses <a href="https://git-scm.com/docs/gitattributes">.gitattributes</a> to determine
  * the appropriate line ending. Falls back to the {@code core.eol} and {@code core.autocrlf} properties in the
@@ -120,8 +118,8 @@ static class RelocatablePolicy extends LazyForwardingEquality<CachedEndings> imp
 		transient Supplier<Iterable<File>> toFormat;
 
 		RelocatablePolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
-			this.projectDir = Objects.requireNonNull(projectDir, "projectDir");
-			this.toFormat = Objects.requireNonNull(toFormat, "toFormat");
+			this.projectDir = requireNonNull(projectDir, "projectDir");
+			this.toFormat = requireNonNull(toFormat, "toFormat");
 		}
 
 		@Override
@@ -260,10 +258,10 @@ static final class Runtime {
 		final String defaultEnding;
 
 		private Runtime(List<AttributesRule> infoRules, @Nullable File workTree, Config config, List<AttributesRule> globalRules) {
-			this.infoRules = Objects.requireNonNull(infoRules);
+			this.infoRules = requireNonNull(infoRules);
 			this.workTree = workTree;
 			this.defaultEnding = findDefaultLineEnding(config).str();
-			this.globalRules = Objects.requireNonNull(globalRules);
+			this.globalRules = requireNonNull(globalRules);
 		}
 
 		private static final String KEY_EOL = "eol";
@@ -389,7 +387,7 @@ private static List<AttributesRule> parseRules(@Nullable File file) {
 				LOGGER.warn("Problem parsing {}", file.getAbsolutePath(), e);
 			}
 		}
-		return Collections.emptyList();
+		return emptyList();
 	}
 
 	/** Parses an attribute value from a list of rules, returning null if there is no match for the given key. */

lib-extra/src/main/java/com/diffplug/spotless/extra/LibExtraPreconditions.java

@@ -15,16 +15,18 @@
  */
 package com.diffplug.spotless.extra;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Objects;
 
 final class LibExtraPreconditions {
 	// prevent direct instantiation
 	private LibExtraPreconditions() {}
 
 	static <T, I extends Iterable<T>> I requireElementsNonNull(I elements) {
-		Objects.requireNonNull(elements);
+		requireNonNull(elements);
 		for (Object element : elements) {
-			Objects.requireNonNull(element);
+			requireNonNull(element);
 		}
 		return elements;
 	}