[PIPE-1247] Allow duplicate field *names* if they have different name…

… values in the json tag (#25)

fixtures/duplicate_embedded_fields.json

@@ -0,0 +1,30 @@
+{
+  "$ref": "#/definitions/testmodels.Root",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "testmodels.Root": {
+      "additionalProperties": false,
+      "properties": {
+        "bar": {
+          "type": "string"
+        },
+        "baz": {
+          "type": "string"
+        },
+        "bazDifferent": {
+          "type": "string"
+        },
+        "foo": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "foo",
+        "bar",
+        "baz"
+      ],
+      "type": "object"
+    }
+  }
+}
+

internal/testmodels/no_duplicate_fields_and_struct_precedence_over_embedded.go → internal/testmodels/duplicate_embedded_fields.go

@@ -3,15 +3,18 @@ package testmodels
 type MostInner struct {
 	Foo string `json:"foo,omitempty"`
 	Bar string `json:"bar,omitempty"`
+	Baz string `json:"bazDifferent,omitempty"`
 }
 type Inner struct {
 	MostInner
 	Foo string `json:"foo,omitempty"`
 	Bar string `json:"bar,omitempty"`
+	Baz string `json:"baz,omitempty"`
 }
 
 type Root struct {
 	Inner
 	Foo string `json:"foo"`
 	Bar string `json:"bar"`
+	Baz string `json:"baz"`
 }

reflect.go

@@ -327,14 +327,15 @@ func (r *Reflector) reflectStructFields(st *Type, definitions Definitions, t ref
 	orderArray := []structOrder{}
 	for i := 0; i < t.NumField(); i++ {
 		f := t.Field(i)
-		// if not Anonymous and tag not present, insert
-		// else check if present and assign propert to current field
+
+		// Prevent duplicate jsonschema name declarations when using embeds
+		name, required := r.reflectFieldName(f, t)
 		if !f.Anonymous {
-			_, ok := st.tagPrecedence[f.Name]
+			_, ok := st.tagPrecedence[name]
 			if !ok {
-				st.tagPrecedence[f.Name] = f.Tag
+				st.tagPrecedence[name] = f.Tag
 			} else {
-				f.Tag = st.tagPrecedence[f.Name]
+				f.Tag = st.tagPrecedence[name]
 			}
 		}
 		// anonymous and exported type should be processed recursively
@@ -346,7 +347,6 @@ func (r *Reflector) reflectStructFields(st *Type, definitions Definitions, t ref
 			continue
 		}
 
-		name, required := r.reflectFieldName(f, t)
 		if name == "" {
 			continue
 		}

reflect_test.go

@@ -29,6 +29,7 @@ var schemaGenerationTests = []testSet{
 	{&jsonschema.Reflector{}, "fixtures/case.json", testmodels.ExampleCase{}},
 	{&jsonschema.Reflector{}, "fixtures/test_min_max_items.json", testmodels.SliceTestType{}},
 	{&jsonschema.Reflector{}, "fixtures/test_recursion.json", testmodels.TestFamilyMember{}},
+	{&jsonschema.Reflector{}, "fixtures/duplicate_embedded_fields.json", testmodels.Root{}},
 }
 
 func TestSchemaGeneration(t *testing.T) {