From c2fc6db82f860f596feb2dc207ec0b5f4f02cd5a Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Fri, 22 Nov 2024 15:57:34 -0700
Subject: [PATCH] Rename data structures to optimize the program

---
 lib/awsparser.dart | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/lib/awsparser.dart b/lib/awsparser.dart
index 6b27353..0530df3 100644
--- a/lib/awsparser.dart
+++ b/lib/awsparser.dart
@@ -1,8 +1,8 @@
 class AWSJson {
   String syncToken = "";
   String createDate = "";
-  List<AWSIPv4> prefixes = [];
-  List<AWSIPv6> ipv6_prefixes = [];
+  List<AWSIP> prefixes = [];
+  List<AWSIP> ipv6_prefixes = [];
 
   AWSJson._();
   factory AWSJson.parse(Map<String, dynamic> js) {
@@ -13,48 +13,30 @@ class AWSJson {
 
     List<dynamic> LPv4 = js['prefixes'] as List<dynamic>;
     for (var entry in LPv4) {
-      ajs.prefixes.add(AWSIPv4.parse(entry as Map<String, dynamic>));
+      ajs.prefixes.add(AWSIP.parse(entry as Map<String, dynamic>, ipv6: false));
     }
 
     List<dynamic> LPv6 = js['ipv6_prefixes'] as List<dynamic>;
     for (var entry in LPv6) {
-      ajs.ipv6_prefixes.add(AWSIPv6.parse(entry as Map<String, dynamic>));
+      ajs.ipv6_prefixes
+          .add(AWSIP.parse(entry as Map<String, dynamic>, ipv6: true));
     }
 
     return ajs;
   }
 }
 
-class AWSIPv4 {
+class AWSIP {
   String ip_prefix = "";
   String region = "";
   String service = "";
   String network_border_group = "";
 
-  AWSIPv4._();
+  AWSIP._();
 
-  factory AWSIPv4.parse(Map<String, dynamic> js) {
-    AWSIPv4 ip = AWSIPv4._();
-    ip.ip_prefix = js['ip_prefix'] as String;
-    ip.region = js['region'] as String;
-    ip.service = js['service'] as String;
-    ip.network_border_group = js['network_border_group'] as String;
-
-    return ip;
-  }
-}
-
-class AWSIPv6 {
-  String ipv6_prefix = "";
-  String region = "";
-  String service = "";
-  String network_border_group = "";
-
-  AWSIPv6._();
-
-  factory AWSIPv6.parse(Map<String, dynamic> js) {
-    AWSIPv6 ip = AWSIPv6._();
-    ip.ipv6_prefix = js['ipv6_prefix'] as String;
+  factory AWSIP.parse(Map<String, dynamic> js, {required bool ipv6}) {
+    AWSIP ip = AWSIP._();
+    ip.ip_prefix = js["${ipv6 ? "ipv6_" : "ip_"}prefix"] as String;
     ip.region = js['region'] as String;
     ip.service = js['service'] as String;
     ip.network_border_group = js['network_border_group'] as String;