1 files changed, 13 insertions, 14 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java
index 4e528ef5..b179132a 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java
@@ -22,20 +22,18 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.modules;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-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.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileItemFactory;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload;
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +53,8 @@ import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.ProtocolFinalizationController;
 import at.gv.egiz.eaaf.core.impl.idp.process.springweb.AbstractTask;
 import at.gv.egiz.eaaf.core.impl.utils.DataUrlBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.Setter;
 
 /**
@@ -207,22 +207,21 @@ public abstract class AbstractAuthServletTask extends AbstractTask {
 
     final Map<String, String> parameters = new HashMap<>();
 
-    if (ServletFileUpload.isMultipartContent(req)) {
+    if (JakartaServletFileUpload.isMultipartContent(req)) {
       // request is encoded as mulitpart/form-data
-      final FileItemFactory factory = new DiskFileItemFactory();
-      ServletFileUpload upload = null;
-      upload = new ServletFileUpload(factory);
+      final FileItemFactory factory = DiskFileItemFactory.builder().get();
+      JakartaServletFileUpload upload = new JakartaServletFileUpload(factory);
       List items = null;
       items = upload.parseRequest(req);
       for (int i = 0; i < items.size(); i++) {
         final FileItem item = (FileItem) items.get(i);
         if (item.isFormField()) {
           // Process only form fields - no file upload items
-          parameters.put(item.getFieldName(), item.getString("UTF-8"));
+          parameters.put(item.getFieldName(), item.getString(StandardCharsets.UTF_8));
 
           // log requests on trace
           if (log.isTraceEnabled()) {
-            final String logString = item.getString("UTF-8");
+            final String logString = item.getString(StandardCharsets.UTF_8);
 
             // TODO use RegExp
             final String startS = "<pr:Identification><pr:Value>";