Merge "Updated to most recent Grizzly server & client."

Author: pavelbucek

connectors/grizzly-connector/pom.xml

@@ -67,8 +67,10 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-websockets</artifactId>
-            <!-- Until grizzly-http-client is not updated to the latest grizzly API.-->
-            <version>2.3.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.grizzly</groupId>
+            <artifactId>connection-pool</artifactId>
         </dependency>
 
         <dependency>

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

@@ -122,10 +122,10 @@ class GrizzlyConnector implements Connector {
 
             builder = builder.setExecutorService(executorService);
 
-            builder.setConnectionTimeoutInMs(ClientProperties.getValue(config.getProperties(),
+            builder.setConnectTimeout(ClientProperties.getValue(config.getProperties(),
                     ClientProperties.CONNECT_TIMEOUT, 0));
 
-            builder.setRequestTimeoutInMs(ClientProperties.getValue(config.getProperties(),
+            builder.setRequestTimeout(ClientProperties.getValue(config.getProperties(),
                     ClientProperties.READ_TIMEOUT, 0));
 
             Object proxyUri;
@@ -156,7 +156,7 @@ class GrizzlyConnector implements Connector {
             builder.setExecutorService(executorService);
         }
 
-        builder.setAllowPoolingConnection(true);
+        builder.setAllowPoolingConnections(true);
         if (client.getSslContext() != null) {
             builder.setSSLContext(client.getSslContext());
         }
@@ -252,8 +252,6 @@ public void onThrowable(Throwable t) {
             });
 
             return responseFuture.get();
-        } catch (IOException ex) {
-            throw new ProcessingException(ex.getMessage(), ex.getCause());
         } catch (ExecutionException ex) {
             Throwable e = ex.getCause() == null ? ex : ex.getCause();
             throw new ProcessingException(e.getMessage(), e);
@@ -315,8 +313,6 @@ public void onThrowable(Throwable t) {
                     }
                 }
             });
-        } catch (IOException ex) {
-            failure = new ProcessingException(ex.getMessage(), ex.getCause());
         } catch (Throwable t) {
             failure = t;
         }
@@ -383,7 +379,7 @@ private com.ning.http.client.Request translate(final ClientRequest requestContex
             if (entityProcessing == RequestEntityProcessing.BUFFERED) {
                 byte[] entityBytes = bufferEntity(requestContext);
                 builder = builder.setBody(entityBytes);
-            } else if (entityProcessing == RequestEntityProcessing.CHUNKED) {
+            } else {
                 final FeedableBodyGenerator bodyGenerator = new FeedableBodyGenerator();
                 final Integer chunkSize = requestContext.resolveProperty(
                         ClientProperties.CHUNKED_ENCODING_SIZE, ClientProperties.DEFAULT_CHUNK_SIZE);
@@ -403,8 +399,6 @@ public OutputStream getOutputStream(int contentLength) throws IOException {
                 });
                 bodyGenerator.setFeeder(feeder);
                 builder.setBody(bodyGenerator);
-            } else {
-                builder.setBody(getEntityWriter(requestContext));
             }
         }
 
@@ -485,22 +479,6 @@ private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<Str
         return stringHeaders;
     }
 
-    private com.ning.http.client.Request.EntityWriter getEntityWriter(final ClientRequest requestContext) {
-        return new com.ning.http.client.Request.EntityWriter() {
-            @Override
-            public void writeEntity(final OutputStream out) throws IOException {
-                requestContext.setStreamProvider(new OutboundMessageContext.StreamProvider() {
-
-                    @Override
-                    public OutputStream getOutputStream(int contentLength) throws IOException {
-                        return out;
-                    }
-                });
-                requestContext.writeEntity();
-            }
-        };
-    }
-
     @Override
     public String getName() {
         return String.format("Async HTTP Grizzly Connector %s", Version.getVersion());

containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerFactory.java

@@ -58,6 +58,7 @@
 import org.glassfish.grizzly.http.server.NetworkListener;
 import org.glassfish.grizzly.http.server.ServerConfiguration;
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
+import org.glassfish.grizzly.utils.Charsets;
 
 import jersey.repackaged.com.google.common.util.concurrent.ThreadFactoryBuilder;
 
@@ -287,6 +288,7 @@ public static HttpServer createHttpServer(final URI uri,
         }
 
         config.setPassTraceRequest(true);
+        config.setDefaultQueryEncoding(Charsets.UTF8_CHARSET);
 
         if (start) {
             try {

pom.xml

@@ -1244,6 +1244,11 @@
                 <artifactId>grizzly-websockets</artifactId>
                 <version>${grizzly2.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.grizzly</groupId>
+                <artifactId>connection-pool</artifactId>
+                <version>${grizzly2.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.grizzly</groupId>
                 <artifactId>grizzly-http-client</artifactId>
@@ -1662,8 +1667,8 @@
         <findbugs.version>3.0.1</findbugs.version>
         <freemarker.version>2.3.23</freemarker.version>
         <gae.version>1.8.4</gae.version>
-        <grizzly.client.version>1.8</grizzly.client.version>
-        <grizzly2.version>2.3.19</grizzly2.version>
+        <grizzly.client.version>1.9</grizzly.client.version>
+        <grizzly2.version>2.3.22</grizzly2.version>
         <guava.version>18.0</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
         <hk2.version>2.4.0-b31</hk2.version>