Reformat, not functional changes

Author: jfarcand

src/main/java/org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java

@@ -11,19 +11,15 @@
  *******************************************************************************/
 package org.sonatype.spice.jersey.client.ahc;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.Cookie;
-import com.ning.http.client.FluentCaseInsensitiveStringsMap;
-import com.ning.http.client.RequestBuilder;
-import com.ning.http.client.Response;
+import com.ning.http.client.*;
 import com.sun.jersey.api.client.ClientHandler;
 import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientRequest;
 import com.sun.jersey.api.client.ClientResponse;
-import org.sonatype.spice.jersey.client.ahc.config.AhcConfig;
-import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
 import com.sun.jersey.core.header.InBoundHeaders;
 import com.sun.jersey.spi.MessageBodyWorkers;
+import org.sonatype.spice.jersey.client.ahc.config.AhcConfig;
+import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
 
 import javax.ws.rs.core.Context;
 import java.util.ArrayList;
@@ -104,6 +100,7 @@ public AsyncHttpClient getHttpClient() {
 
     /**
      * Translate the {@link ClientRequest} into a AsyncHttpClient request, and execute it.
+     *
      * @param cr the HTTP request.
      * @return the {@link ClientResponse}
      * @throws ClientHandlerException
@@ -134,58 +131,59 @@ public ClientResponse handle(final ClientRequest cr)
             throw new ClientHandlerException(e);
         }
     }
-    
+
     /**
      * append request cookies and override existing cookies
-     * 
+     *
      * @param responseCookies list of cookies from response
      */
-    private void applyResponseCookies(List<Cookie> responseCookies){
-      if ( responseCookies != null ){
-        for ( Cookie rc : responseCookies ){
-          // remove existing cookie
-          Iterator<Cookie> it = cookies.iterator();
-          while ( it.hasNext() ){
-            Cookie c = it.next();
-            if ( isSame(rc, c) )
-            {
-              it.remove();
-              break;
+    private void applyResponseCookies(List<Cookie> responseCookies) {
+        if (responseCookies != null) {
+            for (Cookie rc : responseCookies) {
+                // remove existing cookie
+                Iterator<Cookie> it = cookies.iterator();
+                while (it.hasNext()) {
+                    Cookie c = it.next();
+                    if (isSame(rc, c)) {
+                        it.remove();
+                        break;
+                    }
+                }
+                // add new cookie
+                cookies.add(rc);
             }
-          }
-          // add new cookie
-          cookies.add(rc);
         }
-      }
     }
-    
-    private boolean isSame(Cookie c, Cookie o){
-      return isEquals(c.getDomain(), o.getDomain()) &&
-             isEquals(c.getPath(), o.getPath()) &&
-             isEquals(c.getName(), o.getName());
+
+    private boolean isSame(Cookie c, Cookie o) {
+        return isEquals(c.getDomain(), o.getDomain()) &&
+                isEquals(c.getPath(), o.getPath()) &&
+                isEquals(c.getName(), o.getName());
     }
-    
-    private boolean isEquals( Object o, Object o2 ){
-      return (o == null && o2 == null) || o != null && o.equals(o2);
+
+    private boolean isEquals(Object o, Object o2) {
+        return (o == null && o2 == null) || o != null && o.equals(o2);
     }
 
     /**
      * Check if a body needs to be constructed based on a method's name.
+     *
      * @param method An HTTP method
      * @return true if s body can be allowed.
      */
     private boolean allowBody(String method) {
-        if ( method.equalsIgnoreCase("GET") || method.equalsIgnoreCase("OPTIONS")
-                    && method.equalsIgnoreCase("TRACE")
-                    && method.equalsIgnoreCase("HEAD")) {
+        if (method.equalsIgnoreCase("GET") || method.equalsIgnoreCase("OPTIONS")
+                && method.equalsIgnoreCase("TRACE")
+                && method.equalsIgnoreCase("HEAD")) {
             return false;
         } else {
             return true;
         }
     }
 
     /**
-     * Return the {@link RequestBuilder} based on a method 
+     * Return the {@link RequestBuilder} based on a method
+     *
      * @param cr the HTTP request.
      * @return {@link RequestBuilder}
      */
@@ -222,9 +220,10 @@ private InBoundHeaders getInBoundHeaders(Response response) {
     /**
      * Return the instance of {@link com.sun.jersey.api.client.RequestWriter}. This instance will be injected
      * within Jersey so it cannot be null.
+     *
      * @return the instance of {@link com.sun.jersey.api.client.RequestWriter}.
      */
-    public AhcRequestWriter getAhcRequestWriter(){
+    public AhcRequestWriter getAhcRequestWriter() {
         return requestWriter;
     }
 
@@ -233,5 +232,5 @@ private void handleCookie(RequestBuilder requestBuilder) {
             requestBuilder.addCookie(c);
         }
     }
-    
+
 }

src/test/java/org/sonatype/spice/jersey/client/ahc/tests/tests/CookieTest.java

@@ -50,14 +50,9 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import javax.ws.rs.core.*;
 
 /**
- *
  * @author Paul.Sandoz@Sun.Com
  */
 public class CookieTest extends AbstractGrizzlyServerTester {
@@ -70,17 +65,18 @@ public Response get(@Context HttpHeaders h) {
             return Response.ok(e).
                     cookie(new NewCookie("name", "value")).build();
         }
+
         @POST
-        public Response get(){
-          // return response without cookie
-          return Response.ok("wo-cookie").build();
+        public Response get() {
+            // return response without cookie
+            return Response.ok("wo-cookie").build();
         }
     }
-        
+
     public CookieTest(String testName) {
         super(testName);
     }
-    
+
     public void testCookie() {
         ResourceConfig rc = new DefaultResourceConfig(CookieResource.class);
         rc.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS,
@@ -111,13 +107,13 @@ public void testCookieWithState() {
         assertEquals("value", r.get(String.class));
 
     }
-    
-    public void testSessionCookie(){
+
+    public void testSessionCookie() {
         ResourceConfig rc = new DefaultResourceConfig(CookieResource.class);
         rc.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS,
                 LoggingFilter.class.getName());
         startServer(rc);
-        
+
         DefaultAhcConfig config = new DefaultAhcConfig();
         AhcHttpClient c = AhcHttpClient.create(config);