chore(spin-common): centralize source/output path literals in SourcePathKind - #176
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.
SourcePathKindpreviously exposed only a source-root string usable for detecting declared source directories, so every plugin that needed to place build output undermain/ortest/, or needed thesrc/main//src/test/prefix for other purposes, hardcoded the literal separately across the java, junit, and maven modules.This adds a proper
outputPrefix()alongside the renamedsourceRoot()accessor onSourcePathKind, both returningOptional<String>, and replaces every hardcoded"src/main/","main/","src/test/","test/", and duplicated"module-info.java"literal inBuildOutputLocations,AbstractCompile,AbstractJavaDoc,AbstractJavaLinker,AbstractJavaPlugin,Java25CompilerPlugin,Java8CompilerPlugin,ResourcePlugin,AbstractJUnitPlugin,AbstractTest,Java25JUnitPlugin,Java8JUnitPlugin, andMavenPluginwith calls throughSourcePathKind.AbstractJUnitPlugin's override ofgetSourceRootPath()is removed entirely sinceAbstractJavaPluginnow derives the root from the injectedsourceScope()(MAINorTEST) instead of a fixedsrc/main/literal, andAbstractTest's module-info existence checks now reuseJDKModuleDescriptor.SOURCE_FILENAMEinstead of repeating the"module-info.java"string.Call sites that reference the same prefix more than once within a class (
Java25CompilerPlugin.Compile,Java8CompilerPlugin.Compile,Java25JUnitPlugin.Compile,Java8JUnitPlugin.Compile,MavenPlugin,AbstractCompile) hoist it into aprivate static final Stringconstant rather than callingoutputPrefix().orElseThrow()inline at each use, matching the patternAbstractJavaDocalready used for itsjavadocoutput path.