Have Assertions return tested object

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

@@ -83,13 +83,9 @@ private Realm(AuthScheme scheme,//
             boolean useAbsoluteURI,//
             boolean omitQuery) {
 
-        assertNotNull(scheme, "scheme");
-        assertNotNull(principal, "principal");
-        assertNotNull(password, "password");
-
-        this.scheme = scheme;
-        this.principal = principal;
-        this.password = password;
+        this.scheme = assertNotNull(scheme, "scheme");
+        this.principal = assertNotNull(principal, "principal");
+        this.password = assertNotNull(password, "password");
         this.realmName = realmName;
         this.nonce = nonce;
         this.algorithm = algorithm;

client/src/main/java/org/asynchttpclient/cookie/Cookie.java

@@ -18,8 +18,7 @@ public class Cookie {
 
     public static Cookie newValidCookie(String name, String value, boolean wrap, String domain, String path, long maxAge, boolean secure, boolean httpOnly) {
 
-        assertNotNull(name, "name");
-        name = name.trim();
+        name = assertNotNull(name, "name").trim();
         assertNotEmpty(name, "name");
 
         for (int i = 0; i < name.length(); i++) {
@@ -47,11 +46,7 @@ public static Cookie newValidCookie(String name, String value, boolean wrap, Str
             throw new IllegalArgumentException("name starting with '$' not allowed: " + name);
         }
 
-        assertNotNull(value, "value");
-        domain = validateValue("domain", domain);
-        path = validateValue("path", path);
-
-        return new Cookie(name, value, wrap, domain, path, maxAge, secure, httpOnly);
+        return new Cookie(name, assertNotNull(value, "value"), wrap, validateValue("domain", domain), validateValue("path", path), maxAge, secure, httpOnly);
     }
 
     private static String validateValue(String name, String value) {

client/src/main/java/org/asynchttpclient/netty/channel/DefaultChannelPool.java

@@ -99,8 +99,7 @@ private static final class IdleChannel {
         final long start;
 
         IdleChannel(Channel channel, long start) {
-            assertNotNull(channel, "channel");
-            this.channel = channel;
+            this.channel = assertNotNull(channel, "channel");
             this.start = start;
         }
 

client/src/main/java/org/asynchttpclient/netty/request/body/BodyChunkedInput.java

@@ -32,8 +32,7 @@ public class BodyChunkedInput implements ChunkedInput<ByteBuf> {
     private boolean endOfInput;
 
     public BodyChunkedInput(Body body) {
-        assertNotNull(body, "body");
-        this.body = body;
+        this.body = assertNotNull(body, "body");
         long contentLength = body.getContentLength();
         if (contentLength <= 0)
             chunkSize = DEFAULT_CHUNK_SIZE;

client/src/main/java/org/asynchttpclient/netty/request/body/BodyFileRegion.java

@@ -33,8 +33,7 @@ public class BodyFileRegion extends AbstractReferenceCounted implements FileRegi
     private long transfered;
 
     public BodyFileRegion(RandomAccessBody body) {
-        assertNotNull(body, "body");
-        this.body = body;
+        this.body = assertNotNull(body, "body");
     }
 
     @Override

client/src/main/java/org/asynchttpclient/request/body/generator/FileBodyGenerator.java

@@ -32,8 +32,7 @@ public FileBodyGenerator(File file) {
     }
 
     public FileBodyGenerator(File file, long regionSeek, long regionLength) {
-        assertNotNull(file, "file");
-        this.file = file;
+        this.file = assertNotNull(file, "file");
         this.regionLength = regionLength;
         this.regionSeek = regionSeek;
     }

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

@@ -42,8 +42,7 @@ public ByteArrayPart(String name, byte[] bytes, String contentType, Charset char
 
     public ByteArrayPart(String name, byte[] bytes, String contentType, Charset charset, String fileName, String contentId, String transferEncoding) {
         super(name, contentType, charset, contentId, transferEncoding);
-        assertNotNull(bytes, "bytes");
-        this.bytes = bytes;
+        this.bytes = assertNotNull(bytes, "bytes");
         setFileName(fileName);
     }
 

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

@@ -43,8 +43,7 @@ public FilePart(String name, File file, String contentType, Charset charset, Str
 
     public FilePart(String name, File file, String contentType, Charset charset, String fileName, String contentId, String transferEncoding) {
         super(name, contentType, charset, contentId, transferEncoding);
-        assertNotNull(file, "file");
-        if (!file.isFile())
+        if (!assertNotNull(file, "file").isFile())
             throw new IllegalArgumentException("File is not a normal file " + file.getAbsolutePath());
         if (!file.canRead())
             throw new IllegalArgumentException("File is not readable " + file.getAbsolutePath());

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

@@ -42,10 +42,9 @@ public class MultipartBody implements RandomAccessBody {
     private AtomicBoolean closed = new AtomicBoolean();
 
     public MultipartBody(List<MultipartPart<? extends Part>> parts, String contentType, byte[] boundary) {
-        assertNotNull(parts, "parts");
         this.boundary = boundary;
         this.contentType = contentType;
-        this.parts = parts;
+        this.parts = assertNotNull(parts, "parts");
         this.contentLength = computeContentLength();
     }
 

client/src/main/java/org/asynchttpclient/uri/Uri.java

@@ -60,11 +60,9 @@ public Uri(String scheme,//
             String path,//
             String query) {
 
-        assertNotNull(scheme, "scheme");
-        assertNotNull(host, "host");
-        this.scheme = scheme;
+        this.scheme = assertNotNull(scheme, "scheme");
         this.userInfo = userInfo;
-        this.host = host;
+        this.host = assertNotNull(host, "host");
         this.port = port;
         this.path = path;
         this.query = query;

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

@@ -18,13 +18,16 @@ public final class Assertions {
     private Assertions() {
     }
 
-    public static void assertNotNull(Object value, String name) {
+    public static <T> T assertNotNull(T value, String name) {
         if (value == null)
             throw new NullPointerException(name);
+        return value;
+
     }
 
-    public static void assertNotEmpty(String value, String name) {
+    public static String assertNotEmpty(String value, String name) {
         if (value.length() == 0)
             throw new IllegalArgumentException("empty " + name);
+        return value;
     }
 }

client/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.java

@@ -95,8 +95,7 @@ public final WebSocket onCompleted() throws Exception {
             throw e;
         }
 
-        assertNotNull(webSocket, "webSocket");
-        return webSocket;
+        return assertNotNull(webSocket, "webSocket");
     }
 
     /**