javax -> jakarta + jetty 12

Author: rainer-prosi

build.gradle

@@ -18,7 +18,7 @@ java {
     withJavadocJar()
     withSourcesJar()
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
@@ -123,20 +123,21 @@ processResources {
 }
 
 dependencies {
-    implementation('org.cip4.lib.jdf:JDFLibJ:2.1.8.+') {
+    implementation('org.cip4.lib.jdf:JDFLibJ:2.+') {
         exclude group: 'xml-apis'
     }
 
-    implementation 'org.eclipse.jetty:jetty-servlet:10.0.15'
-    implementation 'commons-fileupload:commons-fileupload:1.5'
-   
+    implementation 'org.eclipse.jetty:jetty-server:12.0.19'
+implementation 'org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19'
+implementation 'org.apache.commons:commons-fileupload2-jakarta-servlet6:2.+'
+    implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'  
     implementation 'org.apache.logging.log4j:log4j-core:2.24.1'
     implementation 'org.apache.logging.log4j:log4j-jcl:2.24.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
-    testImplementation 'org.springframework:spring-test:5.3.39'
-    testImplementation 'org.springframework:spring-web:5.3.39'
+    testImplementation 'org.springframework:spring-test:6.2.+'
+    testImplementation 'org.springframework:spring-web:6.2.+'
     testImplementation 'org.mockito:mockito-core:5.17.0'
 }
 

src/main/java/org/cip4/jdfutility/CheckJDFServlet.java

@@ -46,12 +46,8 @@
 import java.io.PrintWriter;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
 import org.apache.commons.io.IOUtils;
 import org.cip4.jdflib.core.AttributeName;
 import org.cip4.jdflib.core.JDFAudit;
@@ -74,6 +70,10 @@
 import org.cip4.jdflib.util.UrlUtil;
 import org.cip4.jdflib.validate.JDFValidator;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * This servlet parses any file and returns any XMP packet found in the file.
  *
@@ -140,7 +140,7 @@ public CheckJDFCall(final UtilityServlet utilityServlet, final HttpServletReques
 		@Override
 		protected void processPost() throws ServletException, IOException
 		{
-			final boolean mp = ServletFileUpload.isMultipartContent(request);
+			final boolean mp = JakartaServletFileUpload.isMultipartContent(request);
 			if (mp)
 			{
 				processMultipartRequest(request, response);
@@ -169,7 +169,7 @@ public FixCall(final UtilityServlet utilityServlet, final HttpServletRequest req
 		@Override
 		protected void processPost() throws ServletException, IOException
 		{
-			if (ServletFileUpload.isMultipartContent(request))
+			if (JakartaServletFileUpload.isMultipartContent(request))
 			{
 				doFix(request, response);
 			}
@@ -186,12 +186,12 @@ protected void processPost() throws ServletException, IOException
 		 */
 		protected void doFix(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
 		{
-			final List<FileItem> fileItems = FileItemList.getMemoryFileItemList(request, 20l * 1024 * 1024).getFileList(true, true);
-			FileItem fileItem = null;
+			final List<DiskFileItem> fileItems = FileItemList.getMemoryFileItemList(request, 20l * 1024 * 1024).getFileList(true, true);
+			DiskFileItem fileItem = null;
 			EnumVersion version = null;
 			int nFiles = 0;
 			String versionField = "";
-			for (final FileItem item : fileItems)
+			for (final DiskFileItem item : fileItems)
 			{
 				if (item.isFormField())
 				{
@@ -406,11 +406,11 @@ JDFDoc updateSingle(EnumVersion version, final JDFDoc d0)
 	protected void processMultipartRequest(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException
 	{
 		// Parse the multipart request
-		final List<FileItem> fileItems = FileItemList.getMemoryFileItemList(req, 66l * 1024l * 1024l).getFileList(true, true);
+		final List<DiskFileItem> fileItems = FileItemList.getMemoryFileItemList(req, 66l * 1024l * 1024l).getFileList(true, true);
 
 		// Get the first file item
 		// To do: Process all file items
-		FileItem fileItem = null;
+		DiskFileItem fileItem = null;
 		boolean bUseSchema = false;
 		boolean bIgnorePrivate = false;
 		boolean prettyFormat = false;
@@ -419,7 +419,7 @@ protected void processMultipartRequest(final HttpServletRequest req, final HttpS
 		final String validationLevel = EnumValidationLevel.Complete.getName();
 		String devcapName = null;
 		File devcapFile = null;
-		for (final FileItem item : fileItems)
+		for (final DiskFileItem item : fileItems)
 		{
 			final String fieldName = item.getFieldName();
 
@@ -543,7 +543,6 @@ private JDFValidator getChecker(final boolean bUseSchema, final boolean bIgnoreP
 		final JDFValidator checker = new JDFValidator();
 
 		checker.setPrint(false);
-		checker.bQuiet = true;
 		checker.setIgnorePrivate(bIgnorePrivate);
 		checker.level = EnumValidationLevel.Complete;
 		try
@@ -582,7 +581,7 @@ public String getServletInfo()
 	}
 
 	/**
-	 * @see org.cip4.jdfutility.UtilityServlet#getServletCall(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * @see org.cip4.jdfutility.UtilityServlet#getServletCall(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)
 	 * @param request
 	 * @param response
 	 * @return

src/main/java/org/cip4/jdfutility/DumpJDFServlet.java

@@ -55,10 +55,10 @@
 
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.cip4.jdflib.core.KElement;
@@ -467,7 +467,7 @@ public String getServletInfo()
 	}
 
 	/**
-	 * @see org.cip4.jdfutility.UtilityServlet#getServletCall(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * @see org.cip4.jdfutility.UtilityServlet#getServletCall(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)
 	 * @param request
 	 * @param response
 	 * @return

src/main/java/org/cip4/jdfutility/FileItemList.java

@@ -77,28 +77,28 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory.Builder;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
 import org.cip4.jdflib.datatypes.JDFAttributeMap;
 import org.cip4.jdflib.util.ContainerUtil;
 import org.cip4.jdflib.util.StreamUtil;
 import org.cip4.jdflib.util.StringUtil;
 import org.cip4.jdflib.util.UrlUtil;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * 
  * @author rainer
  */
 public class FileItemList
 {
 
-	final private List<FileItem> fileItems;
+	final private List<DiskFileItem> fileItems;
 	private final JDFAttributeMap mapCache;
 	private final JDFAttributeMap reqParameters;
 
@@ -154,12 +154,13 @@ public FileItemList(final HttpServletRequest request, final long filesize) throw
 	{
 		mapCache = new JDFAttributeMap();
 		reqParameters = new JDFAttributeMap();
-		fileItems = new ArrayList<FileItem>();
+		fileItems = new ArrayList<DiskFileItem>();
 		// Create a factory for disk-based file items
-		final FileItemFactory factory = getFactory(inMemory, filesize);
+		final DiskFileItemFactory factory = getFactory(inMemory, filesize);
 
 		// Create a new file upload handler
-		final ServletFileUpload upload = new ServletFileUpload(factory);
+		final JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>();
+		upload.setFileItemFactory(factory);
 		if (request != null)
 		{
 			final Map<String, String[]> parameterMap = request.getParameterMap();
@@ -191,18 +192,18 @@ public FileItemList(final HttpServletRequest request, final long filesize) throw
 		}
 	}
 
-	FileItemFactory getFactory(final boolean inMemory, final long filesize)
+	DiskFileItemFactory getFactory(final boolean inMemory, final long filesize)
 	{
 		if (inMemory && filesize <= 1)
 		{
 			throw new IllegalArgumentException("cannot create in memory factory with low size " + filesize);
 		}
-		final DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory();
+		final Builder b = DiskFileItemFactory.builder();
 		if (inMemory)
 		{
-			diskFileItemFactory.setSizeThreshold((int) filesize);
+			b.setBufferSize((int) filesize);
 		}
-		return diskFileItemFactory;
+		return b.get();
 	}
 
 	/**
@@ -215,8 +216,8 @@ public JDFAttributeMap getFieldsFromForm()
 	{
 		if (ContainerUtil.isEmpty(mapCache))
 		{
-			final List<FileItem> fileList = getFileList(false, true);
-			for (final FileItem fi : fileList)
+			final List<DiskFileItem> fileList = getFileList(false, true);
+			for (final DiskFileItem fi : fileList)
 			{
 				final String itemString = StringUtil.getNonEmpty(fi.getString());
 				if (itemString != null)
@@ -277,12 +278,12 @@ public boolean getBoolField(final String key, final boolean def)
 	 * @return
 	 * 
 	 */
-	public List<FileItem> getFileList(final boolean bFile, final boolean bForm)
+	public List<DiskFileItem> getFileList(final boolean bFile, final boolean bForm)
 	{
-		final List<FileItem> retList = new ArrayList<FileItem>();
+		final List<DiskFileItem> retList = new ArrayList<DiskFileItem>();
 		if (bFile || bForm)
 		{
-			for (final FileItem f : fileItems)
+			for (final DiskFileItem f : fileItems)
 			{
 				final boolean formField = f.isFormField();
 				if (formField && bForm || !formField && bFile)
@@ -301,9 +302,9 @@ public List<FileItem> getFileList(final boolean bFile, final boolean bForm)
 	 * @param i may be<0 to count from end
 	 * @return
 	 */
-	public FileItem getFile(int i)
+	public DiskFileItem getFile(int i)
 	{
-		final List<FileItem> fileList = getFileList(true, false);
+		final List<DiskFileItem> fileList = getFileList(true, false);
 		if (i < 0)
 		{
 			i += fileList.size();
@@ -325,10 +326,10 @@ public FileItem getFile(int i)
 	 * @param formName
 	 * @return
 	 */
-	public FileItem getFile(final String formName)
+	public DiskFileItem getFile(final String formName)
 	{
-		final List<FileItem> fileList = getFileList(true, false);
-		for (final FileItem f : fileList)
+		final List<DiskFileItem> fileList = getFileList(true, false);
+		for (final DiskFileItem f : fileList)
 		{
 			if (f.getFieldName().equalsIgnoreCase(formName))
 			{
@@ -347,7 +348,7 @@ public FileItem getFile(final String formName)
 	 */
 	public InputStream getFileInputStream(final String formName)
 	{
-		final FileItem fi = getFile(formName);
+		final DiskFileItem fi = getFile(formName);
 		return getInputStream(fi);
 	}
 
@@ -360,7 +361,7 @@ public InputStream getFileInputStream(final String formName)
 	 */
 	public InputStream getFileInputStream(final int i)
 	{
-		final FileItem fi = getFile(i);
+		final DiskFileItem fi = getFile(i);
 		return getInputStream(fi);
 	}
 
@@ -370,7 +371,7 @@ public InputStream getFileInputStream(final int i)
 	 * @param fi
 	 * @return
 	 */
-	public static InputStream getInputStream(final FileItem fi)
+	public static InputStream getInputStream(final DiskFileItem fi)
 	{
 		if (fi != null)
 		{

src/main/java/org/cip4/jdfutility/GetFileServlet.java

@@ -43,11 +43,11 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.logging.Log;

src/main/java/org/cip4/jdfutility/JDFServletUtil.java

@@ -40,15 +40,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.DiskFileItem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.cip4.jdflib.util.PlatformUtil;
 import org.cip4.jdflib.util.StringUtil;
 import org.cip4.jdflib.util.UrlUtil;
 
@@ -132,7 +127,7 @@ public static File getTmpFile(final String dirName, String tmpName, final String
 	 * @param extension
 	 * @return
 	 */
-	public static File getTmpFile(final String dirName, final FileItem fileItem, final String prefix, final String extension)
+	public static File getTmpFile(final String dirName, final DiskFileItem fileItem, final String prefix, final String extension)
 	{
 		if (fileItem == null)
 		{
@@ -142,19 +137,6 @@ public static File getTmpFile(final String dirName, final FileItem fileItem, fin
 		return getTmpFile(dirName, tmpName, prefix, extension);
 	}
 
-	/**
-	 * @param request
-	 * @return
-	 * @throws ServletException
-	 * @deprecated - use 4 parameter version
-	 */
-	@Deprecated
-	public static List<FileItem> getFileList(final HttpServletRequest request) throws ServletException
-	{
-		final FileItemList fil = new FileItemList(request, 20l * 1024 * 1024);
-		return fil.getFileList(true, true);
-	}
-
 	/**
 	 * cleanup previous junk that is older than an hour
 	 *
@@ -182,16 +164,4 @@ public static void cleanup(final String dirNam)
 		Runtime.getRuntime().gc(); // clean up memory
 	}
 
-	/**
-	 *
-	 * @return
-	 * @deprecated use {@link PlatformUtil}.isWindows()
-	 *
-	 */
-	@Deprecated
-	public static boolean isWindows()
-	{
-		return PlatformUtil.isWindows();
-	}
-
 }