chore(spin-common): unify source-path detection behind SourcePathKind - #170
Merged
Conversation
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
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.
Every plugin that needed to know where source lived --
Java25CompilerPlugin,Java8CompilerPlugin,Java25JUnitPlugin,Java8JUnitPlugin,CheckstylePlugin,MavenPlugin-- carried its own near-duplicateDetectSourceFiles/DetectSourcePaths/DetectGeneratedSourcePaths/DetectExternalGeneratedSourcePaths/DetectAllSourcePathstask interfaces and abstract base classes, six of which did nothing but repeat the same directory-walking logic under a different name.This collapses all of that into a single
SourcePathKindenum (MAIN,TEST,GENERATED,EXTERNAL_GENERATED) inspin-common, plus oneDetectSourcePathstask interface whosedetect()now returnsMap<SourcePathKind, PathSet>. Each plugin'sAbstractDetectSourcePathssubclass only declares which kinds it's responsible for; consumers pull out just the kinds they need via the newDetectSourcePaths.filesOf/pathsOfstatic helpers. The interface is tagged@Category("source-paths")and@Merge, so a@From(DetectSourcePaths.class) Map<SourcePathKind, PathSet>parameter automatically receives the combined result of every implementor in the project rather than requiring callers to know which concrete plugin classes exist.This also fixes a real gap in
CheckstylePlugin: previously, honoring a project's<includeTestSourceDirectory>setting required a private helper that duplicatedAbstractDetectSourceFiles's walk logic and hardcoded thesrc/test/javaconvention rather than going through the sameTEST-kind detectionJUnitPluginuses. It now asks forSourcePathKind.MAIN/TESTfrom the merged map like everything else, andAbstractResourcePlugin.DetectResourcePathswas decoupled fromDetectSourcePathsentirely, since resource directories were never actually "source paths" and would no longer type-check against the newMap-returning interface.