Skip to content

Commit 0af7a76

Browse files
relat-ivityrelat-ivity
committed
SLF4J依赖修正
1 parent ca3555b commit 0af7a76

File tree

7 files changed

+38
-54
lines changed

7 files changed

+38
-54
lines changed

‎framework/fel/java/plugins/tool-mcp-server/pom.xml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,7 @@
4444
<dependency>
4545
<groupId>io.modelcontextprotocol.sdk</groupId>
4646
<artifactId>mcp</artifactId>
47-
<version>0.14.0</version>
48-
</dependency>
49-
50-
<!-- Log -->
51-
<dependency>
52-
<groupId>ch.qos.logback</groupId>
53-
<artifactId>logback-classic</artifactId>
54-
<version>1.5.6</version>
47+
<version>0.14.1</version>
5548
</dependency>
5649

5750
<!-- Test -->
@@ -81,6 +74,16 @@
8174
<configuration>
8275
<category>system</category>
8376
<level>5</level>
77+
<sharedDependencies>
78+
<sharedDependency>
79+
<groupId>org.slf4j</groupId>
80+
<artifactId>slf4j-api</artifactId>
81+
</sharedDependency>
82+
<sharedDependency>
83+
<groupId>org.slf4j</groupId>
84+
<artifactId>slf4j-simple</artifactId>
85+
</sharedDependency>
86+
</sharedDependencies>
8487
</configuration>
8588
<executions>
8689
<execution>

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/DefaultMcpServer.java renamed to framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/DefaultMcpStreamableServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
* @since 2025-05-15
3737
*/
3838
@Component
39-
public class DefaultMcpServer implements McpServer, ToolChangedObserver {
40-
private static final Logger log = Logger.get(DefaultMcpServer.class);
39+
public class DefaultMcpStreamableServer implements McpServer, ToolChangedObserver {
40+
private static final Logger log = Logger.get(DefaultMcpStreamableServer.class);
4141
private final McpSyncServer mcpSyncServer;
4242

4343
private final ToolExecuteService toolExecuteService;
@@ -50,7 +50,7 @@ public class DefaultMcpServer implements McpServer, ToolChangedObserver {
5050
* @param toolExecuteService The service used to execute tools when handling tool call requests.
5151
* @throws IllegalArgumentException If {@code toolExecuteService} is null.
5252
*/
53-
public DefaultMcpServer(ToolExecuteService toolExecuteService, McpSyncServer mcpSyncServer) {
53+
public DefaultMcpStreamableServer(ToolExecuteService toolExecuteService, McpSyncServer mcpSyncServer) {
5454
this.toolExecuteService = notNull(toolExecuteService, "The tool execute service cannot be null.");
5555
this.mcpSyncServer = mcpSyncServer;
5656
}

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/DefaultMcpServerBean.java renamed to framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/bean/DefaultMcpServerBean.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
* Licensed under the MIT License. See License.txt in the project root for license information.
55
*--------------------------------------------------------------------------------------------*/
66

7-
package modelengine.fel.tool.mcp.server;
7+
package modelengine.fel.tool.mcp.server.bean;
88

99
import com.fasterxml.jackson.databind.ObjectMapper;
1010
import io.modelcontextprotocol.server.McpSyncServer;
1111
import io.modelcontextprotocol.spec.McpSchema;
12+
import modelengine.fel.tool.mcp.server.transport.FitMcpStreamableServerTransportProvider;
1213
import modelengine.fitframework.annotation.Bean;
1314
import modelengine.fitframework.annotation.Component;
1415

@@ -25,14 +26,14 @@ public class DefaultMcpServerBean {
2526
private final static Duration requestTimeout = Duration.ofSeconds(10);
2627

2728
@Bean
28-
public DefaultMcpStreamableServerTransportProvider defaultMcpStreamableServerTransportProvider() {
29-
return DefaultMcpStreamableServerTransportProvider.builder()
29+
public FitMcpStreamableServerTransportProvider fitMcpStreamableServerTransportProvider() {
30+
return FitMcpStreamableServerTransportProvider.builder()
3031
.objectMapper(new ObjectMapper())
3132
.build();
3233
}
3334

3435
@Bean
35-
public McpSyncServer mcpSyncServer(DefaultMcpStreamableServerTransportProvider transportProvider) {
36+
public McpSyncServer mcpSyncServer(FitMcpStreamableServerTransportProvider transportProvider) {
3637
return io.modelcontextprotocol.server.McpServer.sync(transportProvider)
3738
.serverInfo("FIT Store MCP Server", "3.6.0-SNAPSHOT")
3839
.capabilities(McpSchema.ServerCapabilities.builder()

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/DefaultMcpStreamableServerTransportProvider.java renamed to framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/transport/FitMcpStreamableServerTransportProvider.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Licensed under the MIT License. See License.txt in the project root for license information.
55
*--------------------------------------------------------------------------------------------*/
66

7-
package modelengine.fel.tool.mcp.server;
7+
package modelengine.fel.tool.mcp.server.transport;
88

99
import com.fasterxml.jackson.core.type.TypeReference;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -44,9 +44,8 @@
4444
* @author 黄可欣
4545
* @since 2025-09-30
4646
*/
47-
public class DefaultMcpStreamableServerTransportProvider implements McpStreamableServerTransportProvider {
48-
49-
private static final Logger logger = Logger.get(DefaultMcpStreamableServerTransportProvider.class);
47+
public class FitMcpStreamableServerTransportProvider implements McpStreamableServerTransportProvider {
48+
private static final Logger logger = Logger.get(FitMcpStreamableServerTransportProvider.class);
5049

5150
private static final String MESSAGE_ENDPOINT = "/mcp/streamable";
5251

@@ -90,7 +89,7 @@ public class DefaultMcpStreamableServerTransportProvider implements McpStreamabl
9089

9190
/**
9291
* Constructs a new DefaultMcpStreamableServerTransportProvider instance,
93-
* for {@link DefaultMcpStreamableServerTransportProvider.Builder}.
92+
* for {@link FitMcpStreamableServerTransportProvider.Builder}.
9493
*
9594
* @param objectMapper The ObjectMapper to use for JSON serialization/deserialization
9695
* of messages.
@@ -99,7 +98,7 @@ public class DefaultMcpStreamableServerTransportProvider implements McpStreamabl
9998
* @param keepAliveInterval The interval for sending keep-alive messages to clients.
10099
* @throws IllegalArgumentException if any parameter is null
101100
*/
102-
private DefaultMcpStreamableServerTransportProvider(ObjectMapper objectMapper,
101+
private FitMcpStreamableServerTransportProvider(ObjectMapper objectMapper,
103102
boolean disallowDelete,
104103
McpTransportContextExtractor<HttpClassicServerRequest> contextExtractor,
105104
Duration keepAliveInterval) {
@@ -683,7 +682,7 @@ public static Builder builder() {
683682
}
684683

685684
/**
686-
* Builder for creating instances of {@link DefaultMcpStreamableServerTransportProvider}.
685+
* Builder for creating instances of {@link FitMcpStreamableServerTransportProvider}.
687686
*/
688687
public static class Builder {
689688

@@ -751,16 +750,16 @@ public Builder keepAliveInterval(Duration keepAliveInterval) {
751750
}
752751

753752
/**
754-
* Builds a new instance of {@link DefaultMcpStreamableServerTransportProvider} with
753+
* Builds a new instance of {@link FitMcpStreamableServerTransportProvider} with
755754
* the configured settings.
756755
*
757756
* @return A new DefaultMcpStreamableServerTransportProvider instance
758757
* @throws IllegalStateException if required parameters are not set
759758
*/
760-
public DefaultMcpStreamableServerTransportProvider build() {
759+
public FitMcpStreamableServerTransportProvider build() {
761760
Assert.notNull(this.objectMapper, "ObjectMapper must be set");
762761

763-
return new DefaultMcpStreamableServerTransportProvider(this.objectMapper, this.disallowDelete,
762+
return new FitMcpStreamableServerTransportProvider(this.objectMapper, this.disallowDelete,
764763
this.contextExtractor, this.keepAliveInterval);
765764
}
766765

‎framework/fel/java/plugins/tool-mcp-server/src/main/resources/logback.xml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

framework/fel/java/plugins/tool-mcp-server/src/test/java/modelengine/fel/tool/mcp/server/support/DefaultMcpServerTest.java renamed to framework/fel/java/plugins/tool-mcp-server/src/test/java/modelengine/fel/tool/mcp/server/support/DefaultMcpStreamableServerTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import io.modelcontextprotocol.server.McpSyncServer;
1616
import modelengine.fel.tool.mcp.entity.ServerSchema;
1717
import modelengine.fel.tool.mcp.entity.Tool;
18-
import modelengine.fel.tool.mcp.server.DefaultMcpServer;
18+
import modelengine.fel.tool.mcp.server.DefaultMcpStreamableServer;
1919
import modelengine.fel.tool.mcp.server.McpServer;
2020
import modelengine.fel.tool.service.ToolExecuteService;
2121
import modelengine.fitframework.util.MapBuilder;
@@ -30,13 +30,13 @@
3030
import java.util.Map;
3131

3232
/**
33-
* Unit test for {@link DefaultMcpServer}.
33+
* Unit test for {@link DefaultMcpStreamableServer}.
3434
*
3535
* @author 季聿阶
3636
* @since 2025-05-20
3737
*/
3838
@DisplayName("Unit tests for DefaultMcpServer")
39-
public class DefaultMcpServerTest {
39+
public class DefaultMcpStreamableServerTest {
4040
private ToolExecuteService toolExecuteService;
4141
private McpSyncServer mcpSyncServer;
4242

@@ -53,7 +53,7 @@ class GivenConstructor {
5353
@DisplayName("Should throw IllegalArgumentException when toolExecuteService is null")
5454
void throwIllegalArgumentExceptionWhenToolExecuteServiceIsNull() {
5555
IllegalArgumentException exception =
56-
catchThrowableOfType(IllegalArgumentException.class, () -> new DefaultMcpServer(null, mcpSyncServer));
56+
catchThrowableOfType(IllegalArgumentException.class, () -> new DefaultMcpStreamableServer(null, mcpSyncServer));
5757
assertThat(exception).isNotNull().hasMessage("The tool execute service cannot be null.");
5858
}
5959
}
@@ -64,7 +64,7 @@ class GivenGetInfo {
6464
@Test
6565
@DisplayName("Should return expected server information")
6666
void returnExpectedServerInfo() {
67-
McpServer server = new DefaultMcpServer(toolExecuteService, mcpSyncServer);
67+
McpServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
6868
ServerSchema info = server.getSchema();
6969

7070
assertThat(info).returns("2025-06-18", ServerSchema::protocolVersion);
@@ -87,7 +87,7 @@ class GivenRegisterAndNotify {
8787
@Test
8888
@DisplayName("Should notify observers when tools are added or removed")
8989
void notifyObserversOnToolAddOrRemove() {
90-
DefaultMcpServer server = new DefaultMcpServer(toolExecuteService, mcpSyncServer);
90+
DefaultMcpStreamableServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
9191
McpServer.ToolsChangedObserver observer = mock(McpServer.ToolsChangedObserver.class);
9292
server.registerToolsChangedObserver(observer);
9393

@@ -110,7 +110,7 @@ class GivenOnToolAdded {
110110
@Test
111111
@DisplayName("Should add tool successfully with valid parameters")
112112
void addToolSuccessfully() {
113-
DefaultMcpServer server = new DefaultMcpServer(toolExecuteService, mcpSyncServer);
113+
DefaultMcpStreamableServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
114114
String name = "tool1";
115115
String description = "description1";
116116
Map<String, Object> schema = MapBuilder.<String, Object>get()
@@ -133,7 +133,7 @@ void addToolSuccessfully() {
133133
@Test
134134
@DisplayName("Should ignore invalid parameters and not add any tool")
135135
void ignoreInvalidParameters() {
136-
DefaultMcpServer server = new DefaultMcpServer(toolExecuteService, mcpSyncServer);
136+
DefaultMcpStreamableServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
137137
Map<String, Object> schema = MapBuilder.<String, Object>get()
138138
.put("type", "object")
139139
.put("properties", Collections.emptyMap())
@@ -157,7 +157,7 @@ class GivenOnToolRemoved {
157157
@Test
158158
@DisplayName("Should remove an added tool correctly")
159159
void removeToolSuccessfully() {
160-
DefaultMcpServer server = new DefaultMcpServer(toolExecuteService, mcpSyncServer);
160+
DefaultMcpStreamableServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
161161
Map<String, Object> schema = MapBuilder.<String, Object>get()
162162
.put("type", "object")
163163
.put("properties", Collections.emptyMap())
@@ -173,7 +173,7 @@ void removeToolSuccessfully() {
173173
@Test
174174
@DisplayName("Should ignore removal if name is blank")
175175
void ignoreBlankName() {
176-
DefaultMcpServer server = new DefaultMcpServer(toolExecuteService, mcpSyncServer);
176+
DefaultMcpStreamableServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
177177
Map<String, Object> schema = MapBuilder.<String, Object>get()
178178
.put("type", "object")
179179
.put("properties", Collections.emptyMap())

‎framework/fit/java/fit-reactor/src/main/java/modelengine/fitframework/flowable/Emitter.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,5 @@ interface Observer<T> {
7676
* @param cause 表示失败原因的 {@link Exception}。
7777
*/
7878
void onFailed(Exception cause);
79-
80-
// TODO onTimeout()方法
8179
}
8280
}

0 commit comments

Comments
 (0)