[ONOS-4042] Bump up Jersey from 1.19 to 2.22.2
- Fix unit test errors of web/api
- Fix default page redirection problem
- Fix compilation errors of web/gui
- Fix configuration of aaa, acl, cordfabric, cord-gui, dhcp, mfwd,
olt, openstack, segmentrouting, vtn, virtualbng, xos-integration
- Fix unit test errors of cpman, vtn, acl, faultmanagement
- Fix compilation errors of openstack, virtualbng, xos-integration,
REST SB controller
- Rearrange features.xml to resolve bundle dependencies
- Remove all of stale Jersey 1.x libraries
- Rearrange web.xml to point new Jersey 2.x servlet
Change-Id: Ic17f461ede0aa36fa8d470546d8069152dc1d134
diff --git a/web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java
index 4edba50..29353a5 100644
--- a/web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java
@@ -16,8 +16,6 @@
package org.onosproject.rest;
import com.google.common.collect.ImmutableSet;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
@@ -27,6 +25,9 @@
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cfg.ConfigProperty;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
import java.util.Set;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -45,7 +46,7 @@
private TestConfigManager service;
@Before
- public void setUp() {
+ public void setUpMock() {
service = new TestConfigManager();
ServiceDirectory testDirectory =
new TestServiceDirectory()
@@ -55,26 +56,27 @@
@Test
public void getAllConfigs() {
- WebResource rs = resource();
- String response = rs.path("configuration").get(String.class);
+ WebTarget wt = target();
+ String response = wt.path("configuration").request().get(String.class);
assertThat(response, containsString("\"foo\":"));
assertThat(response, containsString("\"bar\":"));
}
@Test
public void getConfigs() {
- WebResource rs = resource();
- String response = rs.path("configuration/foo").get(String.class);
+ WebTarget wt = target();
+ String response = wt.path("configuration/foo").request().get(String.class);
assertThat(response, containsString("{\"foo\":"));
assertThat(response, not(containsString("{\"bar\":")));
}
@Test
public void setConfigs() {
- WebResource rs = resource();
+ WebTarget wt = target();
try {
- rs.path("configuration/foo").post(String.class, "{ \"k\" : \"v\" }");
- } catch (UniformInterfaceException e) {
+ wt.path("configuration/foo").request().post(
+ Entity.json("{ \"k\" : \"v\" }"), String.class);
+ } catch (BadRequestException e) {
assertEquals("incorrect key", "foo", service.component);
assertEquals("incorrect key", "k", service.name);
assertEquals("incorrect value", "v", service.value);
@@ -83,10 +85,12 @@
@Test
public void unsetConfigs() {
- WebResource rs = resource();
+ WebTarget wt = target();
try {
- rs.path("configuration/foo").delete(String.class, "{ \"k\" : \"v\" }");
- } catch (UniformInterfaceException e) {
+ // TODO: this needs to be revised later. Do you really need to
+ // contain any entry inside delete request? Why not just use put then?
+ wt.path("configuration/foo").request().delete();
+ } catch (BadRequestException e) {
assertEquals("incorrect key", "foo", service.component);
assertEquals("incorrect key", "k", service.name);
assertEquals("incorrect value", null, service.value);