Merge pull request #153 from aslakknutsen/gf_jaxrs_more

Change to use Client.target(URI) to be compatible with JAX-RS 1.0

Author: arun-gupta

jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java

@@ -9,6 +9,7 @@
 import static org.junit.Assert.fail;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -48,7 +49,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUpClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/fruits").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/fruits").toExternalForm()));
     }
 
     /**

jaxrs/async-server/src/test/java/org/javaee7/jaxrs/asyncserver/MyResourceTest.java

@@ -9,6 +9,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -44,7 +45,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUpClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/fruits").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/fruits").toExternalForm()));
     }
 
     /**

jaxrs/beanvalidation/src/test/java/org/javaee7/jaxrs/beanvalidation/MyResourceTest.java

@@ -10,6 +10,7 @@
 import static org.junit.Assert.fail;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.BadRequestException;
@@ -46,7 +47,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUpClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/endpoint").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/endpoint").toExternalForm()));
     }
 
     @Test

jaxrs/client-negotiation/src/test/java/org/javaee7/jaxrs/client/negotiation/MyResourceTest.java

@@ -8,6 +8,7 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -47,7 +48,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUpClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/persons").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/persons").toExternalForm()));
     }
 
     @Test

jaxrs/dynamicfilter/src/test/java/org/javaee7/jaxrs/dynamicfilter/MyResourceTest.java

@@ -8,6 +8,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -48,7 +49,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUpClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/fruits").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/fruits").toExternalForm()));
     }
 
     @Test

jaxrs/filter/src/test/java/org/javaee7/jaxrs/filter/MyResourceTest.java

@@ -8,6 +8,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -45,7 +46,7 @@ public static WebArchive createDeployment() {
     public void setUpClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
         client.register(ClientLoggingFilter.class);
-        target = client.target(new URL(base, "webresources/fruits").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/fruits").toExternalForm()));
     }
 
     /**

jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java

@@ -8,6 +8,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -51,7 +52,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUp() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/persons").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/persons").toExternalForm()));
         target.register(Person.class);
     }
 

jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java

@@ -9,6 +9,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -59,7 +60,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setupClass() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/fruit").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/fruit").toExternalForm()));
     }
 
     /**

jaxrs/jsonp/src/test/java/org/javaee7/jaxrs/jsonp/MyResourceTest.java

@@ -6,14 +6,17 @@
 package org.javaee7.jaxrs.jsonp;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
+
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -22,7 +25,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
 
 /**
@@ -40,7 +42,7 @@ public class MyResourceTest {
     @Before
     public void setUp() throws MalformedURLException {
         client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/endpoint").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/endpoint").toExternalForm()));
     }
 
     @After

jaxrs/mapping-exceptions/src/test/java/org/javaee7/jaxrs/mapping/exceptions/MyResourceTest.java

@@ -10,6 +10,7 @@
 import static org.junit.Assert.fail;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.ClientErrorException;
@@ -49,7 +50,7 @@ public static WebArchive createDeployment() {
     public void setUp() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
         target = client
-                .target(new URL(base, "webresources/order").toExternalForm());
+                .target(URI.create(new URL(base, "webresources/order").toExternalForm()));
     }
 
     /**