[incubator-trafficcontrol] 02/04: Update to remove JSON.org dependency

[elsloo]

This is an automated email from the ASF dual-hosted git repository.

elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 9fdf025bb8775c4d8d1c167db23c786e5f73dd50
Author: Eric Friedrich <efrie...@cisco.com>
AuthorDate: Fri Feb 16 12:54:57 2018 -0500

    Update to remove JSON.org dependency
---
 .../cdn/traffic_control/traffic_router/core/dns/NameServer.java     | 6 +++---
 .../cdn/traffic_control/traffic_router/core/dns/NameServerTest.java | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
index e8a0ab7..2ce8283 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.json.JSONObject;
 import org.xbill.DNS.DClass;
 import org.xbill.DNS.ExtendedFlags;
 import org.xbill.DNS.Flags;
@@ -40,9 +39,11 @@ import org.xbill.DNS.Zone;
 import org.xbill.DNS.EDNSOption;
 import org.xbill.DNS.ClientSubnetOption;
 
+import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils;
 import com.comcast.cdn.traffic_control.traffic_router.core.cache.CacheRegister;
 import 
com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager;
 
+
 public class NameServer {
        private static final int MAX_SUPPORTED_EDNS_VERS = 0;
        private static final int MAX_ITERATIONS = 6;
@@ -90,8 +91,7 @@ public class NameServer {
                        boolean dnssecRequest = false;
                        int qtype = question.getType();
                        final CacheRegister data = 
trafficRouterManager.getTrafficRouter().getCacheRegister();
-                       final JSONObject config = data.getConfig();
-                       final boolean ecsEnable = 
config.optBoolean("ecsEnable", false);
+                       final boolean ecsEnable = 
JsonUtils.optBoolean(data.getConfig(), "ecsEnable", false);
                        int flags = 0;
 
                        if ((qopt != null) && (qopt.getVersion() > 
MAX_SUPPORTED_EDNS_VERS)) {
diff --git 
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java
 
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java
index 9ce13ac..5e05cd8 100644
--- 
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java
+++ 
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java
@@ -30,9 +30,8 @@ import static org.powermock.api.mockito.PowerMockito.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.json.JSONObject;
-
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Header.class, NameServer.class, TrafficRouterManager.class, 
TrafficRouter.class, CacheRegister.class})
@@ -53,7 +52,7 @@ public class NameServerTest {
         trafficRouter = mock(TrafficRouter.class);
         CacheRegister cacheRegister = mock(CacheRegister.class);
         doReturn(cacheRegister).when(trafficRouter).getCacheRegister();
-        JSONObject js = new JSONObject().put("ecsEnable", true);
+        JSONNode js = JSONNodeFactory.instance.objectNode().put("ecsEnable", 
true);
         when(cacheRegister.getConfig()).thenReturn(js);
         
         Name m_an, m_host, m_admin;

-- 
To stop receiving notification emails like this one, please contact
els...@apache.org.