* [#1946] fix(FunctionalTest): fix call of constructor StringPart

* [#1941] chore(travis): test openjdk7 and oraclejdk8
* [#1941] chore(travis): remove test on openjdk6
* [#1941] chore(library): update to async-http-client from v1.8.14 to 1.9.31
* [#1946] chore(libraries): update from netty 3.9.4 to 3.10.4
** remove some deprecated method call and used the new ones

Conflicts:
	framework/build.xml
	framework/src/play/libs/ws/WSAsync.java

Author: xael-fry

.travis.yml

@@ -1,6 +1,7 @@
 language: java
 jdk:
   - openjdk7 
+  - oraclejdk8
 script: ant -buildfile ./framework/build.xml test
 after_failure: 
     cat ./samples-and-tests/just-test-cases/test-result/*.failed.html

framework/dependencies.yml

@@ -13,7 +13,7 @@ require:    &allDependencies
     - cglib -> cglib-nodep 3.1
     - com.google.code.gson -> gson 2.3.1
     - com.jamonapi -> jamon 2.81
-    - com.ning -> async-http-client 1.8.16
+    - com.ning -> async-http-client 1.9.31
     - commons-beanutils 1.8.3  
     - commons-codec 1.10
     - commons-collections 3.2.1
@@ -56,7 +56,7 @@ require:    &allDependencies
     - org.hibernate -> hibernate-c3p0 4.2.19.Final
     - com.mchange -> mchange-commons-java 0.2.9
     - org.javassist -> javassist 3.19.0-GA
-    - org.jboss.netty -> netty 3.9.8.Final
+    - org.jboss.netty -> netty 3.10.4.Final
     - org.postgresql -> postgresql 9.0
     - org.slf4j -> slf4j-api 1.7.10
     - org.slf4j -> slf4j-log4j12 1.7.10

framework/lib/async-http-client-1.8.16.jar

@@ -1,5 +1,6 @@
 package play.libs.ws;
 
+import java.nio.charset.Charset;
 import com.ning.http.client.*;
 import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
 import com.ning.http.client.AsyncHttpClientConfig.Builder;
@@ -28,6 +29,9 @@
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.*;
+import com.ning.http.client.multipart.ByteArrayPart;
+import com.ning.http.client.multipart.FilePart;
+import com.ning.http.client.multipart.Part;
 
 /**
  * Simple HTTP client to make webservices requests.
@@ -84,7 +88,7 @@ public WSAsync() {
         }
         // when using raw urls, AHC does not encode the params in url.
         // this means we can/must encode it(with correct encoding) before passing it to AHC
-        confBuilder.setUseRawUrl(true);
+        confBuilder.setDisableUrlEncodingForBoundedRequests(true);
         httpClient = new AsyncHttpClient(confBuilder.build());
     }
 
@@ -159,9 +163,9 @@ protected void addQueryString(BoundRequestBuilder requestBuilder) {
                         }
 
                         if (value == null) {
-                            requestBuilder.addQueryParameter(URLEncoder.encode(name, encoding), null);
+                            requestBuilder.addQueryParam(URLEncoder.encode(name, encoding), null);
                         } else {
-                            requestBuilder.addQueryParameter(URLEncoder.encode(name, encoding), URLEncoder.encode(value, encoding));
+                            requestBuilder.addQueryParam(URLEncoder.encode(name, encoding), URLEncoder.encode(value, encoding));
                         }
 
                     }
@@ -367,9 +371,7 @@ private BoundRequestBuilder prepare(BoundRequestBuilder builder) {
                 builder.addHeader(key, headers.get(key));
             }
             builder.setFollowRedirects(this.followRedirects);
-            PerRequestConfig perRequestConfig = new PerRequestConfig();
-            perRequestConfig.setRequestTimeoutInMs(this.timeout * 1000);
-            builder.setPerRequestConfig(perRequestConfig);
+            builder.setRequestTimeout(this.timeout * 1000);
             return builder;
         }
 
@@ -404,7 +406,8 @@ private void checkFileBody(BoundRequestBuilder builder) {
                     builder.addBodyPart(new FilePart(this.fileParams[i].paramName,
                             this.fileParams[i].file,
                             MimeTypes.getMimeType(this.fileParams[i].file.getName()),
-                            encoding));
+                            Charset.forName(encoding)
+                            ));
                 }
                 if (this.parameters != null) {
                     try {
@@ -414,11 +417,11 @@ private void checkFileBody(BoundRequestBuilder builder) {
                             if (value instanceof Collection<?> || value.getClass().isArray()) {
                                 Collection<?> values = value.getClass().isArray() ? Arrays.asList((Object[]) value) : (Collection<?>) value;
                                 for (Object v : values) {
-                                    Part part = new ByteArrayPart(key, null, v.toString().getBytes(encoding), "text/plain", encoding);
+                                    Part part = new ByteArrayPart(key, v.toString().getBytes(encoding), "text/plain", Charset.forName(encoding), null);
                                     builder.addBodyPart( part );
                                 }
                             } else {
-                                Part part = new ByteArrayPart(key, null, value.toString().getBytes(encoding), "text/plain", encoding);
+                                Part part = new ByteArrayPart(key, value.toString().getBytes(encoding), "text/plain", Charset.forName(encoding), null);
                                 builder.addBodyPart( part );
                             }
                         }
@@ -481,11 +484,11 @@ private void checkFileBody(BoundRequestBuilder builder) {
                             Collection<?> values = value.getClass().isArray() ? Arrays.asList((Object[]) value) : (Collection<?>) value;
                             for (Object v: values) {
                                 // must encode it since AHC uses raw urls
-                                builder.addQueryParameter(encode(key), encode(v.toString()));
+                                builder.addQueryParam(encode(key), encode(v.toString()));
                             }
                         } else {
                             // must encode it since AHC uses raw urls
-                            builder.addQueryParameter(encode(key), encode(value.toString()));
+                            builder.addQueryParam(encode(key), encode(value.toString()));
                         }
                     }
                     setResolvedContentType("text/html; charset=" + encoding);