GH-4374 eliminate commons-fileupload dependencies

eclipse-rdf4j · Feb 16, 2023 · 9a8b9a7 · 9a8b9a7
1 parent ee9f8a1
commit 9a8b9a7
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -390,11 +390,6 @@
 				<artifactId>commons-cli</artifactId>
 				<version>1.4</version>
 			</dependency>
-			<dependency>
-				<groupId>commons-fileupload</groupId>
-				<artifactId>commons-fileupload</artifactId>
-				<version>1.3.3</version>
-			</dependency>
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>

diff --git a/tools/workbench/pom.xml b/tools/workbench/pom.xml
@@ -39,11 +39,6 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
-		<!-- Required for CommonsMultipartResolver from the Spring Framework -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/AddServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/AddServlet.java
@@ -16,9 +16,9 @@
 import java.net.URL;
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.fileupload.FileUploadException;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.query.QueryResultHandlerException;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
@@ -33,6 +33,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@MultipartConfig
 public class AddServlet extends TransformationServlet {
 
 	private static final String URL = "url";
@@ -41,7 +42,7 @@ public class AddServlet extends TransformationServlet {
 
 	@Override
 	protected void doPost(WorkbenchRequest req, HttpServletResponse resp, String xslPath)
-			throws IOException, RepositoryException, FileUploadException, QueryResultHandlerException {
+			throws IOException, RepositoryException, QueryResultHandlerException {
 		try {
 			String baseURI = req.getParameter("baseURI");
 			String contentType = req.getParameter("Content-Type");

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ClearServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ClearServlet.java
@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.query.QueryResultHandlerException;
@@ -25,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@MultipartConfig
 public class ClearServlet extends TransformationServlet {
 
 	private final Logger logger = LoggerFactory.getLogger(ClearServlet.class);

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ContextsServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ContextsServlet.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.workbench.commands;
 
+import javax.servlet.annotation.MultipartConfig;
+
 import org.eclipse.rdf4j.common.iteration.Iterations;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.query.QueryResultHandlerException;
@@ -18,6 +20,7 @@
 import org.eclipse.rdf4j.workbench.base.TupleServlet;
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 
+@MultipartConfig
 public class ContextsServlet extends TupleServlet {
 
 	public ContextsServlet() {

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/CreateServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/CreateServlet.java
@@ -20,6 +20,7 @@
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.common.exception.RDF4JException;
@@ -45,6 +46,7 @@
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 import org.eclipse.rdf4j.workbench.util.WorkbenchRequest;
 
+@MultipartConfig
 public class CreateServlet extends TransformationServlet {
 
 	@Override

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/DeleteServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/DeleteServlet.java
@@ -14,6 +14,7 @@
 import java.io.PrintWriter;
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.query.QueryResultHandlerException;
@@ -30,6 +31,7 @@
 /**
  * Servlet responsible for presenting the list of repositories, and deleting the chosen one.
  */
+@MultipartConfig
 public class DeleteServlet extends TransformationServlet {
 
 	private static final ObjectMapper mapper = new ObjectMapper();

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ExploreServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ExploreServlet.java
@@ -12,6 +12,7 @@
 
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.common.exception.RDF4JException;
@@ -30,6 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@MultipartConfig
 public class ExploreServlet extends TupleServlet {
 
 	private final Logger logger = LoggerFactory.getLogger(ExploreServlet.class);

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ExportServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/ExportServlet.java
@@ -12,6 +12,7 @@
 
 import static org.eclipse.rdf4j.rio.RDFWriterRegistry.getInstance;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.model.Statement;
@@ -24,6 +25,7 @@
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 import org.eclipse.rdf4j.workbench.util.WorkbenchRequest;
 
+@MultipartConfig
 public class ExportServlet extends TupleServlet {
 
 	public ExportServlet() {

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/InfoServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/InfoServlet.java
@@ -15,6 +15,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.query.parser.QueryParserFactory;
@@ -31,6 +32,7 @@
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 import org.eclipse.rdf4j.workbench.util.WorkbenchRequest;
 
+@MultipartConfig
 public class InfoServlet extends TransformationServlet {
 
 	@Override

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/InformationServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/InformationServlet.java
@@ -12,11 +12,14 @@
 
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
+
 import org.eclipse.rdf4j.query.QueryResultHandlerException;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.workbench.base.TransformationServlet;
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 
+@MultipartConfig
 public class InformationServlet extends TransformationServlet {
 
 	@Override

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/NamespacesServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/NamespacesServlet.java
@@ -12,6 +12,7 @@
 
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.common.iteration.Iterations;
@@ -23,6 +24,7 @@
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 import org.eclipse.rdf4j.workbench.util.WorkbenchRequest;
 
+@MultipartConfig
 public class NamespacesServlet extends TransformationServlet {
 
 	@Override

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/QueryServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/QueryServlet.java
@@ -22,6 +22,7 @@
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -56,6 +57,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+@MultipartConfig
 public class QueryServlet extends TransformationServlet {
 
 	protected static final String REF = "ref";

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/RemoveServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/RemoveServlet.java
@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.http.protocol.Protocol;
@@ -30,6 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@MultipartConfig
 public class RemoveServlet extends TransformationServlet {
 
 	private final Logger logger = LoggerFactory.getLogger(RemoveServlet.class);

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/RepositoriesServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/RepositoriesServlet.java
@@ -12,12 +12,15 @@
 
 import java.util.List;
 
+import javax.servlet.annotation.MultipartConfig;
+
 import org.eclipse.rdf4j.query.QueryResultHandlerException;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.manager.RepositoryInfo;
 import org.eclipse.rdf4j.workbench.base.TransformationServlet;
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 
+@MultipartConfig
 public class RepositoriesServlet extends TransformationServlet {
 
 	@Override

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/SavedQueriesServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/SavedQueriesServlet.java
@@ -15,6 +15,7 @@
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.common.exception.RDF4JException;
@@ -33,6 +34,7 @@
  *
  * @author Dale Visser
  */
+@MultipartConfig
 public class SavedQueriesServlet extends TransformationServlet {
 
 	private QueryStorage storage;

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/SummaryServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/SummaryServlet.java
@@ -19,6 +19,8 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import javax.servlet.annotation.MultipartConfig;
+
 import org.eclipse.rdf4j.common.iteration.Iterations;
 import org.eclipse.rdf4j.query.MalformedQueryException;
 import org.eclipse.rdf4j.query.QueryEvaluationException;
@@ -32,6 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@MultipartConfig
 public class SummaryServlet extends TransformationServlet {
 
 	private final ExecutorService executorService = Executors.newCachedThreadPool();

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/TypesServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/TypesServlet.java
@@ -12,12 +12,15 @@
 
 import static org.eclipse.rdf4j.query.QueryLanguage.SPARQL;
 
+import javax.servlet.annotation.MultipartConfig;
+
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 import org.eclipse.rdf4j.workbench.base.TupleServlet;
 import org.eclipse.rdf4j.workbench.util.TupleResultBuilder;
 
+@MultipartConfig
 public class TypesServlet extends TupleServlet {
 
 	public TypesServlet() {

diff --git a/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/UpdateServlet.java b/tools/workbench/src/main/java/org/eclipse/rdf4j/workbench/commands/UpdateServlet.java
@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 
+import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.query.MalformedQueryException;
@@ -28,6 +29,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@MultipartConfig
 public class UpdateServlet extends TransformationServlet {
 
 	private final Logger logger = LoggerFactory.getLogger(UpdateServlet.class);