This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 890df9d988 refactor: add validation for requestTemplate and url
existence in RequestConfigHelper (#6932)
890df9d988 is described below
commit 890df9d988ff217a6bcbe780333b986fe0838caf
Author: Limbo <[email protected]>
AuthorDate: Wed Sep 30 09:55:59 2026 +0800
refactor: add validation for requestTemplate and url existence in
RequestConfigHelper (#6932)
---
.../mcp/server/request/RequestConfigHelper.java | 24 +++++++++++++++++++---
.../server/request/RequestConfigHelperTest.java | 17 ++++++++-------
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git
a/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelper.java
b/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelper.java
index 8e6ca7b807..07eb4e020e 100644
---
a/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelper.java
+++
b/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelper.java
@@ -81,7 +81,11 @@ public class RequestConfigHelper {
* @return the url template string
*/
public String getUrlTemplate() {
- return getRequestTemplate().get("url").getAsString();
+ JsonObject requestTemplate = getRequiredRequestTemplate();
+ if (!requestTemplate.has("url") ||
requestTemplate.get("url").isJsonNull()) {
+ throw new IllegalArgumentException("url is required in
requestTemplate");
+ }
+ return requestTemplate.get("url").getAsString();
}
/**
@@ -90,15 +94,29 @@ public class RequestConfigHelper {
* @return the HTTP method string
*/
public String getMethod() {
- JsonObject requestTemplate = getRequestTemplate();
+ JsonObject requestTemplate = getRequiredRequestTemplate();
return requestTemplate.has("method") ?
requestTemplate.get("method").getAsString() : "GET";
}
public boolean isArgsToJsonBody() {
- JsonObject requestTemplate = getRequestTemplate();
+ JsonObject requestTemplate = getRequiredRequestTemplate();
return requestTemplate.has("argsToJsonBody") &&
requestTemplate.get("argsToJsonBody").getAsBoolean();
}
+ /**
+ * Get the required request template json object.
+ *
+ * @return the request template json object
+ * @throws IllegalArgumentException when requestTemplate is absent
+ */
+ private JsonObject getRequiredRequestTemplate() {
+ JsonObject requestTemplate = getRequestTemplate();
+ if (Objects.isNull(requestTemplate)) {
+ throw new IllegalArgumentException("requestTemplate is required");
+ }
+ return requestTemplate;
+ }
+
/**
* Build the request path based on the URL template and argument positions.
*
diff --git
a/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelperTest.java
b/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelperTest.java
index 47b59f04ee..36fd938770 100644
---
a/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelperTest.java
+++
b/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfigHelperTest.java
@@ -127,18 +127,21 @@ class RequestConfigHelperTest {
@Test
void testMissingRequestTemplate() {
RequestConfigHelper helper = new
RequestConfigHelper("{\"argsPosition\":{}}");
- // This will fail because getRequestTemplate() returns null
- assertThrows(Exception.class, () -> {
- helper.getUrlTemplate();
- });
+ IllegalArgumentException urlException =
assertThrows(IllegalArgumentException.class, helper::getUrlTemplate);
+ assertEquals("requestTemplate is required", urlException.getMessage());
+
+ IllegalArgumentException methodException =
assertThrows(IllegalArgumentException.class, helper::getMethod);
+ assertEquals("requestTemplate is required",
methodException.getMessage());
+
+ IllegalArgumentException argsToJsonBodyException =
assertThrows(IllegalArgumentException.class, helper::isArgsToJsonBody);
+ assertEquals("requestTemplate is required",
argsToJsonBodyException.getMessage());
}
@Test
void testMissingUrlInTemplate() {
RequestConfigHelper helper = new
RequestConfigHelper("{\"requestTemplate\":{\"method\":\"GET\"}}");
- assertThrows(Exception.class, () -> {
- helper.getUrlTemplate();
- });
+ IllegalArgumentException exception =
assertThrows(IllegalArgumentException.class, helper::getUrlTemplate);
+ assertEquals("url is required in requestTemplate",
exception.getMessage());
}
@Test