[http] extract Multipart code into new ServletRequestMultipartWrapper

Mostly in the usage of felix-jetty-light there is the cases where you do
not need the multipart support and can remove the dependencies of
common-fileupload and common-io. To be able to do this we could not load
a instantiate a class that imports common-fileupload classes. So we have
to free the old class ServletRequestWrapper of this imports and add a
ServletRequestMultipartWrapper that still have the multipart support.

Signed-off-by: Stefan Bischof <stbischof@bipolis.org>

Author: stbischof

http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java

@@ -137,10 +137,25 @@ public void doFilter(final ServletRequest request, final ServletResponse respons
 		        final ExtServletContext servletContext = pr.handler.getContext();
 		        final RequestInfo requestInfo = new RequestInfo(pr.servletPath, pr.pathInfo, null, req.getRequestURI(),
 		                pr.handler.getName(), pr.matchedPattern, pr.matchValue, pr.match, false);
-		        final HttpServletRequest wrappedRequest = new ServletRequestWrapper(req, servletContext, requestInfo, null,
-		                pr.handler.getServletInfo().isAsyncSupported(),
-		                pr.handler.getMultipartConfig(),
-		                pr.handler.getMultipartSecurityContext());
+		        
+		        MultipartConfig multipartConfig = pr.handler.getMultipartConfig();
+		        HttpServletRequest wrappedRequest;
+		        if(multipartConfig==null){
+		        	wrappedRequest = new ServletRequestWrapper(req,
+		        			servletContext,
+		        			requestInfo,
+		        			null,
+		        			pr.handler.getServletInfo().isAsyncSupported(),
+		        			pr.handler.getMultipartSecurityContext());		        	
+		        }else {
+		        	wrappedRequest = new ServletRequestMultipartWrapper(req,
+		        			servletContext,
+		        			requestInfo,
+		        			null,
+		        			pr.handler.getServletInfo().isAsyncSupported(),
+		        			multipartConfig,
+		        			pr.handler.getMultipartSecurityContext());
+				}
 		        final FilterHandler[] filterHandlers = handlerRegistry.getFilters(pr, req.getDispatcherType(), pr.requestURI);
 
 		        try

http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java

@@ -67,13 +67,25 @@ public void forward(ServletRequest request, ServletResponse response) throws Ser
 
         try
         {
-            final ServletRequestWrapper req = new ServletRequestWrapper((HttpServletRequest) request,
-                    this.resolution.handler.getContext(),
-                    this.requestInfo,
-                    DispatcherType.FORWARD,
-                    this.resolution.handler.getServletInfo().isAsyncSupported(),
-                    this.resolution.handler.getMultipartConfig(),
-                    this.resolution.handler.getMultipartSecurityContext());
+            MultipartConfig multipartConfig = this.resolution.handler.getMultipartConfig();
+            ServletRequestWrapper req;
+			if (multipartConfig == null) {
+				req = new ServletRequestWrapper((HttpServletRequest) request,
+						this.resolution.handler.getContext(),
+						this.requestInfo,
+						DispatcherType.FORWARD,
+						this.resolution.handler.getServletInfo().isAsyncSupported(),
+						this.resolution.handler.getMultipartSecurityContext());
+
+			} else {
+				req = new ServletRequestMultipartWrapper((HttpServletRequest) request,
+						this.resolution.handler.getContext(),
+						this.requestInfo,
+						DispatcherType.FORWARD,
+						this.resolution.handler.getServletInfo().isAsyncSupported(),
+						multipartConfig,
+						this.resolution.handler.getMultipartSecurityContext());
+			}
             final String requestURI = UriUtils.concat(this.requestInfo.servletPath, this.requestInfo.pathInfo);
             final FilterHandler[] filterHandlers = this.resolution.handlerRegistry.getFilterHandlers(this.resolution.handler, DispatcherType.FORWARD, requestURI);
 
@@ -104,13 +116,26 @@ public void forward(ServletRequest request, ServletResponse response) throws Ser
     @Override
     public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException
     {
-        final ServletRequestWrapper req = new ServletRequestWrapper((HttpServletRequest) request,
-                this.resolution.handler.getContext(),
-                this.requestInfo,
-                DispatcherType.INCLUDE,
-                this.resolution.handler.getServletInfo().isAsyncSupported(),
-                this.resolution.handler.getMultipartConfig(),
-                this.resolution.handler.getMultipartSecurityContext());
+        MultipartConfig multipartConfig = this.resolution.handler.getMultipartConfig();
+        ServletRequestWrapper req;
+		if (multipartConfig == null) {
+			req = new ServletRequestWrapper((HttpServletRequest) request,
+					this.resolution.handler.getContext(),
+					this.requestInfo,
+					DispatcherType.INCLUDE,
+					this.resolution.handler.getServletInfo().isAsyncSupported(),
+					this.resolution.handler.getMultipartSecurityContext());
+		} else {
+			req = new ServletRequestMultipartWrapper((HttpServletRequest) request,
+					this.resolution.handler.getContext(),
+					this.requestInfo,
+					DispatcherType.INCLUDE,
+					this.resolution.handler.getServletInfo().isAsyncSupported(),
+					multipartConfig,
+					this.resolution.handler.getMultipartSecurityContext());
+
+		}
+
         final String requestURI = UriUtils.concat(this.requestInfo.servletPath, this.requestInfo.pathInfo);
         final FilterHandler[] filterHandlers = this.resolution.handlerRegistry.getFilterHandlers(this.resolution.handler, DispatcherType.INCLUDE, requestURI);