[openrewrite] add EqualsAvoidsNull (#2650 progress on #2634)

nedtwigg · web-flow · commit c9973799564a · 2025-09-26T13:54:49.000-07:00
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
@@ -23,8 +23,8 @@ jobs:
           script: |
             try {
               // Get username - prioritize sender (the person who triggered the event)
-              const username = github.event.sender?.login ||
-                              github.event.comment?.user?.login;
+              const username = github.event?.sender?.login ||
+                              github.event?.comment?.user?.login;
 
               if (!username) {
                 console.log('Could not determine username from event payload');
diff --git a/gradle/rewrite.gradle b/gradle/rewrite.gradle
@@ -4,18 +4,26 @@ rewrite {
 	activeRecipe(
 			'org.openrewrite.gradle.GradleBestPractices',
 			'org.openrewrite.java.RemoveUnusedImports',
+			'org.openrewrite.java.format.RemoveTrailingWhitespace',
 			'org.openrewrite.java.migrate.UpgradeToJava17',
 			'org.openrewrite.java.recipes.JavaRecipeBestPractices',
 			'org.openrewrite.java.recipes.RecipeTestingBestPractices',
 			'org.openrewrite.java.security.JavaSecurityBestPractices',
+			'org.openrewrite.staticanalysis.EqualsAvoidsNull',
 			'org.openrewrite.staticanalysis.JavaApiBestPractices',
 			'org.openrewrite.staticanalysis.LowercasePackage',
 			'org.openrewrite.staticanalysis.MissingOverrideAnnotation',
 			'org.openrewrite.staticanalysis.ModifierOrder',
 			'org.openrewrite.staticanalysis.NoFinalizer',
+			'org.openrewrite.staticanalysis.NoToStringOnStringType',
+			'org.openrewrite.staticanalysis.NoValueOfOnStringType',
 			'org.openrewrite.staticanalysis.RemoveUnusedLocalVariables',
 			'org.openrewrite.staticanalysis.RemoveUnusedPrivateFields',
 			'org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods',
+			'org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources',
+			'org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments',
+			'org.openrewrite.staticanalysis.UnnecessaryParentheses',
+			'org.openrewrite.staticanalysis.UnnecessaryReturnAsLastStatement',
 			'tech.picnic.errorprone.refasterrules.BigDecimalRulesRecipes',
 			'tech.picnic.errorprone.refasterrules.CharSequenceRulesRecipes',
 			'tech.picnic.errorprone.refasterrules.ClassRulesRecipes',
@@ -28,6 +36,9 @@ rewrite {
 			'tech.picnic.errorprone.refasterrules.PrimitiveRulesRecipes',
 			'tech.picnic.errorprone.refasterrules.StreamRulesRecipes',
 			'tech.picnic.errorprone.refasterrules.TimeRulesRecipes'
+			//'org.openrewrite.staticanalysis.CodeCleanup', bug
+			//'org.openrewrite.staticanalysis.CommonStaticAnalysis', bug
+			//'org.openrewrite.staticanalysis.UnnecessaryThrows', bug
 			)
 	exclusions.addAll(
 			'**_gradle_node_plugin_example_**',
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 DiffPlug
+ * Copyright 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -368,8 +368,8 @@ private boolean isSortPreserved(BodyDeclaration bodyDeclaration) {
 	}
 
 	private int preserveRelativeOrder(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2) {
-		int value1 = ((Integer) bodyDeclaration1.getProperty(CompilationUnitSorter.RELATIVE_ORDER));
-		int value2 = ((Integer) bodyDeclaration2.getProperty(CompilationUnitSorter.RELATIVE_ORDER));
+		int value1 = (Integer) bodyDeclaration1.getProperty(CompilationUnitSorter.RELATIVE_ORDER);
+		int value2 = (Integer) bodyDeclaration2.getProperty(CompilationUnitSorter.RELATIVE_ORDER);
 		return value1 - value2;
 	}
 
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 DiffPlug
+ * Copyright 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ && isInterfaceOrAnnotationMember(bodyDeclaration))
 	}
 
 	private static boolean isPackageVisible(BodyDeclaration bodyDeclaration) {
-		return (!isPrivate(bodyDeclaration) && !isProtected(bodyDeclaration) && !isPublic(bodyDeclaration));
+		return !isPrivate(bodyDeclaration) && !isProtected(bodyDeclaration) && !isPublic(bodyDeclaration);
 	}
 
 	private static boolean isPrivate(BodyDeclaration bodyDeclaration) {
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -154,7 +154,7 @@ static class CachedEndings implements Serializable {
 
 		CachedEndings(File projectDir, Runtime runtime, Iterable<File> toFormat) {
 			String rootPath = FileSignature.pathNativeToUnix(projectDir.getAbsolutePath());
-			rootDir = rootPath.equals("/") ? rootPath : rootPath + "/";
+			rootDir = "/".equals(rootPath) ? rootPath : rootPath + "/";
 			defaultEnding = runtime.defaultEnding;
 			for (File file : toFormat) {
 				String ending = runtime.getEndingFor(file);
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -69,8 +69,8 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce
 						return (String) method.invoke(formatter, input);
 					} catch (InvocationTargetException exceptionWrapper) {
 						Throwable throwable = exceptionWrapper.getTargetException();
-						Exception exception = (throwable instanceof Exception e) ? e : null;
-						throw (null == exception) ? exceptionWrapper : exception;
+						Exception exception = throwable instanceof Exception e ? e : null;
+						throw null == exception ? exceptionWrapper : exception;
 					}
 				});
 	}
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java
@@ -97,8 +97,8 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce
 						return (String) method.invoke(formatter, input);
 					} catch (InvocationTargetException exceptionWrapper) {
 						Throwable throwable = exceptionWrapper.getTargetException();
-						Exception exception = (throwable instanceof Exception e) ? e : null;
-						throw (null == exception) ? exceptionWrapper : exception;
+						Exception exception = throwable instanceof Exception e ? e : null;
+						throw null == exception ? exceptionWrapper : exception;
 					}
 				});
 	}
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java
@@ -67,8 +67,8 @@ private static FormatterFunc applyWithoutFile(String className, EclipseBasedStep
 				return (String) method.invoke(formatter, input);
 			} catch (InvocationTargetException exceptionWrapper) {
 				Throwable throwable = exceptionWrapper.getTargetException();
-				Exception exception = (throwable instanceof Exception e) ? e : null;
-				throw (null == exception) ? exceptionWrapper : exception;
+				Exception exception = throwable instanceof Exception e ? e : null;
+				throw null == exception ? exceptionWrapper : exception;
 			}
 		};
 	}
@@ -85,8 +85,8 @@ public String applyWithFile(String unix, File file) throws Exception {
 					return (String) method.invoke(formatter, unix, file.getAbsolutePath());
 				} catch (InvocationTargetException exceptionWrapper) {
 					Throwable throwable = exceptionWrapper.getTargetException();
-					Exception exception = (throwable instanceof Exception e) ? e : null;
-					throw (null == exception) ? exceptionWrapper : exception;
+					Exception exception = throwable instanceof Exception e ? e : null;
+					throw null == exception ? exceptionWrapper : exception;
 				}
 			}
 		});
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
@@ -114,7 +114,7 @@ public static FormatterProperties fromXmlContent(final Iterable<String> content)
 
 	public static FormatterProperties merge(Properties... properties) {
 		FormatterProperties merged = new FormatterProperties();
-		List.of(properties).forEach((source) -> merged.properties.putAll(source));
+		List.of(properties).forEach(source -> merged.properties.putAll(source));
 		return merged;
 	}
 
@@ -300,7 +300,7 @@ protected Properties execute(InputStream file, Node rootNode) throws IOException
 					 * A missing value is interpreted as an empty string,
 					 * similar to the Properties behavior
 					 */
-					String valString = (null == value) ? "" : value.getNodeValue();
+					String valString = null == value ? "" : value.getNodeValue();
 					properties.setProperty(idString, valString);
 				}
 				return properties;
@@ -332,7 +332,7 @@ private List<Node> getChildren(final Node node, final String nodeName) {
 
 		private static String getProfileName(Node profile) {
 			Node nameAttribute = profile.getAttributes().getNamedItem("name");
-			return (null == nameAttribute) ? "" : nameAttribute.getNodeValue();
+			return null == nameAttribute ? "" : nameAttribute.getNodeValue();
 		}
 
 		private final String rootNodeName;
diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -122,12 +122,12 @@ private void verifyVersionRangesDoNotIntersect(NavigableMap<Integer, V> jvm2fmtV
 		/** @return Highest formatter version recommended for this JVM (null, if JVM not supported) */
 		@Nullable public V getRecommendedFormatterVersion() {
 			Integer configuredJvmVersionOrNull = jvm2fmtMaxVersion.floorKey(Jvm.version());
-			return (null == configuredJvmVersionOrNull) ? null : jvm2fmtMaxVersion.get(configuredJvmVersionOrNull);
+			return null == configuredJvmVersionOrNull ? null : jvm2fmtMaxVersion.get(configuredJvmVersionOrNull);
 		}
 
 		@Nullable public V getMinimumRequiredFormatterVersion() {
 			Integer configuredJvmVersionOrNull = jvm2fmtMinVersion.floorKey(Jvm.version());
-			return (null == configuredJvmVersionOrNull) ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull);
+			return null == configuredJvmVersionOrNull ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull);
 		}
 
 		/**
diff --git a/lib/src/main/java/com/diffplug/spotless/LintSuppression.java b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
@@ -58,9 +58,9 @@ public void setShortCode(String shortCode) {
 	}
 
 	public boolean suppresses(String relativePath, FormatterStep formatterStep, Lint lint) {
-		if (path.equals(ALL) || path.equals(relativePath)) {
-			if (step.equals(ALL) || formatterStep.getName().equals(this.step)) {
-				if (shortCode.equals(ALL) || lint.getShortCode().equals(this.shortCode)) {
+		if (ALL.equals(path) || path.equals(relativePath)) {
+			if (ALL.equals(step) || formatterStep.getName().equals(this.step)) {
+				if (ALL.equals(shortCode) || lint.getShortCode().equals(this.shortCode)) {
 					return true;
 				}
 			}
@@ -69,7 +69,7 @@ public boolean suppresses(String relativePath, FormatterStep formatterStep, Lint
 	}
 
 	public void ensureDoesNotSuppressAll() {
-		boolean suppressAll = path.equals(ALL) && step.equals(ALL) && shortCode.equals(ALL);
+		boolean suppressAll = ALL.equals(path) && ALL.equals(step) && ALL.equals(shortCode);
 		if (suppressAll) {
 			throw new IllegalArgumentException("You must specify a specific `file`, `step`, or `shortCode`.");
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/MoreIterables.java b/lib/src/main/java/com/diffplug/spotless/MoreIterables.java
@@ -31,7 +31,7 @@ private MoreIterables() {}
 	/** Returns a shallow copy of input elements, throwing on null elements. */
 	static <T> List<T> toNullHostileList(Iterable<T> input) {
 		requireElementsNonNull(input);
-		List<T> shallowCopy = (input instanceof Collection<?> c)
+		List<T> shallowCopy = input instanceof Collection<?> c
 				? new ArrayList<>(c.size())
 				: new ArrayList<>();
 		input.forEach(shallowCopy::add);
diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -202,7 +202,7 @@ public Result(@Nonnull List<String> args, int exitCode, @Nonnull byte[] stdOut,
 			this.args = args;
 			this.exitCode = exitCode;
 			this.stdOut = stdOut;
-			this.stdErr = (stdErr == null ? new byte[0] : stdErr);
+			this.stdErr = stdErr == null ? new byte[0] : stdErr;
 		}
 
 		public List<String> args() {
diff --git a/lib/src/main/java/com/diffplug/spotless/biome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/biome/Architecture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,22 +40,22 @@ public static Architecture guess() {
 		var msg = "Unsupported architecture " + arch + "/" + version
 				+ ", specify the path to the Biome executable manually";
 
-		if (arch.equals("ppc64le")) {
+		if ("ppc64le".equals(arch)) {
 			throw new IllegalStateException(msg);
 		}
-		if (arch.equals("s390x")) {
+		if ("s390x".equals(arch)) {
 			throw new IllegalStateException(msg);
 		}
-		if (arch.equals("ppc64")) {
+		if ("ppc64".equals(arch)) {
 			throw new IllegalStateException(msg);
 		}
-		if (arch.equals("ppc")) {
+		if ("ppc".equals(arch)) {
 			throw new IllegalStateException(msg);
 		}
-		if (arch.equals("aarch64")) {
+		if ("aarch64".equals(arch)) {
 			return ARM64;
 		}
-		if (arch.equals("arm")) {
+		if ("arm".equals(arch)) {
 			if (version.contains("v7")) {
 				throw new IllegalStateException(msg);
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -203,7 +203,7 @@ private List<String> mergeMatchingItems() {
 			}
 		}
 		// if there is \n on the end, remove it
-		if (!template.isEmpty() && template.get(template.size() - 1).equals(ImportSorter.N)) {
+		if (!template.isEmpty() && ImportSorter.N.equals(template.get(template.size() - 1))) {
 			template.remove(template.size() - 1);
 		}
 		return template;
@@ -217,7 +217,7 @@ private List<String> getResult(List<String> sortedImported, String lineFormat) {
 		List<String> strings = new ArrayList<>();
 
 		for (String s : sortedImported) {
-			if (s.equals(ImportSorter.N)) {
+			if (ImportSorter.N.equals(s)) {
 				strings.add(s);
 			} else {
 				strings.add(lineFormat.formatted(s) + ImportSorter.N);
@@ -264,7 +264,7 @@ private static int compareWithWildcare(String string1, String string2, boolean w
 		if (!samePrefix) {
 			return string1.compareTo(string2);
 		}
-		return (string1IsWildcard == wildcardsLast) ? 1 : -1;
+		return string1IsWildcard == wildcardsLast ? 1 : -1;
 	}
 
 	private static class LexicographicalOrderingComparator implements Comparator<String>, Serializable {
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -109,7 +109,7 @@ static final class State implements Serializable {
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			final File configFile = (config != null) ? config.getOnlyFile() : null;
+			final File configFile = config != null ? config.getOnlyFile() : null;
 			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
 					String.class,
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmExecutableResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmExecutableResolver.java
@@ -65,7 +65,7 @@ static class ParentOfNodeModulesDirResolver implements Function<File, File> {
 
 		@Override
 		public File apply(File file) {
-			if (file != null && file.isDirectory() && file.getName().equalsIgnoreCase("node_modules")) {
+			if (file != null && file.isDirectory() && "node_modules".equalsIgnoreCase(file.getName())) {
 				return file.getParentFile();
 			}
 			return file;
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -100,13 +100,13 @@ public ReflectionHelper(RdfFormatterStep.State state)
 		this.TurtleFormatFormattingStyleClass = classLoader.loadClass("de.atextor.turtle.formatter.FormattingStyle");
 		Class<?>[] innerClasses = TurtleFormatFormattingStyleClass.getDeclaredClasses();
 		this.TurtleFormatFormattingStyleBuilderClass = Arrays.stream(innerClasses)
-				.filter(c -> c.getSimpleName().equals("FormattingStyleBuilder")).findFirst().get();
-		this.TurtleFormatKnownPrefix = Arrays.stream(innerClasses).filter(c -> c.getSimpleName().equals("KnownPrefix")).findFirst().get();
+				.filter(c -> "FormattingStyleBuilder".equals(c.getSimpleName())).findFirst().get();
+		this.TurtleFormatKnownPrefix = Arrays.stream(innerClasses).filter(c -> "KnownPrefix".equals(c.getSimpleName())).findFirst().get();
 		this.getSubject = JenaStatementClass.getMethod("getSubject");
 		this.getPredicate = JenaStatementClass.getMethod("getPredicate");
 		this.getObject = JenaStatementClass.getMethod("getObject");
 		this.isAnon = JenaRDFNodeClass.getMethod("isAnon");
-		this.getGraph = JenaModelClass.getMethod(("getGraph"));
+		this.getGraph = JenaModelClass.getMethod("getGraph");
 		this.JenaGraphClass = classLoader.loadClass("org.apache.jena.graph.Graph");
 		this.JenaTriple = classLoader.loadClass("org.apache.jena.graph.Triple");
 		this.graphFindTriple = JenaGraphClass.getMethod("find", JenaTriple);
@@ -201,10 +201,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			long line = (long) args[1];
 			long col = (long) args[2];
 			String severity = method.getName();
-			if (severity.equals("warning") && !state.getConfig().isFailOnWarning()) {
+			if ("warning".equals(severity) && !state.getConfig().isFailOnWarning()) {
 				logger.warn("{}({},{}): {}", this.filePath, line, col, message);
 			} else {
-				if (severity.equals("warning")) {
+				if ("warning".equals(severity)) {
 					logger.error("Formatter fails because of a parser warning. To make the formatter succeed in"
 							+ "the presence of warnings, set the configuration parameter 'failOnWarning' to 'false' (default: 'true')");
 				}
@@ -503,7 +503,7 @@ public SortedModelInvocationHandler(ReflectionHelper reflectionHelper, Object je
 
 		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-			if (method.getName().equals("listSubjects") && method.getParameterCount() == 0) {
+			if ("listSubjects".equals(method.getName()) && method.getParameterCount() == 0) {
 				Object resIterator = method.invoke(jenaModel);
 				List<Object> resources = new ArrayList<>();
 				while (hasNext(resIterator)) {
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ public DBeaverSQLFormatterConfiguration(Properties properties) {
 	}
 
 	private String getIndentString(String indentType, int indentSize) {
-		char indentChar = indentType.equals("space") ? ' ' : '\t';
+		char indentChar = "space".equals(indentType) ? ' ' : '\t';
 		StringBuilder stringBuilder = new StringBuilder();
 		for (int i = 0; i < indentSize; i++) {
 			stringBuilder.append(indentChar);
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIncrementalResolutionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIncrementalResolutionTest.java
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
diff --git a/testlib/src/main/resources/java/idea/full.dirty.java b/testlib/src/main/resources/java/idea/full.dirty.java
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2024 DiffPlug`
	`2`	`+ * Copyright 2024-2025 DiffPlug`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -368,8 +368,8 @@ private boolean isSortPreserved(BodyDeclaration bodyDeclaration) {`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`private int preserveRelativeOrder(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2) {`
`371`		`- int value1 = ((Integer) bodyDeclaration1.getProperty(CompilationUnitSorter.RELATIVE_ORDER));`
`372`		`- int value2 = ((Integer) bodyDeclaration2.getProperty(CompilationUnitSorter.RELATIVE_ORDER));`
	`371`	`+ int value1 = (Integer) bodyDeclaration1.getProperty(CompilationUnitSorter.RELATIVE_ORDER);`
	`372`	`+ int value2 = (Integer) bodyDeclaration2.getProperty(CompilationUnitSorter.RELATIVE_ORDER);`
`373`	`373`	`return value1 - value2;`
`374`	`374`	`}`
`375`	`375`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce`
`69`	`69`	`return (String) method.invoke(formatter, input);`
`70`	`70`	`} catch (InvocationTargetException exceptionWrapper) {`
`71`	`71`	`Throwable throwable = exceptionWrapper.getTargetException();`
`72`		`- Exception exception = (throwable instanceof Exception e) ? e : null;`
`73`		`- throw (null == exception) ? exceptionWrapper : exception;`
	`72`	`+ Exception exception = throwable instanceof Exception e ? e : null;`
	`73`	`+ throw null == exception ? exceptionWrapper : exception;`
`74`	`74`	`}`
`75`	`75`	`});`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce`
`97`	`97`	`return (String) method.invoke(formatter, input);`
`98`	`98`	`} catch (InvocationTargetException exceptionWrapper) {`
`99`	`99`	`Throwable throwable = exceptionWrapper.getTargetException();`
`100`		`- Exception exception = (throwable instanceof Exception e) ? e : null;`
`101`		`- throw (null == exception) ? exceptionWrapper : exception;`
	`100`	`+ Exception exception = throwable instanceof Exception e ? e : null;`
	`101`	`+ throw null == exception ? exceptionWrapper : exception;`
`102`	`102`	`}`
`103`	`103`	`});`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ private static FormatterFunc applyWithoutFile(String className, EclipseBasedStep`
`67`	`67`	`return (String) method.invoke(formatter, input);`
`68`	`68`	`} catch (InvocationTargetException exceptionWrapper) {`
`69`	`69`	`Throwable throwable = exceptionWrapper.getTargetException();`
`70`		`- Exception exception = (throwable instanceof Exception e) ? e : null;`
`71`		`- throw (null == exception) ? exceptionWrapper : exception;`
	`70`	`+ Exception exception = throwable instanceof Exception e ? e : null;`
	`71`	`+ throw null == exception ? exceptionWrapper : exception;`
`72`	`72`	`}`
`73`	`73`	`};`
`74`	`74`	`}`
`@@ -85,8 +85,8 @@ public String applyWithFile(String unix, File file) throws Exception {`
`85`	`85`	`return (String) method.invoke(formatter, unix, file.getAbsolutePath());`
`86`	`86`	`} catch (InvocationTargetException exceptionWrapper) {`
`87`	`87`	`Throwable throwable = exceptionWrapper.getTargetException();`
`88`		`- Exception exception = (throwable instanceof Exception e) ? e : null;`
`89`		`- throw (null == exception) ? exceptionWrapper : exception;`
	`88`	`+ Exception exception = throwable instanceof Exception e ? e : null;`
	`89`	`+ throw null == exception ? exceptionWrapper : exception;`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`});`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,12 @@ private void verifyVersionRangesDoNotIntersect(NavigableMap<Integer, V> jvm2fmtV`
`122`	`122`	`/** @return Highest formatter version recommended for this JVM (null, if JVM not supported) */`
`123`	`123`	`@Nullable public V getRecommendedFormatterVersion() {`
`124`	`124`	`Integer configuredJvmVersionOrNull = jvm2fmtMaxVersion.floorKey(Jvm.version());`
`125`		`- return (null == configuredJvmVersionOrNull) ? null : jvm2fmtMaxVersion.get(configuredJvmVersionOrNull);`
	`125`	`+ return null == configuredJvmVersionOrNull ? null : jvm2fmtMaxVersion.get(configuredJvmVersionOrNull);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Nullable public V getMinimumRequiredFormatterVersion() {`
`129`	`129`	`Integer configuredJvmVersionOrNull = jvm2fmtMinVersion.floorKey(Jvm.version());`
`130`		`- return (null == configuredJvmVersionOrNull) ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull);`
	`130`	`+ return null == configuredJvmVersionOrNull ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`/**`