Skip to content

Conversation

Pankraz76
Copy link
Contributor

Please DO NOT FORCE PUSH. Don't worry about messy history, it's easier to do code review if we can tell what happened after the review, and force pushing breaks that.

Please make sure that your PR allows edits from maintainers. Sometimes it's faster for us to just fix something than it is to describe how to fix it.

Allow edits from maintainers

After creating the PR, please add a commit that adds a bullet-point under the [Unreleased] section of CHANGES.md, plugin-gradle/CHANGES.md, and plugin-maven/CHANGES.md which includes:

  • a summary of the change
  • either
    • a link to the issue you are resolving (for small changes)
    • a link to the PR you just created (for big changes likely to have discussion)

If your change only affects a build plugin, and not the lib, then you only need to update the plugin-foo/CHANGES.md for that plugin.

If your change affects lib in an end-user-visible way (fixing a bug, updating a version) then you need to update CHANGES.md for both the lib and all build plugins. Users of a build plugin shouldn't have to refer to lib to see changes that affect them.

This makes it easier for the maintainers to quickly release your changes :)

Changes have been made to lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$RequireNonNullElseRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/Jvm.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNullRecipe
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.EqualityRulesRecipes
            tech.picnic.errorprone.refasterrules.EqualityRulesRecipes$EnumReferenceEqualityRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$RequireNonNullElseGetRecipe
Changes have been made to lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNullRecipe
Changes have been made to lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNullRecipe
Changes have been made to lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$RequireNonNullElseRecipe
Changes have been made to lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNullRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
Changes have been made to plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.NullRulesRecipes
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNullRecipe
            tech.picnic.errorprone.refasterrules.NullRulesRecipes$IsNotNullRecipe
Changes have been made to testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.OptionalRulesRecipes
            tech.picnic.errorprone.refasterrules.OptionalRulesRecipes$OptionalOrElseThrowRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.StringRulesRecipes
            tech.picnic.errorprone.refasterrules.StringRulesRecipes$StringIsBlankRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/JarState.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.StringRulesRecipes
            tech.picnic.errorprone.refasterrules.StringRulesRecipes$JoinStringsRecipe
Changes have been made to lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.StringRulesRecipes
            tech.picnic.errorprone.refasterrules.StringRulesRecipes$StringIsBlankRecipe
Changes have been made to plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.StringRulesRecipes
            tech.picnic.errorprone.refasterrules.StringRulesRecipes$StringIsNullOrEmptyRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.StringRulesRecipes
            tech.picnic.errorprone.refasterrules.StringRulesRecipes$StringIsNullOrEmptyRecipe
Changes have been made to plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java by:
    com.diffplug.spotless.openrewrite.SanityCheck
        tech.picnic.errorprone.refasterrules.StringRulesRecipes
            tech.picnic.errorprone.refasterrules.StringRulesRecipes$StringIsNullOrEmptyRecipe
Please review and commit the results.

Estimate time saved: 1h 40m

@Pankraz76 Pankraz76 changed the title [openrewrite] StringRulesRecipes [openrewrite] StringRulesRecipes Sep 30, 2025
@Pankraz76 Pankraz76 marked this pull request as ready for review September 30, 2025 11:10
@Pankraz76
Copy link
Contributor Author

Caused by: java.io.IOException: Failed to load eclipse groovy formatter: java.lang.IllegalStateException: P2 operation already in progress, close other clients or delete stale lockfile at /home/runner/.m2/repository/dev/equo/p2-data/metadata/.lock

@nedtwigg
Copy link
Member


Step 'importOrder' found problem in 'JavaCodeUnsortedImports.test': |  
-- | --
null |  
java.lang.UnsupportedOperationException |  
at java.base/java.util.ImmutableCollections.uoe(ImmutableCollections.java:142) |  
at java.base/java.util.ImmutableCollections$AbstractImmutableList.add(ImmutableCollections.java:256) |  
at com.diffplug.spotless.java.ImportSorterImpl.putStaticItemIfNotExists(ImportSorterImpl.java:120) |  
at com.diffplug.spotless.java.ImportSorterImpl.<init>(ImportSorterImpl.java:94) |  
at com.diffplug.spotless.java.ImportSorterImpl.sort(ImportSorterImpl.java:77) |  
at com.diffplug.spotless.java.ImportSorter.format(ImportSorter.java:92) |  
at com.diffplug.spotless.java.ImportOrderStep$State.lambda$toFormatter$0(ImportOrderStep.java:144) |  
at com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33) |  
at com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:51) |  
at com.diffplug.spotless.Formatter.computeWithLint(Formatter.java:172) |  
at com.diffplug.spotless.Formatter.compute(Formatter.java:137)

Copy link
Member

@nedtwigg nedtwigg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at least one of the failures is a real regression, not sure if it's the only one or not

Copy link
Member

@nedtwigg nedtwigg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@nedtwigg nedtwigg merged commit 8adef86 into diffplug:main Oct 1, 2025
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants