Another try to resolve CodeQL warning

Author: trask

instrumentation/servlet/servlet-3.0/testing/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/RequestDispatcherServlet.java

@@ -22,11 +22,7 @@ public static class Forward extends HttpServlet {
     @Override
     protected void service(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
-      String target = req.getServletPath().replace("/dispatch", "");
-      ServerEndpoint endpoint = ServerEndpoint.forPath(target);
-      if (endpoint == null) {
-        throw new IllegalStateException("Unexpected endpoint: " + target);
-      }
+      String target = getTargetSafely(req);
       ServletContext context = getServletContext();
       RequestDispatcher dispatcher = context.getRequestDispatcher(target);
       dispatcher.forward(req, resp);
@@ -38,24 +34,28 @@ public static class Include extends HttpServlet {
     @Override
     protected void service(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
-      String target = req.getServletPath().replace("/dispatch", "");
+      String target = getTargetSafely(req);
       ServletContext context = getServletContext();
       RequestDispatcher dispatcher = context.getRequestDispatcher(target);
-      ServerEndpoint endpoint = ServerEndpoint.forPath(target);
-      if (endpoint == null) {
-        throw new IllegalStateException("Unexpected endpoint: " + target);
-      }
       // for HTML test case, set the content type before calling include because
       // setContentType will be rejected if called inside include
       // check
       // https://docs.oracle.com/javaee/7/api/javax/servlet/RequestDispatcher.html#include-javax.servlet.ServletRequest-javax.servlet.ServletResponse-
-      if (endpoint == AbstractServlet3Test.HTML_PRINT_WRITER
-          || endpoint == AbstractServlet3Test.HTML_SERVLET_OUTPUT_STREAM) {
+      if ("/htmlPrintWriter".equals(target) || "/htmlServletOutputStream".equals(target)) {
         resp.setContentType("text/html");
       }
       dispatcher.include(req, resp);
     }
   }
 
+  private static String getTargetSafely(HttpServletRequest req) {
+    String target = req.getServletPath().replace("/dispatch", "");
+    ServerEndpoint endpoint = ServerEndpoint.forPath(target);
+    if (endpoint != null) {
+      return endpoint.getPath();
+    }
+    throw new IllegalStateException("Unexpected endpoint: " + target);
+  }
+
   private RequestDispatcherServlet() {}
 }

instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/RequestDispatcherServlet.java

@@ -24,11 +24,7 @@ public static class Forward extends HttpServlet {
     @Override
     protected void service(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
-      String target = req.getServletPath().replace("/dispatch", "");
-      ServerEndpoint endpoint = ServerEndpoint.forPath(target);
-      if (endpoint == null) {
-        throw new IllegalStateException("Unexpected endpoint: " + target);
-      }
+      String target = getTargetSafely(req);
       ServletContext context = getServletContext();
       RequestDispatcher dispatcher = context.getRequestDispatcher(target);
       dispatcher.forward(req, resp);
@@ -42,22 +38,26 @@ public static class Include extends HttpServlet {
     @Override
     protected void service(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
-      String target = req.getServletPath().replace("/dispatch", "");
+      String target = getTargetSafely(req);
       ServletContext context = getServletContext();
       RequestDispatcher dispatcher = context.getRequestDispatcher(target);
-      ServerEndpoint endpoint = ServerEndpoint.forPath(target);
-      if (endpoint == null) {
-        throw new IllegalStateException("Unexpected endpoint: " + target);
-      }
       // For the HTML test cases, set the content type before include() because the response is
       // already committed for header updates inside the included resource.
-      if (endpoint == AbstractServlet5Test.HTML_PRINT_WRITER
-          || endpoint == AbstractServlet5Test.HTML_SERVLET_OUTPUT_STREAM) {
+      if ("/htmlPrintWriter".equals(target) || "/htmlServletOutputStream".equals(target)) {
         resp.setContentType("text/html");
       }
       dispatcher.include(req, resp);
     }
   }
 
+  private static String getTargetSafely(HttpServletRequest req) {
+    String target = req.getServletPath().replace("/dispatch", "");
+    ServerEndpoint endpoint = ServerEndpoint.forPath(target);
+    if (endpoint != null) {
+      return endpoint.getPath();
+    }
+    throw new IllegalStateException("Unexpected endpoint: " + target);
+  }
+
   private RequestDispatcherServlet() {}
 }