migrate to StandardCharsets (java 17) (#91)

3 files changed, 8 insertions, 5 deletions

diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java
index f71b639a..cac4698c 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java
@@ -34,6 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.HashMap;
@@ -57,8 +58,8 @@ public class ValueResolver implements IProfileConstants, IResolver {
 
 	public static final String EXP_START = "${";
 	public static final String EXP_END = "}";
-	private static final Charset ISO = Charset.forName("ISO-8859-1");
-	private static final Charset UTF_8 = Charset.forName("UTF-8");
+	private static final Charset ISO = StandardCharsets.ISO_8859_1;
+	private static final Charset UTF_8 = StandardCharsets.UTF_8;
 
 
 	private IResolver internalResolver;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java
index 1590bef7..7378b777 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.nio.charset.Charset;
 
 public class StreamUtils {
   
@@ -108,7 +109,7 @@ public class StreamUtils {
    * a <code>String</code>.
    * @throws IOException on any exception thrown
    */
-  public static String readStream(InputStream in, String encoding) throws IOException {
+  public static String readStream(InputStream in, Charset encoding) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     copyStream(in, out, null);
 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
index 72aa1204..15b01c29 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
@@ -27,6 +27,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -133,9 +134,9 @@ public class BKUSLConnector extends BaseSLConnector {
 
 			MultipartEntityBuilder entityBuilder = MultipartEntityBuilder
 					.create();
-			entityBuilder.setCharset(Charset.forName("UTF-8"));
+			entityBuilder.setCharset(StandardCharsets.UTF_8);
 			entityBuilder.addTextBody(XMLREQUEST, xmlRequest,
-					ContentType.TEXT_XML.withCharset(Charset.forName("UTF-8")));
+					ContentType.TEXT_XML.withCharset(StandardCharsets.UTF_8));
 
 			if (parameter != null) {
 				String transactionId = parameter.getTransactionId();