Fix: Still seeing nested type: { type: {} } declarations for maps w…

…here the values are collapsed records (only for first invocation).
flipp-oss · Mar 11, 2024 · 88864bb · 88864bb
1 parent 17147e3
commit 88864bb
Show file tree

Hide file tree

Showing 13 changed files with 465 additions and 368 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,8 @@
 
 # UNRELEASED
 
+- Fix: Still seeing nested `type: { type: {} }` declarations for maps where the values are collapsed records (only for first invocation).
+
 # 0.7.2 - 2024-02-28
 
 - Fix: Accidentally removed map defaults, oops!

diff --git a/avro/map.go b/avro/map.go
@@ -30,6 +30,22 @@ func (t Map) ToJSON(types *TypeRepo) (any, error) {
   if ok && mapType[0] == "null"{
     valueJson = mapType[1]
   }
+  valueJsonMap, ok := valueJson.(*orderedmap.OrderedMap)
+  if ok {
+    returnedType, _ := valueJsonMap.Get("type")
+    returnedMap, ok := returnedType.(*orderedmap.OrderedMap)
+    if ok {
+     _, hasType := returnedMap.Get("type")
+     if hasType {
+       // it's adding an extra nesting of type: { type: ... } } - we have to flatten it
+       for _, k := range returnedMap.Keys() {
+         val, _ := returnedMap.Get(k)
+          valueJsonMap.Set(k, val)
+       }
+     }
+    }
+
+  }
   jsonMap := orderedmap.New()
   jsonMap.Set("type", "map")
   jsonMap.Set("values", valueJson)

diff --git a/testdata/base/Foobar.avsc b/testdata/base/Foobar.avsc
@@ -115,10 +115,10 @@
       "default": {}
     },
     {
-      "name": "string_lists",
+      "name": "string_list_map",
       "type": {
-        "type": "array",
-        "items": {
+        "type": "map",
+        "values": {
           "type": "record",
           "name": "StringList",
           "namespace": "testdata",
@@ -134,6 +134,14 @@
           ]
         }
       },
+      "default": {}
+    },
+    {
+      "name": "string_lists",
+      "type": {
+        "type": "array",
+        "items": "testdata.StringList"
+      },
       "default": []
     }
   ]

diff --git a/testdata/base/Widget.avsc b/testdata/base/Widget.avsc
@@ -16,6 +16,77 @@
       "type": "long",
       "default": 0
     },
+    {
+      "name": "string_map",
+      "type": {
+        "type": "map",
+        "values": {
+          "type": "record",
+          "name": "StringList",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "data",
+              "type": {
+                "type": "array",
+                "items": "string"
+              },
+              "default": []
+            }
+          ]
+        }
+      },
+      "default": {}
+    },
+    {
+      "name": "strings",
+      "type": "testdata.StringList",
+      "default": ""
+    },
+    {
+      "name": "a_one_of",
+      "type": [
+        "null",
+        {
+          "type": "record",
+          "name": "AOneOf",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "oneof_types",
+              "type": [
+                {
+                  "type": "record",
+                  "name": "TypeA",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "foo",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                },
+                {
+                  "type": "record",
+                  "name": "TypeB",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "bar",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                }
+              ],
+              "default": null
+            }
+          ]
+        }
+      ],
+      "default": null
+    },
     {
       "name": "foobar",
       "type": {
@@ -134,87 +205,24 @@
             },
             "default": {}
           },
+          {
+            "name": "string_list_map",
+            "type": {
+              "type": "map",
+              "values": "testdata.StringList"
+            },
+            "default": {}
+          },
           {
             "name": "string_lists",
             "type": {
               "type": "array",
-              "items": {
-                "type": "record",
-                "name": "StringList",
-                "namespace": "testdata",
-                "fields": [
-                  {
-                    "name": "data",
-                    "type": {
-                      "type": "array",
-                      "items": "string"
-                    },
-                    "default": []
-                  }
-                ]
-              }
+              "items": "testdata.StringList"
             },
             "default": []
           }
         ]
       }
-    },
-    {
-      "name": "strings",
-      "type": "testdata.StringList",
-      "default": ""
-    },
-    {
-      "name": "string_map",
-      "type": {
-        "type": "map",
-        "values": "testdata.StringList"
-      },
-      "default": {}
-    },
-    {
-      "name": "a_one_of",
-      "type": [
-        "null",
-        {
-          "type": "record",
-          "name": "AOneOf",
-          "namespace": "testdata",
-          "fields": [
-            {
-              "name": "oneof_types",
-              "type": [
-                {
-                  "type": "record",
-                  "name": "TypeA",
-                  "namespace": "testdata",
-                  "fields": [
-                    {
-                      "name": "foo",
-                      "type": "string",
-                      "default": ""
-                    }
-                  ]
-                },
-                {
-                  "type": "record",
-                  "name": "TypeB",
-                  "namespace": "testdata",
-                  "fields": [
-                    {
-                      "name": "bar",
-                      "type": "string",
-                      "default": ""
-                    }
-                  ]
-                }
-              ],
-              "default": null
-            }
-          ]
-        }
-      ],
-      "default": null
     }
   ]
 }
diff --git a/testdata/collapse_fields/Foobar.avsc b/testdata/collapse_fields/Foobar.avsc
@@ -114,14 +114,25 @@
       },
       "default": {}
     },
+    {
+      "name": "string_list_map",
+      "type": {
+        "type": "map",
+        "values": {
+          "name": "data",
+          "type": "array",
+          "default": [],
+          "items": "string"
+        }
+      },
+      "default": {}
+    },
     {
       "name": "string_lists",
       "type": {
         "type": "array",
         "items": {
-          "name": "data",
           "type": "array",
-          "default": [],
           "items": "string"
         }
       },