Merge pull request #693 from uber/sc-binary-check-nil

Add nil check in code-gen converter for binary
uber · Mar 26, 2020 · ab8c042 · ab8c042
2 parents 993a605 + aa38399
commit ab8c042
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/codegen/type_converter.go b/codegen/type_converter.go
@@ -807,9 +807,10 @@ func (c *TypeConverter) genStructConverter(
 				return err
 			}
 		case *compile.BinarySpec:
-			// TODO: handle override. Check if binarySpec can be optional.
+			for _, line := range checkOptionalNil(indent, c.uninitialized, toIdentifier, prevKeyPrefixes, c.useRecurGen) {
+				c.append(line)
+			}
 			c.append(toIdentifier, " = []byte(", fromIdentifier, ")")
-
 		case *compile.StructSpec:
 			var (
 				stFromPrefix = fromPrefix

diff --git a/codegen/type_converter_test.go b/codegen/type_converter_test.go
@@ -3592,3 +3592,46 @@ func TestNestedMapOfListOfMapInvalid(t *testing.T) {
 
 	assert.Error(t, err)
 }
+
+func TestConverterMapNestedBinary(t *testing.T) {
+	fieldMap := make(map[string]codegen.FieldMapperEntry)
+	fieldMap["NestedTwo.NestedNestedTwo.Two"] = codegen.FieldMapperEntry{
+		QualifiedName: "Two",
+		Override:      false,
+	}
+
+	lines, err := convertTypes(
+		"Foo", "Bar",
+		`struct Foo {
+            1: optional string one
+			2: optional binary two
+		}
+
+        struct NestedBar {
+            1: optional NestedNestedBar nestedNestedTwo
+        }
+
+        struct NestedNestedBar {
+            1: optional binary two
+        }
+
+		struct Bar {
+            1: optional string one
+			2: optional NestedBar nestedTwo
+		}`,
+		nil,
+		fieldMap,
+	)
+
+	assert.NoError(t, err)
+	assertPrettyEqual(t, trim(`
+		out.One = (*string)(in.One)
+		if out.NestedTwo == nil {
+			out.NestedTwo = &structs.NestedBar{}
+		}
+		if out.NestedTwo.NestedNestedTwo == nil {
+			out.NestedTwo.NestedNestedTwo = &structs.NestedNestedBar{}
+		}
+		out.NestedTwo.NestedNestedTwo.Two = []byte(in.Two)
+	`), lines)
+}