Merge pull request #118 from SGodeletAtBunnings/patch-1

Fixes issue#113

Author: orcaman

concurrent_map.go

@@ -324,24 +324,18 @@ func fnv32(key string) uint32 {
 	return hash
 }
 
-// Concurrent map uses Interface{} as its value, therefor JSON Unmarshal
-// will probably won't know which to type to unmarshal into, in such case
-// we'll end up with a value of type map[string]V, In most cases this isn't
-// out value type, this is why we've decided to remove this functionality.
-
-// func (m *ConcurrentMap) UnmarshalJSON(b []byte) (err error) {
-// 	// Reverse process of Marshal.
-
-// 	tmp := make(map[string]V)
-
-// 	// Unmarshal into a single map.
-// 	if err := json.Unmarshal(b, &tmp); err != nil {
-// 		return nil
-// 	}
-
-// 	// foreach key,value pair in temporary map insert into our concurrent map.
-// 	for key, val := range tmp {
-// 		m.Set(key, val)
-// 	}
-// 	return nil
-// }
+// Reverse process of Marshal.
+func (m *ConcurrentMap[V]) UnmarshalJSON(b []byte) (err error) {
+ 	tmp := make(map[string]V)
+
+ 	// Unmarshal into a single map.
+ 	if err := json.Unmarshal(b, &tmp); err != nil {
+ 		return err
+ 	}
+
+ 	// foreach key,value pair in temporary map insert into our concurrent map.
+ 	for key, val := range tmp {
+ 		m.Set(key, val)
+ 	}
+	return nil
+}