Removing json package dependency due to licensing issues
Change-Id: Iabd2f0343ca42a1956c1f7c6e471d8e141d29bc7
diff --git a/apps/k8s-networking/BUILD b/apps/k8s-networking/BUILD
index a876bb7..c03a3b9 100644
--- a/apps/k8s-networking/BUILD
+++ b/apps/k8s-networking/BUILD
@@ -3,7 +3,7 @@
"//apps/k8s-networking/app:onos-apps-k8s-networking-app",
"@commons_net//jar",
"@jersey_client//jar",
- "@json//jar",
+ "@minimal_json//jar",
"@k8s_client//jar",
"@k8s_model//jar",
"@k8s_model_common//jar",
diff --git a/apps/k8s-networking/app/BUILD b/apps/k8s-networking/app/BUILD
index 05510a3..c57afc3 100644
--- a/apps/k8s-networking/app/BUILD
+++ b/apps/k8s-networking/app/BUILD
@@ -6,7 +6,7 @@
"//apps/k8s-networking/api:onos-apps-k8s-networking-api",
"@commons_net//jar",
"@jersey_client//jar",
- "@json//jar",
+ "@minimal_json//jar",
"@k8s_client//jar",
"@k8s_model//jar",
"@k8s_model_common//jar",
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sOpenstackIntegrationHandler.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sOpenstackIntegrationHandler.java
index a631c62..0a1c5de 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sOpenstackIntegrationHandler.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sOpenstackIntegrationHandler.java
@@ -16,8 +16,7 @@
package org.onosproject.k8snetworking.impl;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.eclipsesource.json.JsonObject;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -129,20 +128,15 @@
String jsonString = "";
- try {
- jsonString = new JSONObject()
- .put(K8S_NODE_IP, k8sNodeIp)
- .put(POD_GW_IP, gatewayIp)
- .put(POD_CIDR, podCidr)
- .put(SERVICE_CIDR, SERVICE_IP_CIDR_DEFAULT)
- .put(OS_K8S_INT_PORT_NAME, osK8sIntPortName)
- .put(K8S_INT_OS_PORT_MAC, k8sIntOsPortMac)
- .toString();
- log.info("push integration configuration {}", jsonString);
- } catch (JSONException e) {
- log.error("Failed to generate JSON string");
- return;
- }
+ jsonString = new JsonObject()
+ .set(K8S_NODE_IP, k8sNodeIp)
+ .set(POD_GW_IP, gatewayIp)
+ .set(POD_CIDR, podCidr)
+ .set(SERVICE_CIDR, SERVICE_IP_CIDR_DEFAULT)
+ .set(OS_K8S_INT_PORT_NAME, osK8sIntPortName)
+ .set(K8S_INT_OS_PORT_MAC, k8sIntOsPortMac)
+ .toString();
+ log.info("push integration configuration {}", jsonString);
HttpAuthenticationFeature feature =
HttpAuthenticationFeature.basic(ONOS_USERNAME, ONOS_PASSWORD);
@@ -169,17 +163,12 @@
String jsonString = "";
- try {
- jsonString = new JSONObject()
- .put(K8S_NODE_IP, k8sNodeIp)
- .put(SERVICE_CIDR, SERVICE_IP_CIDR_DEFAULT)
- .put(OS_K8S_EXT_PORT_NAME, osK8sExtPortName)
- .toString();
- log.info("push integration configuration {}", jsonString);
- } catch (JSONException e) {
- log.error("Failed to generate JSON string");
- return;
- }
+ jsonString = new JsonObject()
+ .set(K8S_NODE_IP, k8sNodeIp)
+ .set(SERVICE_CIDR, SERVICE_IP_CIDR_DEFAULT)
+ .set(OS_K8S_EXT_PORT_NAME, osK8sExtPortName)
+ .toString();
+ log.info("push integration configuration {}", jsonString);
HttpAuthenticationFeature feature =
HttpAuthenticationFeature.basic(ONOS_USERNAME, ONOS_PASSWORD);