Fix wildcard import expansion for JDK XML types#2921
Open
aKandzior wants to merge 2 commits intodiffplug:mainfrom
Open
Fix wildcard import expansion for JDK XML types#2921aKandzior wants to merge 2 commits intodiffplug:mainfrom
aKandzior wants to merge 2 commits intodiffplug:mainfrom
Conversation
expandWildcardImports uses JavaParser symbol resolution to inspect the whole compilation unit before replacing wildcard imports. The default ReflectionTypeSolver only covers java.* and javax.* APIs, so JDK classes in packages such as org.xml.sax could not be resolved. This caused formatting to fail with an UnsolvedSymbolException when a file contained both a wildcard import and a JDK XML type such as org.xml.sax.InputSource. Use ReflectionTypeSolver.JCL_ONLY so the resolver covers the full Java class library package set known to JavaParser, including org.xml.sax. Adds a regression test with org.xml.sax.InputSource and a java.io.* wildcard import. Test: ./gradlew :testlib:test --tests com.diffplug.spotless.java.ExpandWildcardImportsStepTest --no-daemon --no-configuration-cache --console=plain
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This fixes
expandWildcardImports()for JDK classes outside thejava.*andjavax.*package prefixes, such asorg.xml.sax.InputSource.expandWildcardImports()uses JavaParser symbol resolution to inspect the whole compilation unit before replacing wildcard imports. The defaultReflectionTypeSolveronly coversjava.*andjavax.*, so JDK XML types e.g. inorg.xml.sax.*could fail with anUnsolvedSymbolException.Changes
ReflectionTypeSolver.JCL_ONLYfor the reflection type solver.org.xml.sax.InputSourceand ajava.io.*wildcard import.Test