Skip to content

fix:#61:outputSchema do not contain description #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2025
Merged

fix:#61:outputSchema do not contain description #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions ...ations/src/main/java/org/springaicommunity/mcp/method/tool/utils/JsonSchemaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,7 @@ public static String generateFromClass(Class<?> clazz) {
}

private static String internalGenerateFromClass(Class<?> clazz) {
SchemaGeneratorConfigBuilder configBuilder = new SchemaGeneratorConfigBuilder(SchemaVersion.DRAFT_2020_12,
OptionPreset.PLAIN_JSON);
SchemaGeneratorConfig config = configBuilder.with(Option.EXTRA_OPEN_API_FORMAT_VALUES)
.without(Option.FLATTENED_ENUMS_FROM_TOSTRING)
.build();

SchemaGenerator generator = new SchemaGenerator(config);
JsonNode jsonSchema = generator.generateSchema(clazz);
return jsonSchema.toPrettyString();
return TYPE_SCHEMA_GENERATOR.generateSchema(clazz).toPrettyString();
}

public static String generateFromType(Type type) {
Expand All @@ -201,15 +193,7 @@ public static String generateFromType(Type type) {
}

private static String internalGenerateFromType(Type type) {
SchemaGeneratorConfigBuilder configBuilder = new SchemaGeneratorConfigBuilder(SchemaVersion.DRAFT_2020_12,
OptionPreset.PLAIN_JSON);
SchemaGeneratorConfig config = configBuilder.with(Option.EXTRA_OPEN_API_FORMAT_VALUES)
.without(Option.FLATTENED_ENUMS_FROM_TOSTRING)
.build();

SchemaGenerator generator = new SchemaGenerator(config);
JsonNode jsonSchema = generator.generateSchema(type);
return jsonSchema.toPrettyString();
return TYPE_SCHEMA_GENERATOR.generateSchema(type).toPrettyString();
}

/**
Expand Down
8 changes: 6 additions & 2 deletions ...tions/src/test/java/org/springaicommunity/mcp/provider/tool/SyncMcpToolProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import java.util.Map;
import java.util.function.BiFunction;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
import org.junit.jupiter.api.Test;
import org.springaicommunity.mcp.annotation.McpTool;

Expand Down Expand Up @@ -586,7 +588,9 @@ public String defaultAnnotationsTool(String input) {
void testToolWithOutputSchemaGeneration() {

// Define a custom result class
record CustomResult(String message, int count) {
record CustomResult(@JsonPropertyDescription("customResultMessage") @JsonProperty(required = false)
String message,
@JsonProperty(required = true) int count) {
}

class OutputSchemaTool {
Expand All @@ -613,7 +617,7 @@ public List<CustomResult> outputSchemaTool(String input) {
assertThat(outputSchemaString).contains("message");
assertThat(outputSchemaString).contains("count");
assertThat(outputSchemaString).isEqualTo(
"{$schema=https://json-schema.org/draft/2020-12/schema, type=array, items={type=object, properties={count={type=integer, format=int32}, message={type=string}}}}");
"{$schema=https://json-schema.org/draft/2020-12/schema, type=array, items={type=object, properties={count={type=integer, format=int32}, message={type=string, description=customResultMessage}}, required=[count]}}");
}

@Test
Expand Down