Reorganize Cookie constructor parameters order, close AsyncHttpClient#478

Author: Stephane Landelle

src/main/java/com/ning/http/client/cookie/Cookie.java

@@ -14,7 +14,7 @@
 
 public class Cookie {
 
-    public static Cookie newValidCookie(String domain, String name, String value, String rawValue, String path, long expires, int maxAge, boolean secure, boolean httpOnly) {
+    public static Cookie newValidCookie(String name, String value, String domain, String rawValue, String path, long expires, int maxAge, boolean secure, boolean httpOnly) {
 
         if (name == null) {
             throw new NullPointerException("name");
@@ -56,7 +56,7 @@ public static Cookie newValidCookie(String domain, String name, String value, St
         domain = validateValue("domain", domain);
         path = validateValue("path", path);
 
-        return new Cookie(domain, name, value, rawValue, path, expires, maxAge, secure, httpOnly);
+        return new Cookie(name, value, rawValue, domain, path, expires, maxAge, secure, httpOnly);
     }
 
     private static String validateValue(String name, String value) {
@@ -82,21 +82,21 @@ private static String validateValue(String name, String value) {
         return value;
     }
 
-    private final String domain;
     private final String name;
     private final String value;
     private final String rawValue;
+    private final String domain;
     private final String path;
     private long expires;
     private final int maxAge;
     private final boolean secure;
     private final boolean httpOnly;
 
-    public Cookie(String domain, String name, String value, String rawValue, String path, long expires, int maxAge, boolean secure, boolean httpOnly) {
-        this.domain = domain;
+    public Cookie(String name, String value, String rawValue, String domain, String path, long expires, int maxAge, boolean secure, boolean httpOnly) {
         this.name = name;
         this.value = value;
         this.rawValue = rawValue;
+        this.domain = domain;
         this.path = path;
         this.expires = expires;
         this.maxAge = maxAge;

src/main/java/com/ning/http/client/cookie/KeyValuePairsParser.java

@@ -43,7 +43,7 @@ public KeyValuePairsParser(TimeConverter timeBuilder) {
     }
 
     public Cookie cookie() {
-        return name != null ? new Cookie(domain, name, value, rawValue, path, expires, maxAge, secure, httpOnly) : null;
+        return name != null ? new Cookie(name, value, rawValue, domain, path, expires, maxAge, secure, httpOnly) : null;
     }
 
     /**

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyResponse.java

@@ -321,10 +321,10 @@ private List<Cookie> convertCookies(Cookies cookies) {
         final org.glassfish.grizzly.http.Cookie[] grizzlyCookies = cookies.get();
         List<Cookie> convertedCookies = new ArrayList<Cookie>(grizzlyCookies.length);
         for (org.glassfish.grizzly.http.Cookie gCookie : grizzlyCookies) {
-            convertedCookies.add(new Cookie(gCookie.getDomain(),
-                                   gCookie.getName(),
+            convertedCookies.add(new Cookie(gCookie.getName(),
                                    gCookie.getValue(),
                                    gCookie.getValue(),
+                                   gCookie.getDomain(),
                                    gCookie.getPath(),
                                    -1L,
                                    gCookie.getMaxAge(),

src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

@@ -478,7 +478,7 @@ public void asyncDoGetCookieTest() throws Throwable {
             h.add("Test4", "Test4");
             h.add("Test5", "Test5");
 
-            final Cookie coo = new Cookie("/", "foo", "value", "value", "/", -1L, -1, false, false);
+            final Cookie coo = new Cookie("foo", "value", "value", "/", "/", -1L, -1, false, false);
             client.prepareGet(getTargetUrl()).setHeaders(h).addCookie(coo).execute(new AsyncCompletionHandlerAdapter() {
 
                 @Override

src/test/java/com/ning/http/client/async/RemoteSiteTest.java

@@ -249,7 +249,7 @@ public void evilCoookieTest() throws Throwable {
             builder2.setFollowRedirects(true);
             builder2.setUrl("http://www.google.com/");
             builder2.addHeader("Content-Type", "text/plain");
-            builder2.addCookie(new Cookie(".google.com", "evilcookie", "test", "test", "/", -1L, 10, false, false));
+            builder2.addCookie(new Cookie("evilcookie", "test", "test", ".google.com", "/", -1L, 10, false, false));
             com.ning.http.client.Request request2 = builder2.build();
             Response response = c.executeRequest(request2).get();