Skip to content

Commit 84f70f4

Browse files
committed
refactor(configuration): Improve server default configuration loading
1 parent 1daca39 commit 84f70f4

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ public void startServer(String configFileName) {
100100
}
101101

102102
public void startServer() {
103-
startServer("mcp-server.yml");
103+
YamlConfigurationLoader configurationLoader = new YamlConfigurationLoader();
104+
McpServerConfiguration configuration = configurationLoader.loadConfiguration();
105+
startServerWith(configuration);
104106
}
105107

106108
private void startServerWith(McpServerConfiguration configuration) {

src/main/java/com/github/codeboyzhou/mcp/declarative/configuration/YamlConfigurationLoader.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.io.InputStream;
1111
import java.io.InputStreamReader;
1212
import java.nio.file.NoSuchFileException;
13-
import java.util.Objects;
1413

1514
import static java.util.stream.Collectors.joining;
1615

@@ -22,14 +21,14 @@ public class YamlConfigurationLoader {
2221

2322
public McpServerConfiguration loadConfiguration() {
2423
try {
25-
McpServerConfiguration configuration = load("mcp-server.yml");
26-
if (configuration == null) {
27-
configuration = load("mcp-server.yaml");
28-
}
29-
return Objects.requireNonNullElseGet(configuration, McpServerConfiguration::defaultConfiguration);
24+
return load("mcp-server.yml");
3025
} catch (IOException e) {
31-
logger.error("Error loading configuration file, will use default configuration", e);
32-
return McpServerConfiguration.defaultConfiguration();
26+
try {
27+
return load("mcp-server.yaml");
28+
} catch (IOException ex) {
29+
logger.warn("The mcp-server.yml and mcp-server.yaml were not found, will use default configuration");
30+
return McpServerConfiguration.defaultConfiguration();
31+
}
3332
}
3433
}
3534

src/test/java/com/github/codeboyzhou/mcp/declarative/McpServersTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ void testStartServer() {
102102

103103
@ParameterizedTest
104104
@ValueSource(strings = {
105-
"mcp-server.yml",
106105
"mcp-server-async.yml",
107106
"mcp-server-sse-mode.yml",
108107
"mcp-server-not-enabled.yml"

src/test/resources/mcp-server.yml

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

0 commit comments

Comments
 (0)