Use withDefault

Author: slandelle

client/src/main/java/org/asynchttpclient/Response.java

@@ -16,10 +16,6 @@
  */
 package org.asynchttpclient;
 
-import org.asynchttpclient.cookie.Cookie;
-import org.asynchttpclient.netty.NettyResponse;
-import org.asynchttpclient.uri.Uri;
-
 import io.netty.handler.codec.http.HttpHeaders;
 
 import java.io.InputStream;
@@ -29,6 +25,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.asynchttpclient.cookie.Cookie;
+import org.asynchttpclient.netty.NettyResponse;
+import org.asynchttpclient.uri.Uri;
+
 /**
  * Represents the asynchronous HTTP response callback for an {@link AsyncCompletionHandler}
  */

client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java

@@ -15,6 +15,7 @@
 
 import static org.asynchttpclient.Dsl.realm;
 import static org.asynchttpclient.util.AuthenticatorUtils.*;
+import static org.asynchttpclient.util.MiscUtils.withDefault;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.DefaultHttpHeaders;
 import io.netty.handler.codec.http.HttpHeaders;
@@ -212,7 +213,7 @@ private void kerberosChallenge(Channel channel,//
             NettyResponseFuture<?> future) throws SpnegoEngineException {
 
         Uri uri = request.getUri();
-        String host = request.getVirtualHost() == null ? uri.getHost() : request.getVirtualHost();
         String challengeHeader = SpnegoEngine.instance().generateToken(host);
         headers.set(HttpHeaders.Names.AUTHORIZATION, NEGOTIATE + " " + challengeHeader);
     }

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

@@ -13,25 +13,10 @@
  */
 package org.asynchttpclient.netty.request;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.ACCEPT;
-import static io.netty.handler.codec.http.HttpHeaders.Names.ACCEPT_ENCODING;
-import static io.netty.handler.codec.http.HttpHeaders.Names.AUTHORIZATION;
-import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
-import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_LENGTH;
-import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
-import static io.netty.handler.codec.http.HttpHeaders.Names.COOKIE;
-import static io.netty.handler.codec.http.HttpHeaders.Names.HOST;
-import static io.netty.handler.codec.http.HttpHeaders.Names.ORIGIN;
-import static io.netty.handler.codec.http.HttpHeaders.Names.PROXY_AUTHORIZATION;
-import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY;
-import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_VERSION;
-import static io.netty.handler.codec.http.HttpHeaders.Names.TRANSFER_ENCODING;
-import static io.netty.handler.codec.http.HttpHeaders.Names.UPGRADE;
-import static io.netty.handler.codec.http.HttpHeaders.Names.USER_AGENT;
 import static org.asynchttpclient.util.HttpUtils.*;
-import static org.asynchttpclient.util.AuthenticatorUtils.perRequestAuthorizationHeader;
-import static org.asynchttpclient.util.AuthenticatorUtils.perRequestProxyAuthorizationHeader;
-import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import static org.asynchttpclient.ws.WebSocketUtils.getKey;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
@@ -78,7 +63,7 @@ private NettyBody body(Request request, boolean connect) {
         NettyBody nettyBody = null;
         if (!connect) {
 
-            Charset bodyCharset = request.getCharset() == null ? DEFAULT_CHARSET : request.getCharset();
 
             if (request.getByteData() != null)
                 nettyBody = new NettyByteArrayBody(request.getByteData());

client/src/main/java/org/asynchttpclient/request/body/multipart/FileLikePart.java

@@ -12,6 +12,8 @@
  */
 package org.asynchttpclient.request.body.multipart;
 
+import static org.asynchttpclient.util.MiscUtils.withDefault;
+
 import java.nio.charset.Charset;
 
 /**
@@ -42,10 +44,10 @@ public abstract class FileLikePart extends PartBase {
      */
     public FileLikePart(String name, String contentType, Charset charset, String contentId, String transfertEncoding) {
         super(name,//
-                contentType == null ? DEFAULT_CONTENT_TYPE : contentType,//
                 charset,//
                 contentId,//
-                transfertEncoding == null ? DEFAULT_TRANSFER_ENCODING : transfertEncoding);
     }
 
     public final void setFileName(String fileName) {

client/src/main/java/org/asynchttpclient/request/body/multipart/StringPart.java

@@ -14,6 +14,7 @@
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static org.asynchttpclient.util.Assertions.assertNotNull;
+import static org.asynchttpclient.util.MiscUtils.withDefault;
 
 import java.nio.charset.Charset;
 
@@ -40,15 +41,15 @@ public class StringPart extends PartBase {
     private final String value;
 
     private static Charset charsetOrDefault(Charset charset) {
-        return charset == null ? DEFAULT_CHARSET : charset;
     }
 
     private static String contentTypeOrDefault(String contentType) {
-        return contentType == null ? DEFAULT_CONTENT_TYPE : contentType;
     }
 
     private static String transferEncodingOrDefault(String transferEncoding) {
-        return transferEncoding == null ? DEFAULT_TRANSFER_ENCODING : transferEncoding;
     }
 
     public StringPart(String name, String value) {

client/src/main/java/org/asynchttpclient/util/MiscUtils.java

@@ -47,8 +47,8 @@ public static boolean getBoolean(String systemPropName, boolean defaultValue) {
         return systemPropValue != null ? systemPropValue.equalsIgnoreCase("true") : defaultValue;
     }
 
-    public static <T> T withDefault(T value, T defaults) {
-        return value != null ? value : value;
     }
 
     public static void closeSilently(Closeable closeable) {

extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java

@@ -13,7 +13,7 @@
 package org.asynchttpclient.extras.simple;
 
 import static org.asynchttpclient.Dsl.*;
-import static org.asynchttpclient.util.MiscUtils.closeSilently;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.ssl.SslContext;
 
@@ -660,7 +660,7 @@ public SimpleAsyncHttpClient build() {
             if (proxyHost != null) {
                 Realm realm = null;
                 if (proxyPrincipal != null) {
-                    AuthScheme proxyAuthScheme = this.proxyAuthScheme == null ? AuthScheme.BASIC : this.proxyAuthScheme;
                     realm = realm(proxyAuthScheme, proxyPrincipal, proxyPassword).build();
                 }