Skip to content

Commit e149c59

Browse files
committed
refactor(logging): Replace logger variable name from 'logger' to 'log'
1 parent 84b2e00 commit e149c59

File tree

9 files changed

+32
-21
lines changed

9 files changed

+32
-21
lines changed

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

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

2626
public class McpServers {
2727

28-
private static final Logger logger = LoggerFactory.getLogger(McpServers.class);
28+
private static final Logger log = LoggerFactory.getLogger(McpServers.class);
2929

3030
private static final McpServers INSTANCE = new McpServers();
3131

@@ -71,7 +71,7 @@ public void startServer() {
7171

7272
private void doStartServer(McpServerConfiguration configuration) {
7373
if (!configuration.enabled()) {
74-
logger.warn("MCP server is disabled, please check your configuration file.");
74+
log.warn("MCP server is disabled, please check your configuration file.");
7575
return;
7676
}
7777

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

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

1313
public record YAMLConfigurationLoader(String configFileName) {
1414

15-
private static final Logger logger = LoggerFactory.getLogger(YAMLConfigurationLoader.class);
15+
private static final Logger log = LoggerFactory.getLogger(YAMLConfigurationLoader.class);
1616

1717
private static final String DEFAULT_CONFIG_FILE_NAME = "mcp-server.yml";
1818

@@ -24,7 +24,7 @@ public McpServerConfiguration loadConfig() {
2424
Path configFilePath = getConfigFilePath(configFileName);
2525
File file = configFilePath.toFile();
2626
McpServerConfiguration config = ObjectMappers.fromYaml(file, McpServerConfiguration.class);
27-
logger.info("Configuration loaded successfully from file: {}", configFileName);
27+
log.info("Configuration loaded successfully from file: {}", configFileName);
2828
return config;
2929
}
3030

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class McpHttpServer {
1212

13-
private static final Logger logger = LoggerFactory.getLogger(McpHttpServer.class);
13+
private static final Logger log = LoggerFactory.getLogger(McpHttpServer.class);
1414

1515
private static final String DEFAULT_SERVLET_CONTEXT_PATH = "/";
1616

@@ -45,26 +45,26 @@ public void start() {
4545
try {
4646
httpserver.start();
4747
addShutdownHook(httpserver);
48-
logger.info("Jetty-based HTTP server started on http://127.0.0.1:{}", port);
48+
log.info("Jetty-based HTTP server started on http://127.0.0.1:{}", port);
4949
} catch (Exception e) {
50-
logger.error("Error starting HTTP server on http://127.0.0.1:{}", port, e);
50+
log.error("Error starting HTTP server on http://127.0.0.1:{}", port, e);
5151
}
5252

5353
try {
5454
httpserver.join();
5555
} catch (InterruptedException e) {
56-
logger.error("Error joining HTTP server", e);
56+
log.error("Error joining HTTP server", e);
5757
}
5858
}
5959

6060
private void addShutdownHook(Server httpserver) {
6161
Runnable runnable =
6262
() -> {
6363
try {
64-
logger.info("Shutting down HTTP server and MCP server");
64+
log.info("Shutting down HTTP server and MCP server");
6565
httpserver.stop();
6666
} catch (Exception e) {
67-
logger.error("Error stopping HTTP server and MCP server", e);
67+
log.error("Error stopping HTTP server and MCP server", e);
6868
}
6969
};
7070
Thread shutdownHook = new Thread(runnable);

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
@@ -12,7 +12,7 @@
1212

1313
public abstract class AbstractMcpServerComponentFactory<T> implements McpServerComponentFactory<T> {
1414

15-
private static final Logger logger =
15+
private static final Logger log =
1616
LoggerFactory.getLogger(AbstractMcpServerComponentFactory.class);
1717

1818
private static final String RESOURCE_BUNDLE_BASE_NAME = "i18n/mcp_server_component_descriptions";
@@ -44,7 +44,7 @@ private ResourceBundle loadResourceBundle() {
4444
try {
4545
return ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE_NAME, locale);
4646
} catch (Exception e) {
47-
logger.warn(
47+
log.warn(
4848
"Can't find resource bundle for base name: {}, locale {}, i18n will be unsupported",
4949
RESOURCE_BUNDLE_BASE_NAME,
5050
locale);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class McpServerPromptFactory
3030
extends AbstractMcpServerComponentFactory<McpServerFeatures.SyncPromptSpecification> {
3131

32-
private static final Logger logger = LoggerFactory.getLogger(McpServerPromptFactory.class);
32+
private static final Logger log = LoggerFactory.getLogger(McpServerPromptFactory.class);
3333

3434
@Inject
3535
protected McpServerPromptFactory(
@@ -45,7 +45,7 @@ public McpServerFeatures.SyncPromptSpecification create(Class<?> clazz, Method m
4545
final String description = resolveComponentAttributeValue(promptMethod.description());
4646
List<McpSchema.PromptArgument> promptArguments = createPromptArguments(method);
4747
McpSchema.Prompt prompt = new McpSchema.Prompt(name, title, description, promptArguments);
48-
logger.debug("Registering prompt: {}", ObjectMappers.toJson(prompt));
48+
log.debug("Registering prompt: {}", ObjectMappers.toJson(prompt));
4949
return new McpServerFeatures.SyncPromptSpecification(
5050
prompt,
5151
(exchange, request) -> {
@@ -56,7 +56,7 @@ public McpServerFeatures.SyncPromptSpecification create(Class<?> clazz, Method m
5656
asTypedParameters(method, promptArguments, request.arguments());
5757
result = method.invoke(instance, typedParameters.values().toArray());
5858
} catch (Exception e) {
59-
logger.error("Error invoking prompt method", e);
59+
log.error("Error invoking prompt method", e);
6060
result = e + ": " + e.getMessage();
6161
}
6262
McpSchema.Content content = new McpSchema.TextContent(result.toString());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public class McpServerResourceFactory
2323
extends AbstractMcpServerComponentFactory<McpServerFeatures.SyncResourceSpecification> {
2424

25-
private static final Logger logger = LoggerFactory.getLogger(McpServerResourceFactory.class);
25+
private static final Logger log = LoggerFactory.getLogger(McpServerResourceFactory.class);
2626

2727
@Inject
2828
protected McpServerResourceFactory(
@@ -45,7 +45,7 @@ public McpServerFeatures.SyncResourceSpecification create(Class<?> clazz, Method
4545
.mimeType(res.mimeType())
4646
.annotations(new McpSchema.Annotations(List.of(res.roles()), res.priority()))
4747
.build();
48-
logger.debug("Registering resource: {}", ObjectMappers.toJson(resource));
48+
log.debug("Registering resource: {}", ObjectMappers.toJson(resource));
4949
return new McpServerFeatures.SyncResourceSpecification(
5050
resource,
5151
(exchange, request) -> {
@@ -54,7 +54,7 @@ public McpServerFeatures.SyncResourceSpecification create(Class<?> clazz, Method
5454
Object instance = injector.getInstance(clazz);
5555
result = method.invoke(instance);
5656
} catch (Exception e) {
57-
logger.error("Error invoking resource method", e);
57+
log.error("Error invoking resource method", e);
5858
result = e + ": " + e.getMessage();
5959
}
6060
McpSchema.ResourceContents contents =

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class McpServerToolFactory
3535
extends AbstractMcpServerComponentFactory<McpServerFeatures.SyncToolSpecification> {
3636

37-
private static final Logger logger = LoggerFactory.getLogger(McpServerToolFactory.class);
37+
private static final Logger log = LoggerFactory.getLogger(McpServerToolFactory.class);
3838

3939
@Inject
4040
protected McpServerToolFactory(
@@ -56,7 +56,7 @@ public McpServerFeatures.SyncToolSpecification create(Class<?> clazz, Method met
5656
.description(description)
5757
.inputSchema(paramSchema)
5858
.build();
59-
logger.debug("Registering tool: {}", ObjectMappers.toJson(tool));
59+
log.debug("Registering tool: {}", ObjectMappers.toJson(tool));
6060
return McpServerFeatures.SyncToolSpecification.builder()
6161
.tool(tool)
6262
.callHandler(
@@ -69,7 +69,7 @@ public McpServerFeatures.SyncToolSpecification create(Class<?> clazz, Method met
6969
Map<String, Object> typedArgs = asTypedParameters(paramSchema, args);
7070
result = method.invoke(instance, typedArgs.values().toArray());
7171
} catch (Exception e) {
72-
logger.error("Error invoking tool method", e);
72+
log.error("Error invoking tool method", e);
7373
result = e + ": " + e.getMessage();
7474
isError = true;
7575
}

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpSseServerFactory.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33
import com.github.codeboyzhou.mcp.declarative.server.McpHttpServer;
44
import io.modelcontextprotocol.server.McpServer;
55
import io.modelcontextprotocol.server.transport.HttpServletSseServerTransportProvider;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68

79
public class McpSseServerFactory extends AbstractMcpServerFactory<McpSseServerInfo> {
10+
11+
private static final Logger log = LoggerFactory.getLogger(McpSseServerFactory.class);
12+
813
@Override
914
public McpServer.SyncSpecification<?> sync(McpSseServerInfo info) {
15+
log.warn("HTTP SSE mode has been deprecated, recommend to use Stream HTTP server instead.");
1016
HttpServletSseServerTransportProvider transportProvider =
1117
HttpServletSseServerTransportProvider.builder()
1218
.baseUrl(info.baseUrl())

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpSseServerFactory.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,20 @@
55
import com.github.codeboyzhou.mcp.declarative.server.McpHttpServer;
66
import io.modelcontextprotocol.server.McpServer;
77
import io.modelcontextprotocol.server.transport.HttpServletSseServerTransportProvider;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
810

911
public class ConfigurableMcpSseServerFactory extends AbstractConfigurableMcpServerFactory {
1012

13+
private static final Logger log = LoggerFactory.getLogger(ConfigurableMcpSseServerFactory.class);
14+
1115
public ConfigurableMcpSseServerFactory(McpServerConfiguration configuration) {
1216
super(configuration);
1317
}
1418

1519
@Override
1620
public McpServer.SyncSpecification<?> specification() {
21+
log.warn("HTTP SSE mode has been deprecated, recommend to use Stream HTTP server instead.");
1722
McpServerSSE sse = configuration.sse();
1823
HttpServletSseServerTransportProvider transportProvider =
1924
HttpServletSseServerTransportProvider.builder()

0 commit comments

Comments
 (0)