From af400501496143c6bf7c82ac166b4818837fd835 Mon Sep 17 00:00:00 2001
From: simitt <mitter.silvia@gmail.com>
Date: Thu, 10 Aug 2017 16:58:11 +0200
Subject: [PATCH] Revert "Add SetValue method to libbeat common.MapStr (#4838)"

This reverts commit fa77316a01d620078c0311dc4a607b0487e8e610.
---
 libbeat/common/mapstr.go      | 49 -------------------------------
 libbeat/common/mapstr_test.go | 54 -----------------------------------
 2 files changed, 103 deletions(-)

diff --git a/libbeat/common/mapstr.go b/libbeat/common/mapstr.go
index d33b84bfd5ac..c38977d10f23 100644
--- a/libbeat/common/mapstr.go
+++ b/libbeat/common/mapstr.go
@@ -138,15 +138,6 @@ func (m MapStr) Put(key string, value interface{}) (interface{}, error) {
 	return walkMap(key, m, mapStrOperation{putOperation{value}, true})
 }
 
-// SetValue dereferences a value if it is a pointer. Sets the dereferenced value if not nil.
-// If value is a MapStr or an array, the value is set if not empty.
-// Supported data types so far: *string, *int, *boolean, common.MapStr, array[]int, array[]string.
-// Values of unsupported types are set if they are not nil.
-// Sets a value for a given key if the (dereferenced) value is not nil or empty.
-func (m MapStr) SetValue(key string, value interface{}) {
-	walkMap(key, m, mapStrOperation{setValueOperation{value}, true})
-}
-
 // StringToPrint returns the MapStr as pretty JSON.
 func (m MapStr) StringToPrint() string {
 	json, err := json.MarshalIndent(m, "", "  ")
@@ -389,43 +380,3 @@ func (op putOperation) Do(key string, data MapStr) (interface{}, error) {
 	data[key] = op.Value
 	return existingValue, nil
 }
-
-type setValueOperation struct {
-	Value interface{}
-}
-
-func (op setValueOperation) Do(key string, data MapStr) (interface{}, error) {
-	if op.Value == nil {
-		return data, nil
-	}
-
-	switch op.Value.(type) {
-	case *bool:
-		if newVal := op.Value.(*bool); newVal != nil {
-			data[key] = *newVal
-		}
-	case *int:
-		if newVal := op.Value.(*int); newVal != nil {
-			data[key] = *newVal
-		}
-	case *string:
-		if newVal := op.Value.(*string); newVal != nil {
-			data[key] = *newVal
-		}
-	case MapStr:
-		if valMap := op.Value.(MapStr); len(valMap) > 0 {
-			data[key] = valMap
-		}
-	case []int:
-		if valArr := op.Value.([]int); len(valArr) > 0 {
-			data[key] = valArr
-		}
-	case []string:
-		if valArr := op.Value.([]string); len(valArr) > 0 {
-			data[key] = valArr
-		}
-	default:
-		data[key] = op.Value
-	}
-	return data, nil
-}
diff --git a/libbeat/common/mapstr_test.go b/libbeat/common/mapstr_test.go
index 403b986fbbf7..633032a8f8f0 100644
--- a/libbeat/common/mapstr_test.go
+++ b/libbeat/common/mapstr_test.go
@@ -221,60 +221,6 @@ func TestMapStrPut(t *testing.T) {
 	assert.Equal(t, MapStr{"subMap": MapStr{"newMap": MapStr{"a": 1}}}, m)
 }
 
-func TestMapStrSet(t *testing.T) {
-	m := MapStr{
-		"i1": 123,
-		"s1": "123",
-		"b1": false,
-		"x3": MapStr{
-			"b41": "val.b41",
-		},
-	}
-	type io struct {
-		Key      string
-		Val      interface{}
-		Fetch    string
-		Expected interface{}
-	}
-
-	mapVal := MapStr{"newKey": "newVal"}
-	arrStrVal := []string{"v1", "v2"}
-	arrIntVal := []int{1, 2, 3}
-	str := "strPtr"
-	var emptyStrPtr *string
-	i := 44
-	var emptyIntPtr *int
-	b := false
-	var emptyBoolPtr *bool
-	tests := []io{
-		{Key: "x3.b42", Val: "b42New", Fetch: "x3", Expected: MapStr{"b41": "val.b41", "b42": "b42New"}},
-		{Key: "m1", Val: mapVal, Fetch: "m1", Expected: mapVal},
-		{Key: "m2", Val: MapStr{}, Fetch: "m2", Expected: nil},
-		{Key: "a1", Val: arrStrVal, Fetch: "a1", Expected: arrStrVal},
-		{Key: "a2", Val: []string{}, Fetch: "a2", Expected: nil},
-		{Key: "a3", Val: arrIntVal, Fetch: "a3", Expected: arrIntVal},
-		{Key: "a4", Val: []int{}, Fetch: "a2", Expected: nil},
-		{Key: "s1", Val: nil, Fetch: "s1", Expected: "123"},
-		{Key: "s1", Val: "s1New", Fetch: "s1", Expected: "s1New"},
-		{Key: "s2", Val: emptyStrPtr, Fetch: "s2", Expected: nil},
-		{Key: "s3", Val: &str, Fetch: "s3", Expected: "strPtr"},
-		{Key: "i1", Val: nil, Fetch: "i1", Expected: 123},
-		{Key: "i1", Val: 456, Fetch: "i1", Expected: 456},
-		{Key: "i2", Val: emptyIntPtr, Fetch: "i2", Expected: nil},
-		{Key: "i3", Val: &i, Fetch: "i3", Expected: 44},
-		{Key: "b1", Val: nil, Fetch: "b1", Expected: false},
-		{Key: "b1", Val: true, Fetch: "b1", Expected: true},
-		{Key: "b2", Val: emptyBoolPtr, Fetch: "b2", Expected: nil},
-		{Key: "b3", Val: &b, Fetch: "b3", Expected: false},
-	}
-	for idx, test := range tests {
-		m.SetValue(test.Key, test.Val)
-		fetched, _ := m.GetValue(test.Fetch)
-		errMsg := fmt.Sprintf("Failed for %v: Expected %v, Received %v", idx, test.Expected, fetched)
-		assert.Equal(t, test.Expected, fetched, errMsg)
-	}
-}
-
 func TestClone(t *testing.T) {
 	assert := assert.New(t)