read factory from init parameters

Author: reiern70

java/org/apache/catalina/core/ApplicationContext.java

@@ -17,6 +17,7 @@
 package org.apache.catalina.core;
 
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -1174,11 +1175,28 @@ protected StandardContext getContext() {
 
     public ProgressListenerFactory getProgressListenerFactory() {
         if (progressListenerFactory == null) {
-            progressListenerFactory = ProgressListenerFactory.newFactory(log, sm, context, this);
+            progressListenerFactory = newProgressListenerFactory();
         }
         return progressListenerFactory;
     }
 
+    private ProgressListenerFactory newProgressListenerFactory() {
+        String progressListenerFactoryClassName = getInitParameter(ProgressListenerFactory.FACTORY_NAME);
+        if (progressListenerFactoryClassName == null || progressListenerFactoryClassName.isEmpty()) {
+            log.warn(sm.getString("applicationContext.no.upload.progressListenerFactory", progressListenerFactoryClassName));
+            return ProgressListenerFactory.NULL_FACTORY;
+        }
+        try {
+            Class<?> progressListenerFactoryClass = Introspection.loadClass(context, progressListenerFactoryClassName);
+            Constructor<?> ctor = progressListenerFactoryClass.getConstructor();
+            return (ProgressListenerFactory) ctor.newInstance();
+        } catch (InvocationTargetException | NoSuchMethodException | InstantiationException
+                 | ClassCastException | IllegalAccessException e) {
+            log.error(sm.getString("applicationContext.invalid.progressListenerFactory", progressListenerFactoryClassName), e);
+            return ProgressListenerFactory.NULL_FACTORY;
+        }
+    }
+
     /**
      * Clear all application-created attributes.
      */

java/org/apache/tomcat/util/http/fileupload/ProgressListenerFactory.java

@@ -17,16 +17,6 @@
 
 package org.apache.tomcat.util.http.fileupload;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import jakarta.servlet.ServletContext;
-
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.util.Introspection;
-import org.apache.juli.logging.Log;
-import org.apache.tomcat.util.res.StringManager;
-
 /**
  * Factory for {@link ProgressListener}. Users can specify this via a System property. See FACTORY_NAME
  */
@@ -47,22 +37,6 @@ public ProgressListener newProgressListener() {
         }
     };
 
-    static ProgressListenerFactory newFactory(final Log log, StringManager sm, final StandardContext context, ServletContext servletContext) {
-        String progressListenerFactoryClassName = servletContext.getInitParameter(ProgressListenerFactory.FACTORY_NAME);
-        if (progressListenerFactoryClassName == null || progressListenerFactoryClassName.isEmpty()) {
-            log.warn(sm.getString("applicationContext.no.upload.progressListenerFactory", progressListenerFactoryClassName));
-            return NULL_FACTORY;
-        }
-        try {
-            Class<?> progressListenerFactoryClass = Introspection.loadClass(context, progressListenerFactoryClassName);
-            Constructor<?> ctor = progressListenerFactoryClass.getConstructor();
-            return (ProgressListenerFactory) ctor.newInstance();
-        } catch (InvocationTargetException | NoSuchMethodException | InstantiationException
-                 | ClassCastException | IllegalAccessException e) {
-            log.error(sm.getString("applicationContext.invalid.progressListenerFactory", progressListenerFactoryClassName), e);
-            return NULL_FACTORY;
-        }
-    }
 
     /**
      * @return returns a new {@link ProgressListener} for current request.