This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 8fac90ef1f3926ec53a031cb8084e3a703a29744 Author: Robert Lazarski <[email protected]> AuthorDate: Mon Apr 6 01:50:21 2026 -1000 springbootdemo: Gemini review fixes — uri.endsWith consistency and axis2.version property use - Replace uri.contains(\"/swagger-ui\") with uri.endsWith(\"/swagger-ui\") || uri.contains(\"/swagger-ui/\") in OpenApiServlet (both springbootdemo and springbootdemo-tomcat11) — prevents false matches on URIs that happen to contain /swagger-ui as a non-terminal substring - Use \${axis2.version} property for axis2-openapi dependency version in springbootdemo-tomcat11 pom.xml — consistent with the property already used in the antrun copy tasks added in the previous commit Co-Authored-By: Claude Sonnet 4.6 <[email protected]> --- modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml | 2 +- .../main/java/userguide/springboot/configuration/OpenApiServlet.java | 2 +- .../main/java/userguide/springboot/configuration/OpenApiServlet.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml b/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml index 92a044730a..b0e92811fe 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml +++ b/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml @@ -234,7 +234,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-openapi</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${axis2.version}</version> </dependency> <dependency> <groupId>org.apache.neethi</groupId> diff --git a/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/src/main/java/userguide/springboot/configuration/OpenApiServlet.java b/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/src/main/java/userguide/springboot/configuration/OpenApiServlet.java index 4c6faf999f..623efe3c2e 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/src/main/java/userguide/springboot/configuration/OpenApiServlet.java +++ b/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/src/main/java/userguide/springboot/configuration/OpenApiServlet.java @@ -68,7 +68,7 @@ public class OpenApiServlet extends HttpServlet { handler.handleOpenApiJsonRequest(request, response); } else if (uri.endsWith("/openapi.yaml")) { handler.handleOpenApiYamlRequest(request, response); - } else if (uri.contains("/swagger-ui")) { + } else if (uri.endsWith("/swagger-ui") || uri.contains("/swagger-ui/")) { handler.handleSwaggerUIRequest(request, response); } else { response.sendError(HttpServletResponse.SC_NOT_FOUND); diff --git a/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/configuration/OpenApiServlet.java b/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/configuration/OpenApiServlet.java index 2eccd5aed7..a43da90d1f 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/configuration/OpenApiServlet.java +++ b/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/configuration/OpenApiServlet.java @@ -68,7 +68,7 @@ public class OpenApiServlet extends HttpServlet { handler.handleOpenApiJsonRequest(request, response); } else if (uri.endsWith("/openapi.yaml")) { handler.handleOpenApiYamlRequest(request, response); - } else if (uri.contains("/swagger-ui")) { + } else if (uri.endsWith("/swagger-ui") || uri.contains("/swagger-ui/")) { handler.handleSwaggerUIRequest(request, response); } else { response.sendError(HttpServletResponse.SC_NOT_FOUND);
