Support Java file merge #1344
Open
Support Java file merge #1344
+628
−1
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
- Add JavaFileMergerJavaParser class for standalone Java file merging using JavaParser - Modify DefaultShellCallback to support Java file merging by default - Support merging based on @mbg.generated JavaDoc tags and @generated annotations (javax/jakarta) - Preserve custom methods while updating generated methods - Add comprehensive tests and demo for the merge functionality - Update JavaParser dependency scope to make it available for main code This enables automatic merging of Java Mapper files during regeneration, similar to the existing XML merge functionality.
…ctices - Rewrite mergeImports method to sort imports according to Java best practices: 1. java.* packages (alphabetically) 2. javax.* packages (alphabetically) 3. jakarta.* packages (alphabetically) 4. Third-party and project packages (alphabetically) 5. Static imports (alphabetically, at the end) - Add ImportInfo helper class to handle import deduplication and comparison - Implement compareImports method with proper priority-based sorting - Update existing test expectations to match new sorted import order - Add comprehensive test shouldSortImportsAccordingToBestPractices to verify: * Correct ordering of different package types * Proper handling of static imports * Alphabetical sorting within each category - All 10 tests pass successfully - Import output is now predictable and follows industry standards
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.
JavaFileMergerclass for standalone Java file merging usingJavaParserDefaultShellCallbackto support Java file merging by default@mbg.generatedJavaDoc tags and@Generatedannotations (javax/jakarta)JavaParserdependency scope to make it available for main codeThis enables automatic merging of Java Mapper files during regeneration, similar to the existing XML merge functionality.
Close #595