change dns cache style

Author: YangSen-qn

library/src/main/java/com/qiniu/android/http/dns/DnsCacheInfo.java

@@ -1,5 +1,11 @@
 package com.qiniu.android.http.dns;
 
+import com.qiniu.android.utils.StringUtils;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.List;
@@ -8,12 +14,22 @@
 /**
  * Created by jemy on 2019/9/23.
  */
-public class DnsCacheInfo {
+public class DnsCacheInfo implements java.io.Serializable {
+
     public String currentTime;
     public String localIp;
     public ConcurrentHashMap<String, List<IDnsNetworkAddress>> info;
 
-    public DnsCacheInfo() {}
+    public static DnsCacheInfo createDnsCacheInfoByJsonData(byte[] jsonData) {
+        if (jsonData == null){
+            return null;
+        }
+        DnsCacheInfo dnsCacheInfo = (DnsCacheInfo)StringUtils.toObject(jsonData);
+        return dnsCacheInfo;
+    }
+
+    public DnsCacheInfo() {
+    }
 
     public DnsCacheInfo(String currentTime, String localIp, ConcurrentHashMap<String, List<IDnsNetworkAddress>> info) {
         this.currentTime = currentTime;
@@ -49,6 +65,10 @@ public String cacheKey(){
         return localIp;
     }
 
+    public byte[] toJsonData(){
+        return StringUtils.toByteArray(this);
+    }
+
     @Override
     public String toString() {
         return "{\"currentTime\":\"" + currentTime + "\", \"localIp\":\"" + localIp + "\"}";

library/src/main/java/com/qiniu/android/http/dns/DnsNetworkAddress.java

@@ -3,7 +3,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-class DnsNetworkAddress implements  IDnsNetworkAddress{
+class DnsNetworkAddress implements IDnsNetworkAddress, java.io.Serializable {
 
     private final String hostValue;
     private final String ipValue;

library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java

@@ -72,13 +72,6 @@ public boolean recoverCache(){
             return true;
         }
 
-        DnsCacheInfo cacheInfo = (DnsCacheInfo)StringUtils.toObject(data);
-        if (cacheInfo == null){
-            return true;
-        }
-
-        setDnsCacheInfo(cacheInfo);
-
         return recoverDnsCache(data);
     }
 
@@ -233,29 +226,14 @@ private boolean preFetchHost(String preHost, Dns dns){
 
     private boolean recoverDnsCache(byte[] data){
 
-        JSONObject addressInfo = null;
-        try {
-            addressInfo = new JSONObject(new String(data));
-        } catch (JSONException e) {
+        DnsCacheInfo dnsCacheInfo = DnsCacheInfo.createDnsCacheInfoByJsonData(data);
+        if (dnsCacheInfo == null || dnsCacheInfo.info == null || dnsCacheInfo.info.size() == 0){
             return false;
         }
 
-        Iterator<String> hosts = addressInfo.keys();
-        while (hosts.hasNext()){
-            String host = hosts.next();
-            ArrayList<IDnsNetworkAddress> addressList = new ArrayList<>();
-            try {
-                JSONArray addressJsonList = addressInfo.getJSONArray(host);
-                for(int i=0; i<addressJsonList.length(); i++){
-                    JSONObject addressJson = addressJsonList.getJSONObject(i);
-                    DnsNetworkAddress address = DnsNetworkAddress.address(addressJson);
-                    addressList.add(address);
-                }
-            } catch (JSONException ignored) {
-            }
-
-            addressDictionary.put(host, addressList);
-        }
+        addressDictionary.putAll(dnsCacheInfo.info);
+        dnsCacheInfo.info = addressDictionary;
+        setDnsCacheInfo(dnsCacheInfo);
 
         return false;
     }
@@ -279,30 +257,12 @@ private boolean recorderDnsCache(){
 
         setDnsCacheInfo(dnsCacheInfo);
 
-        return recorderDnsCache(recorder, dnsCacheInfo.cacheKey());
-    }
-
-    private boolean recorderDnsCache(Recorder recorder, String cacheKey){
-
-        JSONObject addressInfo = new JSONObject();
-        for (String key : addressDictionary.keySet()){
-            List<IDnsNetworkAddress> addressModelList = addressDictionary.get(key);
-            JSONArray addressJsonList = new JSONArray();
-
-            for (IDnsNetworkAddress address : addressModelList){
-                if (address.getHostValue() != null && address.getIpValue() != null) {
-                    DnsNetworkAddress addressObject = (DnsNetworkAddress)address;
-                    JSONObject addressJson = addressObject.toJson();
-                    addressJsonList.put(addressJson);
-                }
-            }
-
-            try {
-                addressInfo.put(key, addressJsonList);
-            } catch (JSONException ignored) {}
+        byte[] data = dnsCacheInfo.toJsonData();
+        if (data == null){
+            return false;
         }
+        recorder.set(dnsCacheInfo.cacheKey(), data);
 
-        recorder.set(cacheKey, addressInfo.toString().getBytes());
         return true;
     }