Extract AbstractJsonSchemaGenerator to remove duplication between JsonSchemaGenerator and McpJsonSchemaGenerator#6162
Open
tzolov wants to merge 1 commit into
Conversation
…nSchemaGenerator and McpJsonSchemaGenerator Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
sdeleuze
requested changes
May 26, 2026
| public final class McpJsonSchemaGenerator extends AbstractJsonSchemaGenerator { | ||
|
|
||
| private static final boolean PROPERTY_REQUIRED_BY_DEFAULT = true; | ||
| private static final McpJsonSchemaGenerator INSTANCE = new McpJsonSchemaGenerator(); |
Contributor
There was a problem hiding this comment.
I don't think we should use this kind of INSTANCE static field, looks like an anti-pattern to me and I don't understand why it is needed, could we please remove it?
| * {@link JsonProperty#required()}, or {@link Schema#requiredMode()}} annotation. | ||
| */ | ||
| private static final boolean PROPERTY_REQUIRED_BY_DEFAULT = true; | ||
| private static final JsonSchemaGenerator INSTANCE = new JsonSchemaGenerator(); |
Contributor
There was a problem hiding this comment.
I don't think we should use this kind of INSTANCE static field, looks like an anti-pattern to me and I don't understand why it is needed, could we please remove it?
Contributor
Author
There was a problem hiding this comment.
I've tried to minimize the breaking changes. Will have another pass. Moving this to RC1
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
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.
Extract shared parameter-inspection logic into a new AbstractJsonSchemaGenerator base class.
The JsonSchemaGenerator and McpJsonSchemaGenerator generators now implement two abstract hook methods (
getToolAnnotationRequired/getToolAnnotationDescription) for their respective tool annotations (@ToolParam vs @McpToolParam), while the common required-check, description-resolution, forbidAdditionalProperties, and convertTypeValuesToUpperCase logic lives in the base class.Also fixes pre-existing Jackson 3 deprecations (isTextual → isString, asText → stringValue).