Merge pull request #171 from pantianying/develop

 add map struct to generic filter

filter/impl/generic_filter.go

@@ -83,11 +83,7 @@ func struct2MapAll(obj interface{}) interface{} {
 	if t.Kind() == reflect.Struct {
 		result := make(map[string]interface{}, t.NumField())
 		for i := 0; i < t.NumField(); i++ {
-			if v.Field(i).Kind() == reflect.Struct {
-				if v.Field(i).CanInterface() {
-					setInMap(result, t.Field(i), struct2MapAll(v.Field(i).Interface()))
-				}
-			} else if v.Field(i).Kind() == reflect.Slice {
+			if v.Field(i).Kind() == reflect.Struct || v.Field(i).Kind() == reflect.Slice || v.Field(i).Kind() == reflect.Map {
 				if v.Field(i).CanInterface() {
 					setInMap(result, t.Field(i), struct2MapAll(v.Field(i).Interface()))
 				}
@@ -106,6 +102,18 @@ func struct2MapAll(obj interface{}) interface{} {
 			newTemps = append(newTemps, newTemp)
 		}
 		return newTemps
+	} else if t.Kind() == reflect.Map {
+		var newTempMap = make(map[string]interface{}, v.Len())
+		iter := v.MapRange()
+		for iter.Next() {
+			mapK := iter.Key().String()
+			if !iter.Value().CanInterface() {
+				continue
+			}
+			mapV := iter.Value().Interface()
+			newTempMap[mapK] = struct2MapAll(mapV)
+		}
+		return newTempMap
 	} else {
 		return obj
 	}

filter/impl/generic_filter_test.go

@@ -87,3 +87,35 @@ func Test_struct2MapAll_Slice(t *testing.T) {
 	assert.Equal(t, reflect.Slice, reflect.TypeOf(m["caCa"]).Kind())
 	assert.Equal(t, reflect.Map, reflect.TypeOf(m["caCa"].([]interface{})[0].(map[string]interface{})["xxYy"]).Kind())
 }
+func Test_struct2MapAll_Map(t *testing.T) {
+	var testData struct {
+		AaAa string
+		Baba map[string]interface{}
+		CaCa map[string]string
+		DdDd map[string]interface{}
+	}
+	testData.AaAa = "aaaa"
+	testData.Baba = make(map[string]interface{})
+	testData.CaCa = make(map[string]string)
+	testData.DdDd = nil
+
+	testData.Baba["kk"] = 1
+	var structData struct {
+		Str string
+	}
+	structData.Str = "str"
+	testData.Baba["struct"] = structData
+	testData.Baba["nil"] = nil
+	testData.CaCa["k1"] = "v1"
+	testData.CaCa["kv2"] = "v2"
+	m := struct2MapAll(testData)
+
+	assert.Equal(t, reflect.Map, reflect.TypeOf(m).Kind())
+	assert.Equal(t, reflect.String, reflect.TypeOf(m.(map[string]interface{})["aaAa"]).Kind())
+	assert.Equal(t, reflect.Map, reflect.TypeOf(m.(map[string]interface{})["baba"]).Kind())
+	assert.Equal(t, reflect.Map, reflect.TypeOf(m.(map[string]interface{})["baba"].(map[string]interface{})["struct"]).Kind())
+	assert.Equal(t, "str", m.(map[string]interface{})["baba"].(map[string]interface{})["struct"].(map[string]interface{})["str"])
+	assert.Equal(t, nil, m.(map[string]interface{})["baba"].(map[string]interface{})["nil"])
+	assert.Equal(t, reflect.Map, reflect.TypeOf(m.(map[string]interface{})["caCa"]).Kind())
+	assert.Equal(t, reflect.Map, reflect.TypeOf(m.(map[string]interface{})["ddDd"]).Kind())
+}