Replace deprecated JsonObject.readFrom() with Json.parse().asObject
Change-Id: I9e6e5a83edfd2c6abc694c1cc1e939b0b826e980
diff --git a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/ClassifierResourceTest.java b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/ClassifierResourceTest.java
index f63cab0..789ae89 100644
--- a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/ClassifierResourceTest.java
+++ b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/ClassifierResourceTest.java
@@ -24,6 +24,7 @@
import static org.onosproject.net.NetTestTools.device;
import static org.onosproject.net.NetTestTools.did;
+import com.eclipsesource.json.Json;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -93,7 +94,7 @@
final WebResource rs = resource();
final String response = rs.path("classifiers").get(String.class);
- final JsonObject result = JsonObject.readFrom(response);
+ final JsonObject result = Json.parse(response).asObject();
assertThat(result, notNullValue());
}
}
diff --git a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/FlowClassifierResourceTest.java b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/FlowClassifierResourceTest.java
index db08d7c..1242907 100644
--- a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/FlowClassifierResourceTest.java
+++ b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/FlowClassifierResourceTest.java
@@ -33,6 +33,7 @@
import javax.ws.rs.core.MediaType;
+import com.eclipsesource.json.Json;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -238,7 +239,7 @@
final WebResource rs = resource();
final String response = rs.path("flow_classifiers/4a334cd4-fe9c-4fae-af4b-321c5e2eb051").get(String.class);
- final JsonObject result = JsonObject.readFrom(response);
+ final JsonObject result = Json.parse(response).asObject();
assertThat(result, notNullValue());
}
diff --git a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainResourceTest.java b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainResourceTest.java
index 3cb2c83..a4b3be0 100644
--- a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainResourceTest.java
+++ b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainResourceTest.java
@@ -34,6 +34,7 @@
import javax.ws.rs.core.MediaType;
+import com.eclipsesource.json.Json;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -184,7 +185,7 @@
final WebResource rs = resource();
final String response = rs.path("port_chains/1278dcd4-459f-62ed-754b-87fc5e4a6751").get(String.class);
- final JsonObject result = JsonObject.readFrom(response);
+ final JsonObject result = Json.parse(response).asObject();
assertThat(result, notNullValue());
}
diff --git a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairGroupResourceTest.java b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairGroupResourceTest.java
index c13f214..70335ba 100644
--- a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairGroupResourceTest.java
+++ b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairGroupResourceTest.java
@@ -34,6 +34,7 @@
import javax.ws.rs.core.MediaType;
+import com.eclipsesource.json.Json;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -171,7 +172,7 @@
final WebResource rs = resource();
final String response = rs.path("port_pair_groups/4512d643-24fc-4fae-af4b-321c5e2eb3d1").get(String.class);
- final JsonObject result = JsonObject.readFrom(response);
+ final JsonObject result = Json.parse(response).asObject();
assertThat(result, notNullValue());
}
diff --git a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairResourceTest.java b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairResourceTest.java
index 36014ec..c4b02ed 100644
--- a/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairResourceTest.java
+++ b/apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairResourceTest.java
@@ -33,6 +33,7 @@
import javax.ws.rs.core.MediaType;
+import com.eclipsesource.json.Json;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -174,7 +175,7 @@
final WebResource rs = resource();
final String response = rs.path("port_pairs/78dcd363-fc23-aeb6-f44b-56dc5e2fb3ae").get(String.class);
- final JsonObject result = JsonObject.readFrom(response);
+ final JsonObject result = Json.parse(response).asObject();
assertThat(result, notNullValue());
}