Refactoring: Fix NPE, Extract Catalog Service, and Simplify Hierarchy #1366
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
…ice, and simplified class hierarchy
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
Member
There was a problem hiding this comment.
this has nothing to do in the codebase
apupier
reviewed
Dec 1, 2025
apupier
reviewed
Dec 1, 2025
apupier
reviewed
Dec 1, 2025
apupier
reviewed
Dec 1, 2025
apupier
requested changes
Dec 1, 2025
Member
apupier
left a comment
apupier
left a comment
There was a problem hiding this comment.
provided initial comments. It applies to several other files.
Please provide different commit for each improvements so that the review is easier.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR addresses several code smells and architectural issues to improve the robustness and maintainability of the codebase. The changes include a bug fix for a potential crash and architectural simplifications.
Key Changes:
Bug Fix (Robustness): Fixed a NullPointerException in SettingsManager.java (Line 49). The code was chaining multiple getters (getCompletion().getCompletionItem()...) without null checks. Added defensive checks to prevent crashes when receiving minimal initialization params.
Architectural Cleanup:
Extracted Class: Moved catalog management logic (updating versions, runtime providers) from CamelTextDocumentService into a new dedicated class CamelCatalogService. This reduces the complexity of the main service class.
Collapsed Hierarchy: Removed AbstractLanguageServer (an unnecessary abstraction) and pushed its logic down to CamelLanguageServer. This simplifies the project structure as the abstract class had only one implementation.
Code Quality:
Magic Numbers: Replaced hardcoded numbers in ParserXMLFileHelper with explaining variables to improve readability.
Naming: Renamed overly long identifiers in CamelComponentIdsCompletionsFuture for better readability.
Verification:
Ran mvn clean install and mvn test locally.
Verified that the Language Server still initializes correctly with both full and minimal capabilities.
Tests
[x] Are there Unit tests? (Existing tests passed successfully)
[ ] Are there Integration tests?
[ ] Do we need a new UI test? (No)
PR workflow progress
[ ] Tagged with relevant PR labels
[ ] Green job for PR
[ ] PR was created more than 24 hours ago or All committers approved it
[ ] Green main branch build