Skip to content

Commit 10dff42

Browse files
committed
Added json marshal support
1 parent 74ea2f3 commit 10dff42

File tree

2 files changed

+116
-0
lines changed

2 files changed

+116
-0
lines changed

json.go

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* This file is part of PropertiesOrderedMap library.
3+
*
4+
* Copyright 2018 Arduino AG (http://www.arduino.cc/)
5+
*
6+
* PropertiesOrderedMap library is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
30+
package properties
31+
32+
import (
33+
"encoding/json"
34+
)
35+
36+
// XXX: no simple way to preserve ordering in JSON.
37+
38+
// MarshalJSON implements json.Marshaler interface
39+
func (m *Map) MarshalJSON() ([]byte, error) {
40+
return json.Marshal(m.kv)
41+
}
42+
43+
// UnmarshalJSON implements json.Unmarshaler interface
44+
func (m *Map) UnmarshalJSON(d []byte) error {
45+
var obj map[string]string
46+
if err := json.Unmarshal(d, &obj); err != nil {
47+
return err
48+
}
49+
50+
m.kv = map[string]string{}
51+
m.o = []string{}
52+
for k, v := range obj {
53+
m.Set(k, v)
54+
}
55+
return nil
56+
}

json_test.go

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* This file is part of PropertiesOrderedMap library.
3+
*
4+
* Copyright 2018 Arduino AG (http://www.arduino.cc/)
5+
*
6+
* PropertiesOrderedMap library is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
30+
package properties
31+
32+
import (
33+
"encoding/json"
34+
"testing"
35+
36+
"github.com/stretchr/testify/require"
37+
)
38+
39+
func TestJson(t *testing.T) {
40+
testmap := NewMap()
41+
testmap.Set("a", "1")
42+
testmap.Set("b", "2")
43+
testmap.Set(`"e"`, "3")
44+
testmap.Set("d", "4")
45+
testmap.Set(`\"c"\`, "5")
46+
47+
d, err := json.Marshal(testmap)
48+
require.NoError(t, err)
49+
require.Equal(t, `{"\"e\"":"3","\\\"c\"\\":"5","a":"1","b":"2","d":"4"}`, string(d))
50+
51+
var decodedmap *Map
52+
err = json.Unmarshal(d, &decodedmap)
53+
require.NoError(t, err)
54+
require.Equal(t, 5, decodedmap.Size())
55+
require.Equal(t, "1", decodedmap.Get("a"))
56+
require.Equal(t, "2", decodedmap.Get("b"))
57+
require.Equal(t, "3", decodedmap.Get(`"e"`))
58+
require.Equal(t, "4", decodedmap.Get("d"))
59+
require.Equal(t, "5", decodedmap.Get(`\"c"\`))
60+
}

0 commit comments

Comments
 (0)