Skip to content

Commit 55a11f6

Browse files
tzolovtzolov
committed
rebase to main
Signed-off-by: Christian Tzolov <[email protected]>
1 parent c346aa2 commit 55a11f6

File tree

11 files changed

+10
-20
lines changed

11 files changed

+10
-20
lines changed

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/McpClientAutoConfiguration.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import org.springframework.ai.mcp.client.autoconfigure.configurer.McpAsyncClientConfigurer;
2828
import org.springframework.ai.mcp.client.autoconfigure.configurer.McpSyncClientConfigurer;
2929
import org.springframework.ai.mcp.client.autoconfigure.properties.McpClientCommonProperties;
30-
import org.springframework.ai.mcp.AsyncMcpToolCallbackProvider;
31-
import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
3230
import org.springframework.ai.mcp.customizer.McpAsyncClientCustomizer;
3331
import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
3432
import org.springframework.beans.factory.ObjectProvider;

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/McpToolCallbackAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.mcp.client;
17+
package org.springframework.ai.mcp.client.autoconfigure;
1818

1919
import java.util.List;
2020

2121
import io.modelcontextprotocol.client.McpAsyncClient;
2222
import io.modelcontextprotocol.client.McpSyncClient;
2323

24-
import org.springframework.ai.autoconfigure.mcp.client.properties.McpClientCommonProperties;
2524
import org.springframework.ai.mcp.AsyncMcpToolCallbackProvider;
2625
import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
26+
import org.springframework.ai.mcp.client.autoconfigure.properties.McpClientCommonProperties;
2727
import org.springframework.ai.tool.ToolCallbackProvider;
2828
import org.springframework.beans.factory.ObjectProvider;
2929
import org.springframework.boot.autoconfigure.AutoConfiguration;

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ org.springframework.ai.mcp.client.autoconfigure.StdioTransportAutoConfiguration
1717
org.springframework.ai.mcp.client.autoconfigure.SseWebFluxTransportAutoConfiguration
1818
org.springframework.ai.mcp.client.autoconfigure.SseHttpClientTransportAutoConfiguration
1919
org.springframework.ai.mcp.client.autoconfigure.McpClientAutoConfiguration
20+
org.springframework.ai.mcp.client.autoconfigure.McpToolCallbackAutoConfiguration
2021

2122

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/test/java/org/springframework/ai/mcp/client/autoconfigure/McpToolCallbackAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.mcp.client;
17+
package org.springframework.ai.mcp.client.autoconfigure;
1818

1919
import org.junit.jupiter.api.Test;
2020

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/test/java/org/springframework/ai/mcp/client/autoconfigure/McpToolCallbackAutoconfiguraitonConditionTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.mcp.client;
17+
package org.springframework.ai.mcp.client.autoconfigure;
1818

1919
import org.junit.jupiter.api.Test;
2020

21-
import org.springframework.ai.autoconfigure.mcp.client.McpToolCallbackAutoConfiguration.McpToolCallbackAutoconfiguraitonCondition;
21+
import org.springframework.ai.mcp.client.autoconfigure.McpToolCallbackAutoConfiguration.McpToolCallbackAutoconfiguraitonCondition;
2222
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.Conditional;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.ai.autoconfigure.mcp.server;
16+
package org.springframework.ai.mcp.server.autoconfigure;
1717

1818
import java.util.List;
1919
import java.util.function.BiConsumer;
2020
import java.util.function.Consumer;
21-
import java.util.stream.Collectors;
2221

2322
import io.modelcontextprotocol.server.McpServerFeatures;
2423
import io.modelcontextprotocol.server.McpSyncServerExchange;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
package org.springframework.ai.mcp.server.autoconfigure;
1818

1919
import com.fasterxml.jackson.databind.ObjectMapper;
20-
import io.modelcontextprotocol.server.transport.WebFluxSseServerTransport;
2120
import io.modelcontextprotocol.server.transport.WebFluxSseServerTransportProvider;
22-
import io.modelcontextprotocol.spec.McpServerTransport;
2321
import io.modelcontextprotocol.spec.McpServerTransportProvider;
24-
import io.modelcontextprotocol.spec.ServerMcpTransport;
2522

2623
import org.springframework.boot.autoconfigure.AutoConfiguration;
2724
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.fasterxml.jackson.databind.ObjectMapper;
2020
import io.modelcontextprotocol.server.transport.WebMvcSseServerTransportProvider;
21-
import io.modelcontextprotocol.spec.McpServerTransport;
2221
import io.modelcontextprotocol.spec.McpServerTransportProvider;
2322

2423
import org.springframework.boot.autoconfigure.AutoConfiguration;

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
1716
org.springframework.ai.mcp.server.autoconfigure.McpServerAutoConfiguration
18-
org.springframework.ai.mcp.server.autoconfigure.McpWebMvcServerAutoConfiguration
1917
org.springframework.ai.mcp.server.autoconfigure.McpWebFluxServerAutoConfiguration
18+
org.springframework.ai.mcp.server.autoconfigure.McpWebMvcServerAutoConfiguration

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpServerAutoConfigurationBackwardCompatibilityIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.ai.autoconfigure.mcp.server;
17+
package org.springframework.ai.mcp.server.autoconfigure;
1818

1919
import java.util.List;
2020
import java.util.function.Consumer;

0 commit comments

Comments
 (0)