This is an automated email from the ASF dual-hosted git repository.
terrymanu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 3ab2d587c41 Standardize Optional lambda parameter names (#38744)
3ab2d587c41 is described below
commit 3ab2d587c4153fdb07778776703f48f0c03e102d
Author: Liang Zhang <[email protected]>
AuthorDate: Thu May 28 14:26:46 2026 +0800
Standardize Optional lambda parameter names (#38744)
---
.../transport/capability/tool/MCPToolClarificationPolicy.java | 4 ++--
.../validator/ShardingSphereServerTransportSecurityValidator.java | 3 ++-
.../mcp/core/completion/provider/MetadataCompletionProvider.java | 4 ++--
.../core/resource/handler/metadata/MetadataResourceHandler.java | 4 ++--
.../support/descriptor/MCPResourceNavigationPayloadBuilder.java | 4 ++--
.../mcp/support/descriptor/MCPDescriptorCatalogIndexTest.java | 2 +-
.../test/e2e/mcp/llm/conversation/LLMMCPConversationRunner.java | 8 ++++----
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/capability/tool/MCPToolClarificationPolicy.java
b/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/capability/tool/MCPToolClarificationPolicy.java
index 87d2b68c93a..370816fd287 100644
---
a/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/capability/tool/MCPToolClarificationPolicy.java
+++
b/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/capability/tool/MCPToolClarificationPolicy.java
@@ -55,7 +55,7 @@ final class MCPToolClarificationPolicy {
boolean requiresPlanningClarification(final MCPToolDescriptor
toolDescriptor, final Map<String, Object> payload) {
Object clarificationQuestions =
payload.get(MCPPayloadFieldNames.CLARIFICATION_QUESTIONS);
return
MCPDescriptorCatalogIndex.findToolRuntimeDescriptor(toolDescriptor.getName())
- .map(runtimeDescriptor ->
PLANNING_WORKFLOW_ROLE.equals(runtimeDescriptor.getWorkflowRole())).orElse(false)
+ .map(optional ->
PLANNING_WORKFLOW_ROLE.equals(optional.getWorkflowRole())).orElse(false)
&& clarificationQuestions instanceof List<?> questions &&
!questions.isEmpty();
}
@@ -228,7 +228,7 @@ final class MCPToolClarificationPolicy {
if (hasArgument(toolDescriptor, field) &&
!isObjectArgument(toolDescriptor, field)) {
return Optional.of(new ArgumentBinding(formPropertyName, field,
"", inputType, allowedValues));
}
- return findObjectArgumentName(toolDescriptor,
field).map(objectArgumentName -> new ArgumentBinding(formPropertyName,
objectArgumentName, field, inputType, allowedValues));
+ return findObjectArgumentName(toolDescriptor, field).map(optional ->
new ArgumentBinding(formPropertyName, optional, field, inputType,
allowedValues));
}
private boolean isBindableObjectProperty(final MCPToolDescriptor
toolDescriptor, final String argumentName, final String fieldName) {
diff --git
a/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/server/http/validator/ShardingSphereServerTransportSecurityValidator.java
b/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/server/http/validator/ShardingSphereServerTransportSecurityValidator.java
index 8f434fcd7ea..1f92b0db00e 100644
---
a/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/server/http/validator/ShardingSphereServerTransportSecurityValidator.java
+++
b/mcp/bootstrap/src/main/java/org/apache/shardingsphere/mcp/bootstrap/transport/server/http/validator/ShardingSphereServerTransportSecurityValidator.java
@@ -54,6 +54,7 @@ public final class
ShardingSphereServerTransportSecurityValidator implements Ser
private String getFirstHeaderValue(final Map<String, List<String>>
headers, final String headerName) {
return headers.entrySet().stream()
- .filter(entry -> headerName.equalsIgnoreCase(entry.getKey())
&& !entry.getValue().isEmpty()).findFirst().map(entry ->
Objects.toString(entry.getValue().get(0), "").trim()).orElse("");
+ .filter(entry -> headerName.equalsIgnoreCase(entry.getKey())
&& !entry.getValue().isEmpty()).findFirst().map(optional ->
Objects.toString(optional.getValue().get(0), "").trim())
+ .orElse("");
}
}
diff --git
a/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/completion/provider/MetadataCompletionProvider.java
b/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/completion/provider/MetadataCompletionProvider.java
index 36cd891936b..eebc7831484 100644
---
a/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/completion/provider/MetadataCompletionProvider.java
+++
b/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/completion/provider/MetadataCompletionProvider.java
@@ -96,8 +96,8 @@ public final class MetadataCompletionProvider implements
MCPCompletionProvider<M
return Map.of();
}
return
handlerContext.getMetadataQueryFacade().queryDatabase(contextArguments.get("database"))
- .filter(each -> 1 == each.getSchemas().size())
- .map(each -> Map.<String, Object>of("schema",
each.getSchemas().iterator().next().getSchema()))
+ .filter(optional -> 1 == optional.getSchemas().size())
+ .map(optional -> Map.<String, Object>of("schema",
optional.getSchemas().iterator().next().getSchema()))
.orElseGet(Map::of);
}
diff --git
a/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/resource/handler/metadata/MetadataResourceHandler.java
b/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/resource/handler/metadata/MetadataResourceHandler.java
index 83a3a7321f5..607dbb787bd 100644
---
a/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/resource/handler/metadata/MetadataResourceHandler.java
+++
b/mcp/core/src/main/java/org/apache/shardingsphere/mcp/core/resource/handler/metadata/MetadataResourceHandler.java
@@ -219,7 +219,7 @@ public final class MetadataResourceHandler implements
MCPResourceHandler<MCPData
Map<String, Object> result = new LinkedHashMap<>(3, 1F);
String uriOrTemplate = descriptor.getUriTemplate();
Optional<String> selfUri = new
MCPUriTemplate(uriOrTemplate).expandIfComplete(uriVariables);
- selfUri.ifPresent(uri -> result.put("self_uri", uri));
+ selfUri.ifPresent(optional -> result.put("self_uri", optional));
String parentUri = createParentUri(selfUri.orElse(""));
if (!parentUri.isEmpty()) {
result.put(MCPPayloadFieldNames.PARENT_RESOURCE,
MCPResourceHintUtils.create(parentUri, resolveResourceKind(parentUri),
"inspect_parent",
@@ -236,7 +236,7 @@ public final class MetadataResourceHandler implements
MCPResourceHandler<MCPData
private Optional<Map<String, Object>> createNextResourceHint(final String
uriTemplate, final String description, final MCPUriVariables variables) {
return new MCPUriTemplate(uriTemplate).expandIfComplete(variables)
- .map(uri -> MCPResourceHintUtils.create(uri,
resolveResourceKind(uri), "inspect_detail", description,
MCPPayloadFieldNames.NEXT_RESOURCES));
+ .map(optional -> MCPResourceHintUtils.create(optional,
resolveResourceKind(optional), "inspect_detail", description,
MCPPayloadFieldNames.NEXT_RESOURCES));
}
private String resolveResourceKind(final String uri) {
diff --git
a/mcp/support/src/main/java/org/apache/shardingsphere/mcp/support/descriptor/MCPResourceNavigationPayloadBuilder.java
b/mcp/support/src/main/java/org/apache/shardingsphere/mcp/support/descriptor/MCPResourceNavigationPayloadBuilder.java
index 496d80bde17..03b427c709c 100644
---
a/mcp/support/src/main/java/org/apache/shardingsphere/mcp/support/descriptor/MCPResourceNavigationPayloadBuilder.java
+++
b/mcp/support/src/main/java/org/apache/shardingsphere/mcp/support/descriptor/MCPResourceNavigationPayloadBuilder.java
@@ -56,9 +56,9 @@ public final class MCPResourceNavigationPayloadBuilder {
*/
public static Map<String, Object> create(final MCPResourceDescriptor
descriptor, final MCPUriVariables uriVariables, final String parentUriTemplate)
{
Map<String, Object> result = new LinkedHashMap<>(2, 1F);
- new
MCPUriTemplate(descriptor.getUriTemplate()).expandIfComplete(uriVariables).ifPresent(uri
-> result.put("self_uri", uri));
+ new
MCPUriTemplate(descriptor.getUriTemplate()).expandIfComplete(uriVariables).ifPresent(optional
-> result.put("self_uri", optional));
Optional<String> parentUri = new
MCPUriTemplate(parentUriTemplate).expandIfComplete(uriVariables);
- parentUri.filter(uri -> !uri.isEmpty()).ifPresent(uri ->
result.put(MCPPayloadFieldNames.PARENT_RESOURCE,
createParentResourceHint(uri)));
+ parentUri.filter(optional -> !optional.isEmpty()).ifPresent(optional
-> result.put(MCPPayloadFieldNames.PARENT_RESOURCE,
createParentResourceHint(optional)));
return result;
}
diff --git
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/descriptor/MCPDescriptorCatalogIndexTest.java
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/descriptor/MCPDescriptorCatalogIndexTest.java
index efe21f5d5ff..bb2e61845b4 100644
---
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/descriptor/MCPDescriptorCatalogIndexTest.java
+++
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/descriptor/MCPDescriptorCatalogIndexTest.java
@@ -89,7 +89,7 @@ class MCPDescriptorCatalogIndexTest {
@Test
void assertFindToolRuntimeDescriptor() {
assertTrue(MCPDescriptorCatalogIndex.findToolRuntimeDescriptor("database_gateway_apply_workflow")
- .filter(each -> "apply".equals(each.getWorkflowRole()) &&
each.getSideEffectScope().contains("rule-metadata")).isPresent());
+ .filter(optional -> "apply".equals(optional.getWorkflowRole())
&& optional.getSideEffectScope().contains("rule-metadata")).isPresent());
}
@Test
diff --git
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationRunner.java
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationRunner.java
index f23acfb41df..9b4d0a94396 100644
---
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationRunner.java
+++
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationRunner.java
@@ -429,10 +429,10 @@ public final class LLMMCPConversationRunner {
private Optional<LLME2EArtifactBundle> validateToolCall(final
LLME2EScenario scenario, final String toolName, final Map<String, Object>
arguments,
final
LLMMCPConversationArtifacts artifacts) {
return safetyValidator.validate(toolName, arguments)
- .map(each -> {
-
artifacts.addInteractionTrace(MCPInteractionTraceRecord.createInvalidAction(artifacts.nextSequence(),
each.traceKind(), toolName, arguments,
- each.failureType()));
- return createFailureBundle(scenario, artifacts,
each.failureType(), each.message());
+ .map(optional -> {
+
artifacts.addInteractionTrace(MCPInteractionTraceRecord.createInvalidAction(artifacts.nextSequence(),
optional.traceKind(), toolName, arguments,
+ optional.failureType()));
+ return createFailureBundle(scenario, artifacts,
optional.failureType(), optional.message());
});
}
