This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3183fd399bbd46853a7d2e50e37cef0321205ebb Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Jan 27 12:57:10 2023 +0000 Refactor to reduce code duplication --- .../annotation/TestServletSecurityMappings.java | 51 +++------------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/test/jakarta/servlet/annotation/TestServletSecurityMappings.java b/test/jakarta/servlet/annotation/TestServletSecurityMappings.java index 3d4cfcf5c7..60440ea0fe 100644 --- a/test/jakarta/servlet/annotation/TestServletSecurityMappings.java +++ b/test/jakarta/servlet/annotation/TestServletSecurityMappings.java @@ -149,21 +149,21 @@ public class TestServletSecurityMappings extends TomcatBaseTest { if (secureRoot) { sr = ctx.addServlet("Root", SecureRoot.class.getName()); } else { - sr = ctx.addServlet("Root", Root.class.getName()); + sr = ctx.addServlet("Root", Ok.class.getName()); } sr.addMapping(""); if (secureDefault) { sr = ctx.addServlet("Default", SecureDefault.class.getName()); } else { - sr = ctx.addServlet("Default", Default.class.getName()); + sr = ctx.addServlet("Default", Ok.class.getName()); } sr.addMapping("/"); if (secureFoo) { sr = ctx.addServlet("Foo", SecureFoo.class.getName()); } else { - sr = ctx.addServlet("Foo", Foo.class.getName()); + sr = ctx.addServlet("Foo", Ok.class.getName()); } sr.addMapping("/foo"); } @@ -171,64 +171,27 @@ public class TestServletSecurityMappings extends TomcatBaseTest { @ServletSecurity(@HttpConstraint(ServletSecurity.EmptyRoleSemantic.DENY)) - public static class SecureRoot extends HttpServlet { + public static class SecureRoot extends Ok { private static final long serialVersionUID = 1L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.getWriter().print("OK"); - } - } - - - public static class Root extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.getWriter().print("OK"); - } } @ServletSecurity(@HttpConstraint(ServletSecurity.EmptyRoleSemantic.DENY)) - public static class SecureDefault extends HttpServlet { + public static class SecureDefault extends Ok { private static final long serialVersionUID = 1L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.getWriter().print("OK"); - } - } - - - public static class Default extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.getWriter().print("OK"); - } } @ServletSecurity(@HttpConstraint(ServletSecurity.EmptyRoleSemantic.DENY)) - public static class SecureFoo extends HttpServlet { + public static class SecureFoo extends Ok { private static final long serialVersionUID = 1L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.getWriter().print("OK"); - } } - public static class Foo extends HttpServlet { + public static class Ok extends HttpServlet { private static final long serialVersionUID = 1L; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org