Skip to content

Commit 9a714e2

Browse files
codeboyzhoucodeboyzhou
committed
refactor(main): Plan to restructure the test cases
1 parent 04e6d81 commit 9a714e2

40 files changed

+248
-577
lines changed

‎src/main/java/com/github/codeboyzhou/mcp/declarative/McpServers.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,24 @@ public static McpServers run(Class<?> applicationMainClass, String[] args) {
4545

4646
public void startStdioServer(SimpleMcpServerBaseInfo serverInfo) {
4747
SimpleMcpStdioServerFactory factory = new SimpleMcpStdioServerFactory();
48-
McpAsyncServer server = factory.create(serverInfo);
48+
McpAsyncServer server = factory.createServer(serverInfo);
4949
registerComponentsTo(server);
5050
}
5151

5252
public void startSseServer(SimpleMcpHttpSseServerInfo serverInfo) {
5353
SimpleMcpHttpSseServerFactory factory = new SimpleMcpHttpSseServerFactory();
54-
McpAsyncServer server = factory.create(serverInfo);
54+
McpAsyncServer server = factory.createServer(serverInfo);
55+
registerComponentsTo(server);
5556
McpHttpServer httpserver = new McpHttpServer();
5657
httpserver.use(factory.transportProvider(serverInfo)).bind(serverInfo.port()).start();
57-
registerComponentsTo(server);
5858
}
5959

6060
public void startStreamableServer(SimpleMcpHttpStreamableServerInfo serverInfo) {
6161
SimpleMcpHttpStreamableServerFactory factory = new SimpleMcpHttpStreamableServerFactory();
62-
McpAsyncServer server = factory.create(serverInfo);
62+
McpAsyncServer server = factory.createServer(serverInfo);
63+
registerComponentsTo(server);
6364
McpHttpServer httpserver = new McpHttpServer();
6465
httpserver.use(factory.transportProvider(serverInfo)).bind(serverInfo.port()).start();
65-
registerComponentsTo(server);
6666
}
6767

6868
public void startServer(String configFileName) {
@@ -95,13 +95,16 @@ private void doStartServer(McpServerConfiguration configuration) {
9595
throw new NullPointerException("factory is null, please check your configuration");
9696
}
9797
}
98-
McpAsyncServer server = factory.create();
98+
McpAsyncServer server = factory.createServer();
9999
registerComponentsTo(server);
100100
}
101101

102102
private void registerComponentsTo(McpAsyncServer server) {
103-
injector.getInstance(McpServerResourceFactory.class).registerTo(server);
104-
injector.getInstance(McpServerPromptFactory.class).registerTo(server);
105-
injector.getInstance(McpServerToolFactory.class).registerTo(server);
103+
McpServerResourceFactory resource = injector.getInstance(McpServerResourceFactory.class);
104+
McpServerPromptFactory prompt = injector.getInstance(McpServerPromptFactory.class);
105+
McpServerToolFactory tool = injector.getInstance(McpServerToolFactory.class);
106+
resource.registerTo(server);
107+
prompt.registerTo(server);
108+
tool.registerTo(server);
106109
}
107110
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpJsonSchemaDefinitionProperty.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;
@@ -9,9 +9,9 @@
99
@Target(ElementType.FIELD)
1010
@Retention(RetentionPolicy.RUNTIME)
1111
public @interface McpJsonSchemaDefinitionProperty {
12-
String name() default StringHelper.EMPTY;
12+
String name() default Strings.EMPTY;
1313

14-
String description() default StringHelper.EMPTY;
14+
String description() default Strings.EMPTY;
1515

1616
boolean required() default false;
1717
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpPrompt.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;
@@ -10,9 +10,9 @@
1010
@Retention(RetentionPolicy.RUNTIME)
1111
public @interface McpPrompt {
1212

13-
String name() default StringHelper.EMPTY;
13+
String name() default Strings.EMPTY;
1414

15-
String title() default StringHelper.EMPTY;
15+
String title() default Strings.EMPTY;
1616

17-
String description() default StringHelper.EMPTY;
17+
String description() default Strings.EMPTY;
1818
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpPromptParam.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;
@@ -12,9 +12,9 @@
1212

1313
String name();
1414

15-
String title() default StringHelper.EMPTY;
15+
String title() default Strings.EMPTY;
1616

17-
String description() default StringHelper.EMPTY;
17+
String description() default Strings.EMPTY;
1818

1919
boolean required() default false;
2020
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpResource.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import io.modelcontextprotocol.spec.McpSchema;
55
import java.lang.annotation.ElementType;
66
import java.lang.annotation.Retention;
@@ -12,11 +12,11 @@
1212
public @interface McpResource {
1313
String uri();
1414

15-
String name() default StringHelper.EMPTY;
15+
String name() default Strings.EMPTY;
1616

17-
String title() default StringHelper.EMPTY;
17+
String title() default Strings.EMPTY;
1818

19-
String description() default StringHelper.EMPTY;
19+
String description() default Strings.EMPTY;
2020

2121
String mimeType() default "text/plain";
2222

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpServerApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;
@@ -9,7 +9,7 @@
99
@Target(ElementType.TYPE)
1010
@Retention(RetentionPolicy.RUNTIME)
1111
public @interface McpServerApplication {
12-
String basePackage() default StringHelper.EMPTY;
12+
String basePackage() default Strings.EMPTY;
1313

1414
Class<?> basePackageClass() default Object.class;
1515
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpTool.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;
@@ -10,9 +10,9 @@
1010
@Retention(RetentionPolicy.RUNTIME)
1111
public @interface McpTool {
1212

13-
String name() default StringHelper.EMPTY;
13+
String name() default Strings.EMPTY;
1414

15-
String title() default StringHelper.EMPTY;
15+
String title() default Strings.EMPTY;
1616

17-
String description() default StringHelper.EMPTY;
17+
String description() default Strings.EMPTY;
1818
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpToolParam.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

3-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
3+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;
@@ -11,7 +11,7 @@
1111
public @interface McpToolParam {
1212
String name();
1313

14-
String description() default StringHelper.EMPTY;
14+
String description() default Strings.EMPTY;
1515

1616
boolean required() default false;
1717
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/server/McpHttpServer.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ public void start() {
4949
// Add a shutdown hook to stop the HTTP server and MCP server gracefully
5050
addShutdownHook(httpserver);
5151

52-
// Check if the server is running in test mode
53-
final boolean testing =
54-
Boolean.parseBoolean(System.getProperty("mcp.declarative.java.sdk.testing"));
55-
if (testing) {
56-
logger.debug(
57-
"Jetty-based HTTP server is running in test mode, not waiting for HTTP server to stop");
58-
httpserver.stop();
59-
return;
60-
}
61-
6252
// Wait for the HTTP server to stop
6353
httpserver.join();
6454
} catch (Exception e) {

‎src/main/java/com/github/codeboyzhou/mcp/declarative/server/component/AbstractMcpServerComponentFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static com.github.codeboyzhou.mcp.declarative.common.GuiceInjectorModule.INJECTED_VARIABLE_NAME_I18N_ENABLED;
44

5-
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
5+
import com.github.codeboyzhou.mcp.declarative.util.Strings;
66
import com.google.inject.Injector;
77
import com.google.inject.name.Named;
88
import java.util.Locale;
@@ -36,7 +36,7 @@ protected String resolveComponentAttributeValue(String attributeLiteralValue) {
3636
if (i18nEnabled && bundle != null && bundle.containsKey(attributeLiteralValue)) {
3737
return bundle.getString(attributeLiteralValue);
3838
}
39-
return StringHelper.defaultIfBlank(attributeLiteralValue, NOT_SPECIFIED);
39+
return Strings.defaultIfBlank(attributeLiteralValue, NOT_SPECIFIED);
4040
}
4141

4242
private ResourceBundle loadResourceBundle() {

0 commit comments

Comments
 (0)