From 7679dbec67330c57acb5e236ead765db5712087e Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Sat, 27 Oct 2018 02:18:53 +0200
Subject: [PATCH] Improvements | Use StandardCharsets.US_ASCII in favour of
 string (#855)

---
 .../java/com/microsoft/sqlserver/jdbc/SQLServerClob.java   | 3 ++-
 src/main/java/com/microsoft/sqlserver/jdbc/dtv.java        | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java
index b101d7bdd..5cc302ec7 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java
@@ -19,6 +19,7 @@
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.sql.Clob;
 import java.sql.SQLException;
 import java.text.MessageFormat;
@@ -776,7 +777,7 @@ public void write(byte[] b, int off, int len) throws IOException {
             return;
         try {
             // Convert bytes to string using US-ASCII translation.
-            String s = new String(b, off, len, "US-ASCII");
+            String s = new String(b, off, len, StandardCharsets.US_ASCII);
 
             // Call parent's setString and update position.
             // setString can throw a SQLServerException, we translate
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java
index ae3693af5..657cb7e79 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java
@@ -19,6 +19,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.SQLException;
@@ -2193,11 +2194,7 @@ void execute(DTV dtv, InputStream inputStreamValue) throws SQLServerException {
             // If the stream is to be sent as Unicode, then assume it's an ASCII stream
             if (JDBCType.NCHAR == jdbcType || JDBCType.NVARCHAR == jdbcType || JDBCType.LONGNVARCHAR == jdbcType) {
                 Reader readerValue = null;
-                try {
-                    readerValue = new InputStreamReader(inputStreamValue, "US-ASCII");
-                } catch (UnsupportedEncodingException ex) {
-                    throw new SQLServerException(ex.getMessage(), null, 0, ex);
-                }
+                readerValue = new InputStreamReader(inputStreamValue, StandardCharsets.US_ASCII);
 
                 dtv.setValue(readerValue, JavaType.READER);