Make Realm and ProxyServer encoding Charsets instead of Strings, close AsyncHttpClient#708

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/ProxyServer.java

@@ -54,7 +54,6 @@ public String toString() {
     private final String password;
     private final int port;
     private final String url;
-    private String encoding = UTF_8.name();
     private Charset charset = UTF_8;
     private String ntlmDomain = System.getProperty("http.auth.ntlm.domain", "");
 
@@ -103,16 +102,11 @@ public String getPassword() {
         return password;
     }
 
-    public ProxyServer setEncoding(String encoding) {
-        this.encoding = encoding;
-        this.charset = Charset.forName(encoding);
+    public ProxyServer setCharset(Charset charset) {
+        this.charset = charset;
         return this;
     }
 
-    public String getEncoding() {
-        return encoding;
-    }
-
     public Charset getCharset() {
         return charset;
     }

api/src/main/java/org/asynchttpclient/Realm.java

@@ -46,11 +46,10 @@ public class Realm {
     private final Uri uri;
     private final String methodName;
     private final boolean usePreemptiveAuth;
-    private final String enc;
+    private final Charset charset;
     private final String host;
     private final boolean messageType2Received;
     private final String ntlmDomain;
-    private final Charset charset;
     private final boolean useAbsoluteURI;
     private final boolean omitQuery;
     private final boolean targetProxy;
@@ -60,7 +59,7 @@ public enum AuthScheme {
     }
 
     private Realm(AuthScheme scheme, String principal, String password, String realmName, String nonce, String algorithm, String response,
-            String qop, String nc, String cnonce, Uri uri, String method, boolean usePreemptiveAuth, String ntlmDomain, String enc,
+            String qop, String nc, String cnonce, Uri uri, String method, boolean usePreemptiveAuth, String ntlmDomain, Charset charset,
             String host, boolean messageType2Received, String opaque, boolean useAbsoluteURI, boolean omitQuery, boolean targetProxy) {
 
         this.principal = principal;
@@ -78,10 +77,9 @@ private Realm(AuthScheme scheme, String principal, String password, String realm
         this.methodName = method;
         this.usePreemptiveAuth = usePreemptiveAuth;
         this.ntlmDomain = ntlmDomain;
-        this.enc = enc;
         this.host = host;
         this.messageType2Received = messageType2Received;
-        this.charset = enc != null ? Charset.forName(enc) : null;
+        this.charset = charset;
         this.useAbsoluteURI = useAbsoluteURI;
         this.omitQuery = omitQuery;
         this.targetProxy = targetProxy;
@@ -140,10 +138,6 @@ public Uri getUri() {
         return uri;
     }
 
-    public String getEncoding() {
-        return enc;
-    }
-
     public Charset getCharset() {
         return charset;
     }
@@ -279,7 +273,7 @@ public static class RealmBuilder {
         private String methodName = "GET";
         private boolean usePreemptive;
         private String ntlmDomain = System.getProperty("http.auth.ntlm.domain", "");
-        private String enc = UTF_8.name();
+        private Charset charset = UTF_8;
         private String host = "localhost";
         private boolean messageType2Received;
         private boolean useAbsoluteURI = true;
@@ -492,7 +486,7 @@ public RealmBuilder clone(Realm clone) {
             setNonce(clone.getNonce());
             setPassword(clone.getPassword());
             setPrincipal(clone.getPrincipal());
-            setEncoding(clone.getEncoding());
+            setCharset(clone.getCharset());
             setOpaque(clone.getOpaque());
             setQop(clone.getQop());
             setScheme(clone.getScheme());
@@ -537,12 +531,12 @@ private String match(String headerLine, String token) {
             return value.charAt(0) == '"' ? value.substring(1) : value;
         }
 
-        public String getEncoding() {
-            return enc;
+        public Charset getCharset() {
+            return charset;
         }
 
-        public RealmBuilder setEncoding(String enc) {
-            this.enc = enc;
+        public RealmBuilder setCharset(Charset charset) {
+            this.charset = charset;
             return this;
         }
 
@@ -629,7 +623,7 @@ public Realm build() {
             }
 
             return new Realm(scheme, principal, password, realmName, nonce, algorithm, response, qop, nc, cnonce, uri, methodName,
-                    usePreemptive, ntlmDomain, enc, host, messageType2Received, opaque, useAbsoluteURI, omitQuery, targetProxy);
+                    usePreemptive, ntlmDomain, charset, host, messageType2Received, opaque, useAbsoluteURI, omitQuery, targetProxy);
         }
     }
 }

api/src/main/java/org/asynchttpclient/SimpleAsyncHttpClient.java

@@ -16,6 +16,7 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -583,8 +584,8 @@ public Builder setRealmUsePreemptiveAuth(boolean usePreemptiveAuth) {
             return this;
         }
 
-        public Builder setRealmEnconding(String enc) {
-            realm().setEncoding(enc);
+        public Builder setRealmCharset(Charset charset) {
+            realm().setCharset(charset);
             return this;
         }
 

api/src/test/java/org/asynchttpclient/RealmTest.java

@@ -28,15 +28,15 @@ public class RealmTest {
     public void testClone() {
         RealmBuilder builder = new RealmBuilder();
         builder.setPrincipal("user").setPassword("pass");
-        builder.setEncoding(UTF_8.name()).setUsePreemptiveAuth(true);
+        builder.setCharset(UTF_16).setUsePreemptiveAuth(true);
         builder.setRealmName("realm").setAlgorithm("algo");
         builder.setScheme(AuthScheme.BASIC);
         Realm orig = builder.build();
 
         Realm clone = new RealmBuilder().clone(orig).build();
         assertEquals(clone.getPrincipal(), orig.getPrincipal());
         assertEquals(clone.getPassword(), orig.getPassword());
-        assertEquals(clone.getEncoding(), orig.getEncoding());
+        assertEquals(clone.getCharset(), orig.getCharset());
         assertEquals(clone.getUsePreemptiveAuth(), orig.getUsePreemptiveAuth());
         assertEquals(clone.getRealmName(), orig.getRealmName());
         assertEquals(clone.getAlgorithm(), orig.getAlgorithm());