QNServerConfig json enable => enabled

Author: YangSen-qn

QiniuSDK/Storage/ServerConfig/QNServerConfig.m

@@ -46,7 +46,7 @@ @interface QNServerDohConfig()
 @implementation QNServerDohConfig
 + (instancetype)config:(NSDictionary *)info {
     QNServerDohConfig *config = [[QNServerDohConfig alloc] init];
-    config.enable = info[@"enable"];
+    config.enable = info[@"enabled"];
     config.ipv4Server = [QNServerDnsServer config:info[@"ipv4"]];
     config.ipv6Server = [QNServerDnsServer config:info[@"ipv6"]];
     return config;
@@ -61,7 +61,7 @@ @interface QNServerUdpDnsConfig()
 @implementation QNServerUdpDnsConfig
 + (instancetype)config:(NSDictionary *)info {
     QNServerUdpDnsConfig *config = [[QNServerUdpDnsConfig alloc] init];
-    config.enable = info[@"enable"];
+    config.enable = info[@"enabled"];
     config.ipv4Server = [QNServerDnsServer config:info[@"ipv4"]];
     config.ipv6Server = [QNServerDnsServer config:info[@"ipv6"]];
     return config;
@@ -79,7 +79,7 @@ @interface QNServerDnsConfig()
 @implementation QNServerDnsConfig
 + (instancetype)config:(NSDictionary *)info {
     QNServerDnsConfig *config = [[QNServerDnsConfig alloc] init];
-    config.enable = info[@"enable"];
+    config.enable = info[@"enabled"];
     config.clearId = [info[@"clear_id"] longValue];
     config.clearCache = [info[@"clear_cache"] longValue];
     config.dohConfig = [QNServerDohConfig config:info[@"doh"]];

QiniuSDKTests/QNServerConfigTest.m

@@ -34,12 +34,13 @@ - (void)tearDown {
 //}
 
 - (void)testServerConfigModel {
-    NSString *serverConfigJsonString = @"{\"region\":{\"clear_id\":10,\"clear_cache\":true},\"dns\":{\"clear_id\":10,\"clear_cache\":true,\"doh\":{\"enable\":true,\"ipv4\":{\"override_default\":true,\"urls\":[\"https://223.5.5.5/dns-query\"]},\"ipv6\":{\"override_default\":true,\"urls\":[\"https://FFAE::EEEE/dns-query\"]}},\"udp\":{\"enable\":true,\"ipv4\":{\"ips\":[\"223.5.5.5\",\"1.1.1.1\"],\"override_default\":true},\"ipv6\":{\"ips\":[\"FFAE::EEEE\"],\"override_default\":true}}},\"ttl\":86400}";
+    NSString *serverConfigJsonString = @"{\"region\":{\"clear_id\":10,\"clear_cache\":true},\"dns\":{\"enabled\":true,\"clear_id\":10,\"clear_cache\":true,\"doh\":{\"enabled\":true,\"ipv4\":{\"override_default\":true,\"urls\":[\"https://223.5.5.5/dns-query\"]},\"ipv6\":{\"override_default\":true,\"urls\":[\"https://FFAE::EEEE/dns-query\"]}},\"udp\":{\"enabled\":true,\"ipv4\":{\"ips\":[\"223.5.5.5\",\"1.1.1.1\"],\"override_default\":true},\"ipv6\":{\"ips\":[\"FFAE::EEEE\"],\"override_default\":true}}},\"ttl\":86400}";
     NSDictionary *serverConfigInfo = [NSJSONSerialization JSONObjectWithData:[serverConfigJsonString dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableLeaves error:nil];
     QNServerConfig *serverConfig = [QNServerConfig config:serverConfigInfo];
     XCTAssertTrue(serverConfig != nil, "server config was nil");
     XCTAssertTrue(serverConfig.ttl > 0, "server config ttl was nil");
     XCTAssertTrue(serverConfig.dnsConfig != nil, "server config dns config was nil");
+    XCTAssertTrue(serverConfig.dnsConfig.enable != nil, "server config dns config enable was nil");
     XCTAssertTrue(serverConfig.dnsConfig.clearId > 0, "server config dns config clearId was nil");
     XCTAssertTrue(serverConfig.dnsConfig.udpConfig != nil, "server config udp dns config was nil");
     XCTAssertTrue(serverConfig.dnsConfig.udpConfig.enable != nil, "server config udp dns config enable was nil");