Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arun-gupta merged 1 commit into from
Dec 3, 2013
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion jaxrs/async-server/src/test/java/org/javaee7/jaxrs/asyncserver/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion jaxrs/beanvalidation/src/test/java/org/javaee7/jaxrs/beanvalidation/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...client-negotiation/src/test/java/org/javaee7/jaxrs/client/negotiation/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jaxrs/dynamicfilter/src/test/java/org/javaee7/jaxrs/dynamicfilter/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jaxrs/filter/src/test/java/org/javaee7/jaxrs/filter/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
3 changes: 2 additions & 1 deletion jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
}

/**
Expand Down
6 changes: 4 additions & 2 deletions jaxrs/jsonp/src/test/java/org/javaee7/jaxrs/jsonp/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...mapping-exceptions/src/test/java/org/javaee7/jaxrs/mapping/exceptions/MyResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
}

/**
Expand Down
10 changes: 7 additions & 3 deletions ...s/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,27 @@
*/
package org.javaee7.jaxrs.singleton;

import static org.junit.Assert.assertEquals;

import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.StringTokenizer;

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 org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;

Expand All @@ -41,7 +45,7 @@ public class AnnotatedSingletonResourceTest {
@Before
public void setUp() throws MalformedURLException {
client = ClientBuilder.newClient();
target = client.target(new URL(base, "webresources/annotated").toExternalForm());
target = client.target(URI.create(new URL(base, "webresources/annotated").toExternalForm()));
// target = client.target("http://localhost:8080/singleton/webresources/annotated");
}

Expand Down