pull 201: adjustments, formatting, ..

Change-Id: Iae0f3d5e357c09d28dcc2de7a282242593f0805e

Author: pavelbucek

connectors/grizzly-connector/src/main/java/org/glassfish/jersey/grizzly/connector/GrizzlyConnector.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -123,10 +123,10 @@ class GrizzlyConnector implements Connector {
             builder = builder.setExecutorService(executorService);
 
             builder.setConnectTimeout(ClientProperties.getValue(config.getProperties(),
-                    ClientProperties.CONNECT_TIMEOUT, 0));
+                                                                ClientProperties.CONNECT_TIMEOUT, 0));
 
             builder.setRequestTimeout(ClientProperties.getValue(config.getProperties(),
-                    ClientProperties.READ_TIMEOUT, 0));
+                                                                ClientProperties.READ_TIMEOUT, 0));
 
             Object proxyUri;
             proxyUri = config.getProperty(ClientProperties.PROXY_URI);
@@ -193,9 +193,12 @@ public AsyncHttpClient getGrizzlyClient() {
         return grizzlyClient;
     }
 
-    /*
-         * Sends the {@link javax.ws.rs.core.Request} via Grizzly transport and returns the {@link javax.ws.rs.core.Response}.
-         */
+    /**
+     * Sends the {@link javax.ws.rs.core.Request} via Grizzly transport and returns the {@link javax.ws.rs.core.Response}.
+     *
+     * @param request Jersey client request to be sent.
+     * @return received response.
+     */
     @Override
     public ClientResponse apply(final ClientRequest request) {
         final Request connectorRequest = translate(request);
@@ -279,7 +282,7 @@ public STATE onStatusReceived(final HttpResponseStatus responseStatus) throws Ex
                 }
 
                 @Override
-                public STATE onHeadersReceived(HttpResponseHeaders headers) throws Exception {
+                public STATE onHeadersReceived(final HttpResponseHeaders headers) throws Exception {
                     if (!callbackInvoked.compareAndSet(false, true)) {
                         return STATE.ABORT;
                     }
@@ -290,7 +293,7 @@ public STATE onHeadersReceived(HttpResponseHeaders headers) throws Exception {
                     processResponse(new Runnable() {
                         @Override
                         public void run() {
-                           callback.response(translate(request, status, headers, entityStream));
+                            callback.response(translate(request, status, headers, entityStream));
                         }
                     });
                     return STATE.CONTINUE;
@@ -418,10 +421,11 @@ public OutputStream getOutputStream(int contentLength) throws IOException {
     }
 
     /**
-     * Submits the response processing on Grizzly client's application thread pool
-     * @param responseTask task to be processed on application thread pool
+     * Submits the response processing on Grizzly client's application thread pool.
+     *
+     * @param responseTask task to be processed on application thread pool.
      */
-    public void processResponse(Runnable responseTask) {
+    private void processResponse(Runnable responseTask) {
         this.grizzlyClient.getConfig().executorService().submit(responseTask);
     }
 

core-client/src/main/java/org/glassfish/jersey/client/ClientRuntime.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -161,18 +161,19 @@ public void run() {
 
                         @Override
                         public void response(final ClientResponse response) {
-                              requestScope.runInScope(new Runnable(){
-                                 public void run() {
-                                      processResponse(response, callback);
-                                 }});
+                            requestScope.runInScope(new Runnable() {
+                                public void run() {
+                                    processResponse(response, callback);
+                                }
+                            });
                         }
 
                         @Override
                         public void failure(final Throwable failure) {
-                              requestScope.runInScope(new Runnable() {
-                                    public void run() {
-                                        processFailure(failure, callback);
-                                    }
+                            requestScope.runInScope(new Runnable() {
+                                public void run() {
+                                    processFailure(failure, callback);
+                                }
                             });
                         }
                     };
@@ -242,7 +243,6 @@ private ClientRequest addUserAgent(final ClientRequest clientRequest, final Stri
      *
      * @param request client request to be invoked.
      * @return client response.
-     *
      * @throws javax.ws.rs.ProcessingException in case of an invocation failure.
      */
     public ClientResponse invoke(final ClientRequest request) {
@@ -284,7 +284,7 @@ public ClientConfig getConfig() {
      * This will be used as the last resort to clean things up
      * in the case that this instance gets garbage collected
      * before the client itself gets released.
-     *
+     * <p>
      * Close will be invoked either via finalizer
      * or via JerseyClient onShutdown hook, whatever comes first.
      */

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/grizzlyconnector/NonBlockingTest.java

@@ -0,0 +1,106 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.tests.e2e.client.grizzlyconnector;
+
+import java.util.concurrent.Future;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.client.InvocationCallback;
+import javax.ws.rs.core.Application;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Grizzly connector non blocking test.
+ */
+public class NonBlockingTest extends JerseyTest {
+
+    @Path("/test")
+    public static class Resource {
+
+        @GET
+        public String get() {
+            return "GET";
+        }
+    }
+
+    @Override
+    protected Application configure() {
+        return new ResourceConfig(Resource.class);
+    }
+
+    @Override
+    protected void configureClient(ClientConfig config) {
+        config.connectorProvider(new GrizzlyConnectorProvider());
+    }
+
+    private volatile String invocationCallbackThreadName;
+
+    @Test
+    public void testNonBlockingConnector() throws Exception {
+        Future<String> future = target("test")
+                .request()
+                .async()
+                .get(new InvocationCallback<String>() {
+                    @Override
+                    public void completed(String response) {
+                        invocationCallbackThreadName = Thread.currentThread().getName();
+                    }
+
+                    @Override
+                    public void failed(Throwable throwable) {
+                        invocationCallbackThreadName = Thread.currentThread().getName();
+                    }
+                });
+
+        String response = future.get();
+        assertNotNull(response);
+        assertTrue("Invocation callback is not executed on the NIO pool thread.",
+                   !invocationCallbackThreadName.contains("jersey-client-async-executor"));
+    }
+}