refactor: Move logging level management from McpServerSession to McpAsyncServerExchange

Signed-off-by: Christian Tzolov <[email protected]>

Author: tzolov

mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServerExchange.java

@@ -28,6 +28,8 @@ public class McpAsyncServerExchange {
 
 	private final McpSchema.Implementation clientInfo;
 
+	private volatile LoggingLevel minLoggingLevel = LoggingLevel.INFO;
+
 	private static final TypeReference<McpSchema.CreateMessageResult> CREATE_MESSAGE_RESULT_TYPE_REF = new TypeReference<>() {
 	};
 
@@ -122,11 +124,10 @@ public Mono<Void> loggingNotification(LoggingMessageNotification loggingMessageN
 		}
 
 		return Mono.defer(() -> {
-			if (!this.session.isLoingLevelEnabled(loggingMessageNotification.level())) {
-				return Mono.empty();
+			if (this.isNotificationForLevelAllowed(loggingMessageNotification.level())) {
+				return this.session.sendNotification(McpSchema.METHOD_NOTIFICATION_MESSAGE, loggingMessageNotification);
 			}
-
-			return this.session.sendNotification(McpSchema.METHOD_NOTIFICATION_MESSAGE, loggingMessageNotification);
+			return Mono.empty();
 		});
 	}
 
@@ -137,7 +138,15 @@ public Mono<Void> loggingNotification(LoggingMessageNotification loggingMessageN
 	 */
 	void setMinLoggingLevel(LoggingLevel minLoggingLevel) {
 		Assert.notNull(minLoggingLevel, "minLoggingLevel must not be null");
-		this.session.setMinLoggingLevel(minLoggingLevel);
+		this.minLoggingLevel = minLoggingLevel;
+	}
+
+	/**
+	 * Checks if the logging level bigger or equal to the minimum set logging level.
+	 * @return true if the logging level is enabled, false otherwise
+	 */
+	private boolean isNotificationForLevelAllowed(LoggingLevel loggingLevel) {
+		return loggingLevel.level() >= this.minLoggingLevel.level();
 	}
 
 }

mcp/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java

@@ -9,8 +9,6 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.modelcontextprotocol.server.McpAsyncServerExchange;
-import io.modelcontextprotocol.spec.McpSchema.LoggingLevel;
-import io.modelcontextprotocol.util.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
@@ -55,8 +53,6 @@ public class McpServerSession implements McpSession {
 
 	private final AtomicInteger state = new AtomicInteger(STATE_UNINITIALIZED);
 
-	private volatile LoggingLevel minLoggingLevel = LoggingLevel.INFO;
-
 	/**
 	 * Creates a new server session with the given parameters and the transport to use.
 	 * @param id session id
@@ -88,23 +84,6 @@ public String getId() {
 		return this.id;
 	}
 
-	/**
-	 * Checks if the logging level bigger or equal to the minimum set logging level.
-	 * @return true if the logging level is enabled, false otherwise
-	 */
-	public boolean isLoingLevelEnabled(LoggingLevel loggingLevel) {
-		return loggingLevel.level() >= this.minLoggingLevel.level();
-	}
-
-	/**
-	 * Set the minimum logging level for this session.
-	 * @param minLoggingLevel the minimum logging level
-	 */
-	public void setMinLoggingLevel(LoggingLevel minLoggingLevel) {
-		Assert.notNull(minLoggingLevel, "minLoggingLevel can't be null");
-		this.minLoggingLevel = minLoggingLevel;
-	}
-
 	/**
 	 * Called upon successful initialization sequence between the client and the server
 	 * with the client capabilities and information.
@@ -153,16 +132,6 @@ public <T> Mono<T> sendRequest(String method, Object requestParams, TypeReferenc
 	}
 
 	@Override
-	public Mono<Void> sendNotification(String method, Object params) {
-		McpSchema.JSONRPCNotification jsonrpcNotification = new McpSchema.JSONRPCNotification(McpSchema.JSONRPC_VERSION,
-				method, params);
-		return this.transport.sendMessage(jsonrpcNotification);
-	}
-
-	// NOTE: This is a workaround for the fact that the {@link #sendNotification(String,
-	// Map)} method doesn't accept types like LoggingMessageNotification
-	// TODO investigate if this method can replace the {@link #sendNotification(String,
-	// Map)} - Breaking change.
 	public Mono<Void> sendNotification(String method, Object params) {
 		McpSchema.JSONRPCNotification jsonrpcNotification = new McpSchema.JSONRPCNotification(McpSchema.JSONRPC_VERSION,
 				method, this.transport.unmarshalFrom(params, new TypeReference<Map<String, Object>>() {