Address review comments

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

Author: tzolov

mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/WebFluxSseIntegrationTests.java

@@ -344,8 +344,8 @@ void testRootsWithMultipleHandlers(String clientType) {
 		mcpServer.close();
 	}
 
-	// @ParameterizedTest(name = "{0} : {displayName} ")
-	// @ValueSource(strings = { "httpclient", "webflux" })
+	@ParameterizedTest(name = "{0} : {displayName} ")
+	@ValueSource(strings = { "httpclient", "webflux" })
 	void testRootsServerCloseWithActiveSubscription(String clientType) {
 
 		var clientBuilder = clientBuilders.get(clientType);
@@ -380,7 +380,7 @@ void testRootsServerCloseWithActiveSubscription(String clientType) {
 
 	String emptyJsonSchema = """
 			{
-			"": "http://json-schema.org/draft-07/schema#",
+			"$schema": "http://json-schema.org/draft-07/schema#",
 			"type": "object",
 			"properties": {}
 			}

mcp/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java

@@ -6,7 +6,6 @@
 
 import java.time.Duration;
 
-import io.modelcontextprotocol.spec.McpClientTransport;
 import io.modelcontextprotocol.spec.McpSchema;
 import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities;
 import io.modelcontextprotocol.spec.McpSchema.GetPromptRequest;
@@ -321,6 +320,7 @@ public GetPromptResult getPrompt(GetPromptRequest getPromptRequest) {
 	/**
 	 * Client can set the minimum logging level it wants to receive from the server.
 	 * @param loggingLevel the min logging level
+	 * @return empty response
 	 */
 	public Object setLoggingLevel(McpSchema.LoggingLevel loggingLevel) {
 		return this.delegate.setLoggingLevel(loggingLevel).block();

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

@@ -122,14 +122,19 @@ public Mono<Void> loggingNotification(LoggingMessageNotification loggingMessageN
 		}
 
 		return Mono.defer(() -> {
-			if (loggingMessageNotification.level().level() < this.session.getMinLoggingLevel().level()) {
+			if (!this.session.isLoingLevelEnabled(loggingMessageNotification.level())) {
 				return Mono.empty();
 			}
 
 			return this.session.sendNotification(McpSchema.METHOD_NOTIFICATION_MESSAGE, loggingMessageNotification);
 		});
 	}
 
+	/**
+	 * Set the minimum logging level for the client. Messages below this level will be
+	 * filtered out.
+	 * @param minLoggingLevel The minimum logging level
+	 */
 	public void setMinLoggingLevel(LoggingLevel minLoggingLevel) {
 		Assert.notNull(minLoggingLevel, "minLoggingLevel must not be null");
 		this.session.setMinLoggingLevel(minLoggingLevel);

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

@@ -10,6 +10,7 @@
 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;
@@ -54,7 +55,7 @@ public class McpServerSession implements McpSession {
 
 	private final AtomicInteger state = new AtomicInteger(STATE_UNINITIALIZED);
 
-	private final AtomicReference<LoggingLevel> minLoggingLevel = new AtomicReference<>(LoggingLevel.INFO);
+	private volatile LoggingLevel minLoggingLevel = LoggingLevel.INFO;
 
 	/**
 	 * Creates a new server session with the given parameters and the transport to use.
@@ -87,12 +88,21 @@ public String getId() {
 		return this.id;
 	}
 
-	public LoggingLevel getMinLoggingLevel() {
-		return this.minLoggingLevel.get();
+	/**
+	 * 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) {
-		this.minLoggingLevel.set(minLoggingLevel);
+		Assert.notNull(minLoggingLevel, "minLoggingLevel can't be null");
+		this.minLoggingLevel = minLoggingLevel;
 	}
 
 	/**
@@ -149,6 +159,10 @@ public Mono<Void> sendNotification(String method, Map<String, Object> 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>>() {