Skip to content

Commit 132d50b

Browse files
ilayaperumalgilayaperumalg
committed
Revert "refactor(mcp): qualify ObjectMapper and upgrade jsonschema to 4.38.0"
This reverts commit a9b0763.
1 parent fdf21f4 commit 132d50b

File tree

11 files changed

+16
-27
lines changed

11 files changed

+16
-27
lines changed

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webflux/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerSseWebFluxAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStdioDisabledCondition;
2626
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerSseProperties;
2727
import org.springframework.beans.factory.ObjectProvider;
28-
import org.springframework.beans.factory.annotation.Qualifier;
2928
import org.springframework.boot.autoconfigure.AutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -83,8 +82,7 @@ public class McpServerSseWebFluxAutoConfiguration {
8382

8483
@Bean
8584
@ConditionalOnMissingBean
86-
public WebFluxSseServerTransportProvider webFluxTransport(
87-
@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
85+
public WebFluxSseServerTransportProvider webFluxTransport(ObjectProvider<ObjectMapper> objectMapperProvider,
8886
McpServerSseProperties serverProperties) {
8987

9088
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webflux/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerStatelessWebFluxAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStdioDisabledCondition;
2626
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerStreamableHttpProperties;
2727
import org.springframework.beans.factory.ObjectProvider;
28-
import org.springframework.beans.factory.annotation.Qualifier;
2928
import org.springframework.boot.autoconfigure.AutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -48,8 +47,7 @@ public class McpServerStatelessWebFluxAutoConfiguration {
4847
@Bean
4948
@ConditionalOnMissingBean
5049
public WebFluxStatelessServerTransport webFluxStatelessServerTransport(
51-
@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
52-
McpServerStreamableHttpProperties serverProperties) {
50+
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerStreamableHttpProperties serverProperties) {
5351

5452
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
5553

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webflux/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerStreamableHttpWebFluxAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerProperties;
2727
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerStreamableHttpProperties;
2828
import org.springframework.beans.factory.ObjectProvider;
29-
import org.springframework.beans.factory.annotation.Qualifier;
3029
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3231
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -49,8 +48,7 @@ public class McpServerStreamableHttpWebFluxAutoConfiguration {
4948
@Bean
5049
@ConditionalOnMissingBean
5150
public WebFluxStreamableServerTransportProvider webFluxStreamableServerTransportProvider(
52-
@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
53-
McpServerStreamableHttpProperties serverProperties) {
51+
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerStreamableHttpProperties serverProperties) {
5452

5553
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
5654

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webmvc/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerSseWebMvcAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStdioDisabledCondition;
2626
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerSseProperties;
2727
import org.springframework.beans.factory.ObjectProvider;
28-
import org.springframework.beans.factory.annotation.Qualifier;
2928
import org.springframework.boot.autoconfigure.AutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -77,8 +76,7 @@ public class McpServerSseWebMvcAutoConfiguration {
7776
@Bean
7877
@ConditionalOnMissingBean
7978
public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
80-
@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
81-
McpServerSseProperties serverProperties) {
79+
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerSseProperties serverProperties) {
8280

8381
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
8482

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webmvc/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerStatelessWebMvcAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStdioDisabledCondition;
2626
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerStreamableHttpProperties;
2727
import org.springframework.beans.factory.ObjectProvider;
28-
import org.springframework.beans.factory.annotation.Qualifier;
2928
import org.springframework.boot.autoconfigure.AutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -49,8 +48,7 @@ public class McpServerStatelessWebMvcAutoConfiguration {
4948
@Bean
5049
@ConditionalOnMissingBean
5150
public WebMvcStatelessServerTransport webMvcStatelessServerTransport(
52-
@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
53-
McpServerStreamableHttpProperties serverProperties) {
51+
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerStreamableHttpProperties serverProperties) {
5452

5553
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
5654

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webmvc/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerStreamableHttpWebMvcAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerProperties;
2727
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerStreamableHttpProperties;
2828
import org.springframework.beans.factory.ObjectProvider;
29-
import org.springframework.beans.factory.annotation.Qualifier;
3029
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3231
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -50,8 +49,7 @@ public class McpServerStreamableHttpWebMvcAutoConfiguration {
5049
@Bean
5150
@ConditionalOnMissingBean
5251
public WebMvcStreamableServerTransportProvider webMvcStreamableServerTransportProvider(
53-
@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
54-
McpServerStreamableHttpProperties serverProperties) {
52+
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerStreamableHttpProperties serverProperties) {
5553

5654
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
5755

‎models/spring-ai-anthropic/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>com.github.victools</groupId>
6565
<artifactId>jsonschema-generator</artifactId>
66-
<version>${jsonschema.version}</version>
66+
<version>${victools.version}</version>
6767
</dependency>
6868

6969
<dependency>
7070
<groupId>com.github.victools</groupId>
7171
<artifactId>jsonschema-module-jackson</artifactId>
72-
<version>${jsonschema.version}</version>
72+
<version>${victools.version}</version>
7373
</dependency>
7474

7575
<dependency>

‎models/spring-ai-google-genai/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
<dependency>
5252
<groupId>com.github.victools</groupId>
5353
<artifactId>jsonschema-generator</artifactId>
54-
<version>${jsonschema.version}</version>
54+
<version>${victools.version}</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.github.victools</groupId>
5858
<artifactId>jsonschema-module-jackson</artifactId>
59-
<version>${jsonschema.version}</version>
59+
<version>${victools.version}</version>
6060
</dependency>
6161

6262
<!-- production dependencies -->

‎models/spring-ai-openai/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
<dependency>
5656
<groupId>com.github.victools</groupId>
5757
<artifactId>jsonschema-generator</artifactId>
58-
<version>${jsonschema.version}</version>
58+
<version>${victools.version}</version>
5959
</dependency>
6060

6161
<dependency>
6262
<groupId>com.github.victools</groupId>
6363
<artifactId>jsonschema-module-jackson</artifactId>
64-
<version>${jsonschema.version}</version>
64+
<version>${victools.version}</version>
6565
</dependency>
6666

6767
<dependency>

‎models/spring-ai-vertex-ai-gemini/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
<dependency>
5858
<groupId>com.github.victools</groupId>
5959
<artifactId>jsonschema-generator</artifactId>
60-
<version>${jsonschema.version}</version>
60+
<version>${victools.version}</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.github.victools</groupId>
6464
<artifactId>jsonschema-module-jackson</artifactId>
65-
<version>${jsonschema.version}</version>
65+
<version>${victools.version}</version>
6666
</dependency>
6767

6868
<dependency>

0 commit comments

Comments
 (0)