migrate to StandardCharsets (java 17) (#91)

6 files changed, 15 insertions, 9 deletions

diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java
index d904030f..33811617 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java
@@ -28,6 +28,7 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -108,7 +109,7 @@ public class RemotePDFFetcher {
 					
 					if(fetchInfos.length == 3) {
 					    String userpass = fetchInfos[1] + ":" + fetchInfos[2];
-					    String basicAuth = "Basic " + jakarta.xml.bind.DatatypeConverter.printBase64Binary(userpass.getBytes("UTF-8"));
+					    String basicAuth = "Basic " + jakarta.xml.bind.DatatypeConverter.printBase64Binary(userpass.getBytes(StandardCharsets.UTF_8));
 					    uc.setRequestProperty("Authorization", basicAuth);
 					}
 					
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java
index 64043cac..cfb78008 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -20,8 +21,8 @@ public class UrlParameterExtractor {
 			for (String pair : pairs) {
 				int idx = pair.indexOf("=");
 				query_pairs.put(
-						URLDecoder.decode(pair.substring(0, idx), "UTF-8"),
-						URLDecoder.decode(pair.substring(idx + 1), "UTF-8"));
+						URLDecoder.decode(pair.substring(0, idx), StandardCharsets.UTF_8),
+						URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8));
 			}
 		}
 		return query_pairs;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
index f2c39a75..343e18f2 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
@@ -1,6 +1,7 @@
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,7 +66,7 @@ public class JSONAPIServlet extends HttpServlet {
             return;
         }
 
-        String jsonString = IOUtils.toString(req.getInputStream(), "UTF-8");
+        String jsonString = IOUtils.toString(req.getInputStream(), StandardCharsets.UTF_8);
 
         logger.debug("Reading json String {}", jsonString);
 
@@ -279,7 +280,7 @@ public class JSONAPIServlet extends HttpServlet {
             }
 
             response.setContentType("application/json");
-            IOUtils.write(jsonResponse.toString(), response.getOutputStream(), "UTF-8");
+            IOUtils.write(jsonResponse.toString(), response.getOutputStream(), StandardCharsets.UTF_8);
 
         } catch (Throwable e) {
 
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java
index f6c3e646..f6b42024 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java
@@ -26,6 +26,7 @@ package at.gv.egiz.pdfas.web.servlets;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import jakarta.servlet.RequestDispatcher;
@@ -214,8 +215,8 @@ public class ProvidePDFServlet extends HttpServlet {
     template = template.replace("##TARGET##", StringEscapeUtils.escapeHtml4(target));
     
     template = template.replace("##PDFURL##",
-        URLEncoder.encode(PdfAsHelper.generatePdfURL(request, response), 
-            "UTF-8"));
+        URLEncoder.encode(PdfAsHelper.generatePdfURL(request, response),
+            StandardCharsets.UTF_8));
     response.setContentType("text/html");
     response.getWriter().write(template);
     response.getWriter().close();
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java
index 7df32340..9f144f84 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java
@@ -1,6 +1,7 @@
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -81,7 +82,7 @@ public class SLDataURLServlet extends HttpServlet {
 			String sl20Result = request.getParameter(SL20Constants.PARAM_SL20_REQ_COMMAND_PARAM);
 			if (StringUtils.isEmpty(sl20Result)) {
 				//Workaround for SIC Handy-Signature, because it sends result in InputStream
-				String isReqInput = StreamUtils.readStream(request.getInputStream(), "UTF-8");					
+				String isReqInput = StreamUtils.readStream(request.getInputStream(), StandardCharsets.UTF_8);
 				if (StringUtils.isNotEmpty(isReqInput)) {
 					logger.info("Use SIC Handy-Signature work-around!");
 					sl20Result = isReqInput.substring("slcommand=".length());
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java
index 8d049030..d59f649a 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java
@@ -3,6 +3,7 @@ package at.gv.egiz.pdfas.web.sl20;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -27,7 +28,7 @@ public class SL20HttpBindingUtils {
 			log.debug("Client request containts 'native client' header ... ");												
 			StringWriter writer = new StringWriter();
 			writer.write(sl20Forward.toString());						
-			final byte[] content = writer.toString().getBytes("UTF-8");
+			final byte[] content = writer.toString().getBytes(StandardCharsets.UTF_8);
 			response.setStatus(HttpServletResponse.SC_OK);
 			response.setContentLength(content.length);
 			response.setContentType(ContentType.APPLICATION_JSON.toString());