apply mapping for slices of structs

artushin · Jun 4, 2014 · 0860405 · 0860405
1 parent 6d61939
commit 0860405
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/indices/putMapping.go b/indices/putMapping.go
@@ -87,9 +87,10 @@ func getProperties(t reflect.Type, prop map[string]interface{}) {
 		if tag == "" {
 
 			// We are looking for tags on any nested struct, independently of
-			// whether the field is a struct or a pointer to struct.
+			// whether the field is a struct, a pointer to struct, or a slice of structs
 			targetType := field.Type
-			if field.Type.Kind() == reflect.Ptr {
+			if targetType.Kind() == reflect.Ptr ||
+				targetType.Kind() == reflect.Slice {
 				targetType = field.Type.Elem()
 			}
 

diff --git a/indices/putMapping_test.go b/indices/putMapping_test.go
@@ -53,9 +53,10 @@ type TestStruct struct {
 	unexported    string
 	JsonOmitEmpty string `json:"jsonOmitEmpty,omitempty" elastic:"type:string"`
 	Embedded
-	Nested       NestedStruct  `json:"nested"`
-	NestedP      *NestedStruct `json:"pointer_to_nested"`
-	MultiAnalyze string        `json:"multi_analyze"`
+	Nested       NestedStruct   `json:"nested"`
+	NestedP      *NestedStruct  `json:"pointer_to_nested"`
+	NestedS      []NestedStruct `json:"slice_of_nested"`
+	MultiAnalyze string         `json:"multi_analyze"`
 }
 
 type Embedded struct {
@@ -111,6 +112,11 @@ func TestPutMapping(t *testing.T) {
 					"nestedField": {"type": "date"},
 				},
 			},
+			"slice_of_nested": map[string]map[string]map[string]string{
+				"properties": {
+					"nestedField": {"type": "date"},
+				},
+			},
 		},
 	})