diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java index ab813ec324..c4c41e41df 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.util.Objects; import java.util.Properties; import javax.annotation.Nullable; @@ -127,7 +127,7 @@ public FormatterStep build() { var roundtrippableState = new EquoStep(formatterVersion, settingProperties, settingXml, FileSignature.promise(settingsFiles), JarState.promise(() -> { P2QueryResult query; try { - if (null != cacheDirectory) { + if (cacheDirectory != null) { CacheLocations.override_p2data = cacheDirectory.toPath().resolve("dev/equo/p2-data").toFile(); } query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW); @@ -190,8 +190,8 @@ static class EquoStep implements Serializable { ImmutableMap stepProperties) { this.semanticVersion = semanticVersion; - this.settingProperties = Optional.ofNullable(settingProperties).orElse(new ArrayList<>()); - this.settingXml = Optional.ofNullable(settingXml).orElse(new ArrayList<>()); + this.settingProperties = Objects.requireNonNullElse(settingProperties, new ArrayList<>()); + this.settingXml = Objects.requireNonNullElse(settingXml, new ArrayList<>()); this.settingsPromise = settingsPromise; this.jarPromise = jarPromise; this.stepProperties = stepProperties; @@ -218,8 +218,8 @@ public static class State implements Serializable { public State(String semanticVersion, JarState jarState, List settingProperties, List settingXml, FileSignature settingsFiles, ImmutableMap stepProperties) { this.semanticVersion = semanticVersion; this.jarState = jarState; - this.settingProperties = Optional.ofNullable(settingProperties).orElse(new ArrayList<>()); - this.settingXml = Optional.ofNullable(settingXml).orElse(new ArrayList<>()); + this.settingProperties = Objects.requireNonNullElse(settingProperties, new ArrayList<>()); + this.settingXml = Objects.requireNonNullElse(settingXml, new ArrayList<>()); this.settingsFiles = settingsFiles; this.stepProperties = stepProperties; } 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 index fa29951a3e..bd7cdc2645 100644 --- 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 @@ -70,7 +70,7 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce } catch (InvocationTargetException exceptionWrapper) { Throwable throwable = exceptionWrapper.getTargetException(); Exception exception = throwable instanceof Exception e ? e : null; - throw null == exception ? exceptionWrapper : exception; + throw exception == null ? 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 index e73ef6e2ab..70df597877 100644 --- 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 @@ -96,7 +96,7 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce } catch (InvocationTargetException exceptionWrapper) { Throwable throwable = exceptionWrapper.getTargetException(); Exception exception = throwable instanceof Exception e ? e : null; - throw null == exception ? exceptionWrapper : exception; + throw exception == null ? 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 index dc339d9930..42967f9e5f 100644 --- 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 @@ -68,7 +68,7 @@ private static FormatterFunc applyWithoutFile(String className, EclipseBasedStep } catch (InvocationTargetException exceptionWrapper) { Throwable throwable = exceptionWrapper.getTargetException(); Exception exception = throwable instanceof Exception e ? e : null; - throw null == exception ? exceptionWrapper : exception; + throw exception == null ? exceptionWrapper : exception; } }; } @@ -86,7 +86,7 @@ public String applyWithFile(String unix, File file) throws Exception { } catch (InvocationTargetException exceptionWrapper) { Throwable throwable = exceptionWrapper.getTargetException(); Exception exception = throwable instanceof Exception e ? e : null; - throw null == exception ? exceptionWrapper : exception; + throw exception == null ? exceptionWrapper : exception; } } }); diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java index 7b980447c4..9041bdb6c5 100644 --- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java +++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java @@ -65,7 +65,7 @@ public boolean equals(Object o) { } FilterByContentPatternFormatterStep that = (FilterByContentPatternFormatterStep) o; return Objects.equals(delegateStep, that.delegateStep) - && Objects.equals(onMatch, that.onMatch) + && onMatch == that.onMatch && Objects.equals(contentPattern.pattern(), that.contentPattern.pattern()); } diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java index f4ffffce8b..9f04c721ae 100644 --- a/lib/src/main/java/com/diffplug/spotless/JarState.java +++ b/lib/src/main/java/com/diffplug/spotless/JarState.java @@ -29,7 +29,6 @@ import java.util.NoSuchElementException; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -132,7 +131,7 @@ private static JarState provisionWithTransitives(boolean withTransitives, Collec Objects.requireNonNull(provisioner, "provisioner"); Set jars = provisioner.provisionWithTransitives(withTransitives, mavenCoordinates); if (jars.isEmpty()) { - throw new NoSuchElementException("Resolved to an empty result: " + mavenCoordinates.stream().collect(Collectors.joining(", "))); + throw new NoSuchElementException("Resolved to an empty result: " + String.join(", ", mavenCoordinates)); } FileSignature fileSignature = FileSignature.signAsSet(jars); return new JarState(fileSignature); diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java index e5c399f908..7d8812546b 100644 --- a/lib/src/main/java/com/diffplug/spotless/Jvm.java +++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java @@ -89,10 +89,10 @@ private Support(String formatterName, Comparator formatterVersionComp */ public Support add(int minimumJvmVersion, V maxFormatterVersion) { Objects.requireNonNull(maxFormatterVersion); - if (null != jvm2fmtMaxVersion.put(minimumJvmVersion, maxFormatterVersion)) { + if (jvm2fmtMaxVersion.put(minimumJvmVersion, maxFormatterVersion) != null) { throw new IllegalArgumentException("Added duplicate entry for JVM %d+.".formatted(minimumJvmVersion)); } - if (null != fmtMaxVersion2jvmVersion.put(maxFormatterVersion, minimumJvmVersion)) { + if (fmtMaxVersion2jvmVersion.put(maxFormatterVersion, minimumJvmVersion) != null) { throw new IllegalArgumentException("Added duplicate entry for formatter version %s.".formatted(maxFormatterVersion)); } verifyVersionRangesDoNotIntersect(jvm2fmtMaxVersion, minimumJvmVersion, maxFormatterVersion); @@ -101,7 +101,7 @@ public Support add(int minimumJvmVersion, V maxFormatterVersion) { public Support addMin(int minimumJvmVersion, V minFormatterVersion) { Objects.requireNonNull(minFormatterVersion); - if (null != jvm2fmtMinVersion.put(minimumJvmVersion, minFormatterVersion)) { + if (jvm2fmtMinVersion.put(minimumJvmVersion, minFormatterVersion) != null) { throw new IllegalArgumentException("Added duplicate entry for JVM %d+.".formatted(minimumJvmVersion)); } verifyVersionRangesDoNotIntersect(jvm2fmtMinVersion, minimumJvmVersion, minFormatterVersion); @@ -110,11 +110,11 @@ public Support addMin(int minimumJvmVersion, V minFormatterVersion) { private void verifyVersionRangesDoNotIntersect(NavigableMap jvm2fmtVersion, int minimumJvmVersion, V formatterVersion) { Map.Entry lower = jvm2fmtVersion.lowerEntry(minimumJvmVersion); - if ((null != lower) && (fmtVersionComparator.compare(formatterVersion, lower.getValue()) <= 0)) { + if ((lower != null) && (fmtVersionComparator.compare(formatterVersion, lower.getValue()) <= 0)) { throw new IllegalArgumentException("%d/%s should be lower than %d/%s".formatted(minimumJvmVersion, formatterVersion, lower.getKey(), lower.getValue())); } Map.Entry higher = jvm2fmtVersion.higherEntry(minimumJvmVersion); - if ((null != higher) && (fmtVersionComparator.compare(formatterVersion, higher.getValue()) >= 0)) { + if ((higher != null) && (fmtVersionComparator.compare(formatterVersion, higher.getValue()) >= 0)) { throw new IllegalArgumentException("%d/%s should be higher than %d/%s".formatted(minimumJvmVersion, formatterVersion, higher.getKey(), higher.getValue())); } } @@ -122,12 +122,12 @@ private void verifyVersionRangesDoNotIntersect(NavigableMap 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 configuredJvmVersionOrNull == null ? null : jvm2fmtMaxVersion.get(configuredJvmVersionOrNull); } @Nullable public V getMinimumRequiredFormatterVersion() { Integer configuredJvmVersionOrNull = jvm2fmtMinVersion.floorKey(Jvm.version()); - return null == configuredJvmVersionOrNull ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull); + return configuredJvmVersionOrNull == null ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull); } /** @@ -151,7 +151,7 @@ private String buildUnsupportedFormatterMessage(V fmtVersion) { } // check if the formatter version is too low for the jvm version V minimumFormatterVersion = getMinimumRequiredFormatterVersion(); - if ((null != minimumFormatterVersion) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) { + if ((minimumFormatterVersion != null) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) { return "You are running Spotless on JVM %d. This requires %s of at least %s (you are using %s).%n".formatted(Jvm.version(), fmtName, minimumFormatterVersion, fmtVersion); } // otherwise all is well @@ -162,11 +162,11 @@ private String buildUpgradeJvmMessage(V fmtVersion) { StringBuilder builder = new StringBuilder(); builder.append("You are running Spotless on JVM %d".formatted(Jvm.version())); V recommendedFmtVersionOrNull = getRecommendedFormatterVersion(); - if (null != recommendedFmtVersionOrNull) { + if (recommendedFmtVersionOrNull != null) { builder.append(", which limits you to %s %s.%n".formatted(fmtName, recommendedFmtVersionOrNull)); } else { Entry nextFmtVersionOrNull = fmtMaxVersion2jvmVersion.ceilingEntry(fmtVersion); - if (null != nextFmtVersionOrNull) { + if (nextFmtVersionOrNull != null) { builder.append(". %s %s requires JVM %d+".formatted(fmtName, fmtVersion, nextFmtVersionOrNull.getValue())); } builder.append(".%n".formatted()); @@ -176,10 +176,10 @@ private String buildUpgradeJvmMessage(V fmtVersion) { private int getRequiredJvmVersion(V fmtVersion) { Entry entry = fmtMaxVersion2jvmVersion.ceilingEntry(fmtVersion); - if (null == entry) { + if (entry == null) { entry = fmtMaxVersion2jvmVersion.lastEntry(); } - if (null != entry) { + if (entry != null) { V maxKnownFmtVersion = jvm2fmtMaxVersion.get(entry.getValue()); if (fmtVersionComparator.compare(fmtVersion, maxKnownFmtVersion) <= 0) { return entry.getValue(); @@ -227,20 +227,20 @@ private String buildUpgradeFormatterMessage(V fmtVersion) { // check if the formatter is not supported on this jvm V minimumFormatterVersion = getMinimumRequiredFormatterVersion(); V recommendedFmtVersionOrNull = getRecommendedFormatterVersion(); - if ((null != minimumFormatterVersion) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) { + if ((minimumFormatterVersion != null) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) { builder.append("You are running Spotless on JVM %d. This requires %s of at least %s.%n".formatted(Jvm.version(), fmtName, minimumFormatterVersion)); builder.append("You are using %s %s.%n".formatted(fmtName, fmtVersion)); - if (null != recommendedFmtVersionOrNull) { + if (recommendedFmtVersionOrNull != null) { builder.append("%s %s is the recommended version, which may have fixed this problem.%n".formatted(fmtName, recommendedFmtVersionOrNull)); } // check if the formatter is outdated on this jvm - } else if (null != recommendedFmtVersionOrNull && (fmtVersionComparator.compare(fmtVersion, recommendedFmtVersionOrNull) < 0)) { + } else if (recommendedFmtVersionOrNull != null && (fmtVersionComparator.compare(fmtVersion, recommendedFmtVersionOrNull) < 0)) { builder.append("%s %s is currently being used, but outdated.%n".formatted(fmtName, fmtVersion)); builder.append("%s %s is the recommended version, which may have fixed this problem.%n".formatted(fmtName, recommendedFmtVersionOrNull)); builder.append("%s %s requires JVM %d+.".formatted(fmtName, recommendedFmtVersionOrNull, getRequiredJvmVersion(recommendedFmtVersionOrNull))); } else { V higherFormatterVersionOrNull = fmtMaxVersion2jvmVersion.higherKey(fmtVersion); - if (null != higherFormatterVersionOrNull) { + if (higherFormatterVersionOrNull != null) { builder.append(buildUpgradeJvmMessage(fmtVersion)); Integer higherJvmVersion = fmtMaxVersion2jvmVersion.get(higherFormatterVersionOrNull); builder.append("If you upgrade your JVM to %d+, then you can use %s %s, which may have fixed this problem.".formatted(higherJvmVersion, fmtName, higherFormatterVersionOrNull)); diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java index 3aac619d02..8a9c6923c0 100644 --- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java +++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java @@ -145,8 +145,8 @@ public Path ensureDownloaded(String version) throws IOException, InterruptedExce logger.debug("Ensuring that Biome for platform '{}' is downloaded", platform); var existing = findDownloaded(version); if (existing.isPresent()) { - logger.debug("Biome was already downloaded, using executable at '{}'", existing.get()); - return existing.get(); + logger.debug("Biome was already downloaded, using executable at '{}'", existing.orElseThrow()); + return existing.orElseThrow(); } else { logger.debug("Biome was not yet downloaded, attempting to download executable"); return download(version); diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java index f4a58a5d27..51350473a6 100644 --- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java +++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java @@ -241,9 +241,9 @@ private Runtime(String licenseHeader, String delimiter, String yearSeparator, bo Optional yearToken = getYearToken(licenseHeader); if (yearToken.isPresent()) { this.yearToday = String.valueOf(YearMonth.now().getYear()); - int yearTokenIndex = licenseHeader.indexOf(yearToken.get()); + int yearTokenIndex = licenseHeader.indexOf(yearToken.orElseThrow()); this.beforeYear = licenseHeader.substring(0, yearTokenIndex); - this.afterYear = licenseHeader.substring(yearTokenIndex + yearToken.get().length()); + this.afterYear = licenseHeader.substring(yearTokenIndex + yearToken.orElseThrow().length()); this.yearSepOrFull = yearSeparator; this.updateYearWithLatest = updateYearWithLatest; diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java index 575debf9c0..8dafc0c51f 100644 --- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java +++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java @@ -26,7 +26,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Objects; -import java.util.Optional; import javax.annotation.Nullable; @@ -390,45 +389,45 @@ private Object getCustomFormattingOptions(Class formatterClass) throws Except if (options != null) { if (BadSemver.version(version) < BadSemver.version(0, 17)) { formattingOptions = formattingOptions.getClass().getConstructor(int.class, int.class, int.class).newInstance( - /* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), - /* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), - /* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions))); + /* maxWidth = */ Objects.requireNonNullElse(options.maxWidth, (Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), + /* blockIndent = */ Objects.requireNonNullElse(options.blockIndent, (Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), + /* continuationIndent = */ Objects.requireNonNullElse(options.continuationIndent, (Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions))); } else if (BadSemver.version(version) < BadSemver.version(0, 19)) { formattingOptions = formattingOptions.getClass().getConstructor(int.class, int.class, int.class, boolean.class, boolean.class).newInstance( - /* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), - /* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), - /* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), - /* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), + /* maxWidth = */ Objects.requireNonNullElse(options.maxWidth, (Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), + /* blockIndent = */ Objects.requireNonNullElse(options.blockIndent, (Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), + /* continuationIndent = */ Objects.requireNonNullElse(options.continuationIndent, (Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), + /* removeUnusedImports = */ Objects.requireNonNullElse(options.removeUnusedImports, (Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), /* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions)); } else if (BadSemver.version(version) < BadSemver.version(0, 47)) { Class styleClass = classLoader.loadClass(formattingOptionsClass.getName() + "$Style"); formattingOptions = formattingOptions.getClass().getConstructor(styleClass, int.class, int.class, int.class, boolean.class, boolean.class).newInstance( /* style = */ formattingOptionsClass.getMethod("getStyle").invoke(formattingOptions), - /* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), - /* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), - /* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), - /* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), + /* maxWidth = */ Objects.requireNonNullElse(options.maxWidth, (Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), + /* blockIndent = */ Objects.requireNonNullElse(options.blockIndent, (Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), + /* continuationIndent = */ Objects.requireNonNullElse(options.continuationIndent, (Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), + /* removeUnusedImports = */ Objects.requireNonNullElse(options.removeUnusedImports, (Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), /* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions)); } else if (BadSemver.version(version) < BadSemver.version(0, 57)) { Class styleClass = classLoader.loadClass(formattingOptionsClass.getName() + "$Style"); formattingOptions = formattingOptions.getClass().getConstructor(styleClass, int.class, int.class, int.class, boolean.class, boolean.class, boolean.class).newInstance( /* style = */ formattingOptionsClass.getMethod("getStyle").invoke(formattingOptions), - /* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), - /* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), - /* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), - /* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), + /* maxWidth = */ Objects.requireNonNullElse(options.maxWidth, (Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), + /* blockIndent = */ Objects.requireNonNullElse(options.blockIndent, (Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), + /* continuationIndent = */ Objects.requireNonNullElse(options.continuationIndent, (Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), + /* removeUnusedImports = */ Objects.requireNonNullElse(options.removeUnusedImports, (Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), /* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions), - /* manageTrailingCommas = */ Optional.ofNullable(getManageTrailingCommasFrom(options.trailingCommaManagementStrategy)).orElse((Boolean) formattingOptionsClass.getMethod("getManageTrailingCommas").invoke(formattingOptions))); + /* manageTrailingCommas = */ Objects.requireNonNullElse(getManageTrailingCommasFrom(options.trailingCommaManagementStrategy), (Boolean) formattingOptionsClass.getMethod("getManageTrailingCommas").invoke(formattingOptions))); } else { Class styleClass = classLoader.loadClass(formattingOptionsClass.getName() + "$Style"); formattingOptions = formattingOptions.getClass().getConstructor(styleClass, int.class, int.class, int.class, boolean.class, boolean.class, TrailingCommaManagementStrategy.class).newInstance( /* style = */ formattingOptionsClass.getMethod("getStyle").invoke(formattingOptions), - /* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), - /* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), - /* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), - /* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), + /* maxWidth = */ Objects.requireNonNullElse(options.maxWidth, (Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)), + /* blockIndent = */ Objects.requireNonNullElse(options.blockIndent, (Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)), + /* continuationIndent = */ Objects.requireNonNullElse(options.continuationIndent, (Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)), + /* removeUnusedImports = */ Objects.requireNonNullElse(options.removeUnusedImports, (Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)), /* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions), - /* trailingCommaManagementStrategy */ Optional.ofNullable(options.trailingCommaManagementStrategy).orElse((TrailingCommaManagementStrategy) formattingOptionsClass.getMethod("getTrailingCommaManagementStrategy").invoke(formattingOptions))); + /* trailingCommaManagementStrategy */ Objects.requireNonNullElse(options.trailingCommaManagementStrategy, (TrailingCommaManagementStrategy) formattingOptionsClass.getMethod("getTrailingCommaManagementStrategy").invoke(formattingOptions))); } } diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java index 75d17cd6e2..351fc94644 100644 --- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java +++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java @@ -85,13 +85,10 @@ public File resolveNodeExecutable() { } public String resolveNpmrcContent() { - File npmrcFile = Optional.ofNullable(this.explicitNpmrcFile) - .orElseGet(() -> new NpmrcResolver(additionalNpmrcLocations).tryFind() - .orElse(null)); - if (npmrcFile != null) { - return NpmResourceHelper.readUtf8StringFromFile(npmrcFile); - } - return null; + return Optional.ofNullable(explicitNpmrcFile) + .or(() -> new NpmrcResolver(additionalNpmrcLocations).tryFind()) + .map(NpmResourceHelper::readUtf8StringFromFile) + .orElse(null); } } diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java index a9382bf6c3..629cd21983 100644 --- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java +++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java @@ -137,7 +137,7 @@ private String assertFilepathInConfigOptions(File file) { return prettierConfigOptions; } // if the file has no name, we cannot use it - if (file.getName().trim().isEmpty()) { + if (file.getName().isBlank()) { return prettierConfigOptions; } // if it is not there, we add it at the beginning of the Options diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java index 94090045c5..51f2aff90d 100644 --- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java +++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java @@ -100,8 +100,8 @@ 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 -> "FormattingStyleBuilder".equals(c.getSimpleName())).findFirst().get(); - this.TurtleFormatKnownPrefix = Arrays.stream(innerClasses).filter(c -> "KnownPrefix".equals(c.getSimpleName())).findFirst().get(); + .filter(c -> "FormattingStyleBuilder".equals(c.getSimpleName())).findFirst().orElseThrow(); + this.TurtleFormatKnownPrefix = Arrays.stream(innerClasses).filter(c -> "KnownPrefix".equals(c.getSimpleName())).findFirst().orElseThrow(); this.getSubject = JenaStatementClass.getMethod("getSubject"); this.getPredicate = JenaStatementClass.getMethod("getPredicate"); this.getObject = JenaStatementClass.getMethod("getObject"); 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 index 98793d2480..53d1cae485 100644 --- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java +++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java @@ -293,8 +293,8 @@ private List format(final List argList) { FormatterToken t4 = argList.get(index - 4); if ("(".equals(t4.getString()) - && t3.getString().trim().isEmpty() - && t1.getString().trim().isEmpty() + && t3.getString().isBlank() + && t1.getString().isBlank() && ")".equalsIgnoreCase(t0.getString())) { t4.setString(t4.getString() + t2.getString() + t0.getString()); argList.remove(index); diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java index 9a56920200..aeb34e8572 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java @@ -15,6 +15,7 @@ */ package com.diffplug.gradle.spotless; +import static com.diffplug.common.base.Strings.isNullOrEmpty; import static org.junit.jupiter.api.Assertions.fail; import java.io.File; @@ -229,7 +230,7 @@ static String buildResultToString(BuildResult result) { private static File getTestKitDir() { String gradleUserHome = System.getenv("GRADLE_USER_HOME"); - if (gradleUserHome == null || gradleUserHome.isEmpty()) { + if (isNullOrEmpty(gradleUserHome)) { gradleUserHome = new File(System.getProperty("user.home"), ".gradle").getAbsolutePath(); } return new File(gradleUserHome, "testkit"); diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java index 9aca7333d4..cbf3cf0b36 100644 --- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java +++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java @@ -15,6 +15,7 @@ */ package com.diffplug.spotless.maven; +import static com.diffplug.common.base.Strings.isNullOrEmpty; import static java.util.stream.Collectors.toList; import java.io.File; @@ -304,11 +305,11 @@ private List collectFiles(FormatterFactory formatterFactory, FormatterConf try { final List files; if (ratchetFrom.isPresent()) { - files = collectFilesFromGit(formatterFactory, ratchetFrom.get()); + files = collectFilesFromGit(formatterFactory, ratchetFrom.orElseThrow()); } else { files = collectFilesFromFormatterFactory(formatterFactory); } - if (filePatterns == null || filePatterns.isEmpty()) { + if (isNullOrEmpty(filePatterns)) { return files; } final String[] includePatterns = this.filePatterns.split(","); diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java index 9d00699816..42a9259591 100644 --- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java +++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java @@ -15,6 +15,8 @@ */ package com.diffplug.spotless.maven; +import static com.diffplug.common.base.Strings.isNullOrEmpty; + import java.io.File; import java.io.IOException; import java.util.List; @@ -114,6 +116,6 @@ protected void process(String name, Iterable files, Formatter formatter, U } private boolean isIdeHook() { - return !(spotlessIdeHook == null || spotlessIdeHook.isEmpty()); + return !isNullOrEmpty(spotlessIdeHook); } } diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java index 92f4229ed3..5594562ad4 100644 --- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java +++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.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. @@ -44,7 +44,7 @@ public class EclipseCdt implements FormatterStepFactory { public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) { EquoBasedStepBuilder eclipseConfig = EclipseCdtFormatterStep.createBuilder(stepConfig.getProvisioner()); eclipseConfig.setVersion(version == null ? EclipseCdtFormatterStep.defaultVersion() : version); - if (null != file) { + if (file != null) { File settingsFile = stepConfig.getFileLocator().locateFile(file); eclipseConfig.setPreferences(Arrays.asList(settingsFile)); } diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java index e7e3d0e386..ffe433389a 100644 --- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java +++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 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,7 +40,7 @@ public class EclipseWtp implements FormatterStepFactory { public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) { EclipseBasedStepBuilder eclipseConfig = type.createBuilder(stepConfig.getProvisioner()); eclipseConfig.setVersion(version == null ? EclipseWtpFormatterStep.defaultVersion() : version); - if (null != files) { + if (files != null) { eclipseConfig.setPreferences( stream(files).map(file -> stepConfig.getFileLocator().locateFile(file)).collect(toList())); } diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java index 67ab40fbf2..0929ab67e7 100644 --- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java +++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 DiffPlug + * Copyright 2020-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public class GrEclipse implements FormatterStepFactory { public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) { EquoBasedStepBuilder grEclipseConfig = GrEclipseFormatterStep.createBuilder(stepConfig.getProvisioner()); grEclipseConfig.setVersion(version == null ? GrEclipseFormatterStep.defaultVersion() : version); - if (null != file) { + if (file != null) { File settingsFile = stepConfig.getFileLocator().locateFile(file); grEclipseConfig.setPreferences(Arrays.asList(settingsFile)); } diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java index e5185e8806..b93df43f3c 100644 --- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java +++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java @@ -61,30 +61,30 @@ public class Eclipse implements FormatterStepFactory { public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) { EclipseJdtFormatterStep.Builder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner()); eclipseConfig.setVersion(version == null ? EclipseJdtFormatterStep.defaultVersion() : version); - if (null != file) { + if (file != null) { File settingsFile = stepConfig.getFileLocator().locateFile(file); eclipseConfig.setPreferences(Arrays.asList(settingsFile)); } eclipseConfig.setP2Mirrors(p2Mirrors); - if (null != cacheDirectory) { + if (cacheDirectory != null) { eclipseConfig.setCacheDirectory(cacheDirectory); } - if (null != sortMembersEnabled) { + if (sortMembersEnabled != null) { eclipseConfig.sortMembersEnabled(sortMembersEnabled); } - if (null != sortMembersOrder) { + if (sortMembersOrder != null) { eclipseConfig.sortMembersOrder(sortMembersOrder); } - if (null != sortMembersDoNotSortFields) { + if (sortMembersDoNotSortFields != null) { eclipseConfig.sortMembersDoNotSortFields(sortMembersDoNotSortFields); } - if (null != sortMembersVisibilityOrder) { + if (sortMembersVisibilityOrder != null) { eclipseConfig.sortMembersVisibilityOrder(sortMembersVisibilityOrder); } - if (null != sortMembersVisibilityOrderEnabled) { + if (sortMembersVisibilityOrderEnabled != null) { eclipseConfig.sortMembersVisibilityOrderEnabled(sortMembersVisibilityOrderEnabled); } - if (null != cacheDirectory) { + if (cacheDirectory != null) { eclipseConfig.setCacheDirectory(cacheDirectory); } return eclipseConfig.build(); diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java index dbbb4b1524..904770c0d8 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java @@ -143,7 +143,7 @@ private ProcessRunner.Result executeHookScript(String hookFile) throws Exception throw new RuntimeException("Could not find git bash executable"); } - executor = bashPath.get(); + executor = bashPath.orElseThrow(); } return runner.exec(rootFolder(), Map.of("JAVA_HOME", System.getProperty("java.home")), null, List.of(executor, hookFile)); diff --git a/rewrite.yml b/rewrite.yml index f3edd8d212..8518825481 100644 --- a/rewrite.yml +++ b/rewrite.yml @@ -9,8 +9,12 @@ tags: - static-analysis - cleanup recipeList: + - org.openrewrite.gradle.EnableGradleBuildCache + - org.openrewrite.gradle.EnableGradleParallelExecution - org.openrewrite.gradle.GradleBestPractices - org.openrewrite.java.RemoveUnusedImports + - org.openrewrite.java.format.NormalizeFormat + - org.openrewrite.java.format.NormalizeLineBreaks - org.openrewrite.java.format.RemoveTrailingWhitespace - org.openrewrite.java.migrate.UpgradeToJava17 - org.openrewrite.java.recipes.JavaRecipeBestPractices @@ -37,13 +41,17 @@ recipeList: - tech.picnic.errorprone.refasterrules.ClassRulesRecipes - tech.picnic.errorprone.refasterrules.CollectionRulesRecipes - tech.picnic.errorprone.refasterrules.ComparatorRulesRecipes + - tech.picnic.errorprone.refasterrules.EqualityRulesRecipes - tech.picnic.errorprone.refasterrules.FileRulesRecipes + - tech.picnic.errorprone.refasterrules.MapRulesRecipes - tech.picnic.errorprone.refasterrules.MicrometerRulesRecipes + - tech.picnic.errorprone.refasterrules.MockitoRulesRecipes + - tech.picnic.errorprone.refasterrules.NullRulesRecipes + - tech.picnic.errorprone.refasterrules.OptionalRulesRecipes - tech.picnic.errorprone.refasterrules.PatternRulesRecipes - tech.picnic.errorprone.refasterrules.PreconditionsRulesRecipes - tech.picnic.errorprone.refasterrules.PrimitiveRulesRecipes - tech.picnic.errorprone.refasterrules.StreamRulesRecipes + - tech.picnic.errorprone.refasterrules.StringRulesRecipes - tech.picnic.errorprone.refasterrules.TimeRulesRecipes - # - org.openrewrite.staticanalysis.CodeCleanup # bug https://github.com/openrewrite/rewrite/pull/6084 - # - org.openrewrite.staticanalysis.UnnecessaryThrows # bug --- diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java index 43744dbf74..db522db947 100644 --- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java +++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java @@ -127,7 +127,7 @@ public void replace(String path, String toReplace, String replaceWith) throws IO public static String getTestResource(String filename) { Optional resourceUrl = getTestResourceUrl(filename); if (resourceUrl.isPresent()) { - return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(resourceUrl.get(), StandardCharsets.UTF_8))); + return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(resourceUrl.orElseThrow(), StandardCharsets.UTF_8))); } throw new IllegalArgumentException("No such resource " + filename); } diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java index 3c7c174f9b..7c7afb9bf2 100644 --- a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java @@ -208,13 +208,13 @@ public FormatterSettingsAssert containsSpecificValuesOf(File file) { Properties settingsProps = actual.getProperties(); for (String expectedValue : VALID_VALUES) { // A parsable (valid) file contains keys of the following format - String validValueName = null == expectedValue ? "null" : expectedValue; + String validValueName = expectedValue == null ? "null" : expectedValue; String key = "%s.%s".formatted(fileName, validValueName); if (!settingsProps.containsKey(key)) { failWithMessage("Key <%s> not part of formatter settings.", key); } String value = settingsProps.getProperty(key); - if ((null != expectedValue) && (!expectedValue.equals(value))) { + if ((expectedValue != null) && (!expectedValue.equals(value))) { failWithMessage("Value of key <%s> is '%s' and not '%s' as expected.", key, value, expectedValue); } } diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java index 49f9a5e884..12d66728f4 100644 --- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java @@ -19,7 +19,11 @@ import org.junit.jupiter.api.Test; -import com.diffplug.spotless.*; +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.ResourceHarness; +import com.diffplug.spotless.SerializableEqualityTester; +import com.diffplug.spotless.StepHarness; +import com.diffplug.spotless.TestProvisioner; class KtfmtStepTest extends ResourceHarness { @Test diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java index 15610ace58..87512f13af 100644 --- a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2021-2024 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. @@ -19,7 +19,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import com.diffplug.spotless.*; +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.ResourceHarness; +import com.diffplug.spotless.StepHarness; +import com.diffplug.spotless.TestProvisioner; public class SortPomTest extends ResourceHarness { @Test diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java index 59777a35e3..95ca530caa 100644 --- a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java @@ -119,7 +119,7 @@ private List getBeforeAfterTestResources(String beforeDir, String aft if (output.isEmpty()) { throw new IllegalStateException("'after' directory %s is missing file %s corresponding to 'before' file %s".formatted(afterDir, input.getFileName(), input)); } - arguments.add(Arguments.of(unixRelative(input), unixRelative(output.get()))); + arguments.add(Arguments.of(unixRelative(input), unixRelative(output.orElseThrow()))); } return arguments; }