(nifi) branch main updated: NIFI-13900 Fixed Jetty Servlet Mapping Log Warnings This closes #9422

[joewitt]

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 069d892bc1 NIFI-13900 Fixed Jetty Servlet Mapping Log Warnings This 
closes #9422
069d892bc1 is described below

commit 069d892bc1711b0c3e0fb4e17c338339a5e46e58
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Fri Oct 18 15:49:55 2024 -0500

    NIFI-13900 Fixed Jetty Servlet Mapping Log Warnings
    This closes #9422
    
    - Switched from DefaultServlet to ResourceServlet for documentation 
resources
    - Added Server instance to RewriteHandler
    
    Signed-off-by: Joseph Witt <joew...@apache.org>
---
 .../src/main/java/org/apache/nifi/web/server/JettyServer.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
index dbb6f112a4..27f17894b6 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
@@ -115,6 +115,7 @@ import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.AppProvider;
 import org.eclipse.jetty.deploy.DeploymentManager;
 import org.eclipse.jetty.ee10.servlet.FilterMapping;
+import org.eclipse.jetty.ee10.servlet.ResourceServlet;
 import org.eclipse.jetty.ee10.servlet.ServletHandler;
 import org.eclipse.jetty.ee10.webapp.MetaInfConfiguration;
 import org.eclipse.jetty.rewrite.handler.RedirectPatternRule;
@@ -126,7 +127,6 @@ import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.ee10.servlet.DefaultServlet;
 import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
 import org.eclipse.jetty.ee10.servlet.FilterHolder;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
@@ -316,6 +316,7 @@ public class JettyServer implements NiFiServer, 
ExtensionUiLoader {
 
         // add a rewrite error handler for the ui to handle 404
         final RewriteHandler uiErrorHandler = new RewriteHandler();
+        uiErrorHandler.setServer(server);
         final RedirectPatternRule redirectToUi = new RedirectPatternRule("/*", 
"/nifi/#/404");
         uiErrorHandler.addRule(redirectToUi);
         webUiContext.setErrorHandler(uiErrorHandler);
@@ -707,13 +708,13 @@ public class JettyServer implements NiFiServer, 
ExtensionUiLoader {
         try {
             final File docsDir = getDocsDir();
 
-            final ServletHolder docs = new ServletHolder("docs", 
DefaultServlet.class);
+            final ServletHolder docs = new ServletHolder("docs", 
ResourceServlet.class);
             final Path htmlBaseResource = docsDir.toPath().resolve("html");
             docs.setInitParameter("baseResource", htmlBaseResource.toString());
             docs.setInitParameter("dirAllowed", "false");
             webAppContext.addServlet(docs, "/html/*");
 
-            final ServletHolder restApi = new ServletHolder("rest-api", 
DefaultServlet.class);
+            final ServletHolder restApi = new ServletHolder("rest-api", 
ResourceServlet.class);
             final File webApiDocsDir = getWebApiDocsDir();
             restApi.setInitParameter("baseResource", webApiDocsDir.getPath());
             restApi.setInitParameter("dirAllowed", "false");