Merge pull request #16 from gravitational/roman/emptymap

Empty map should not be set as nil

Author: klizhentas

jsonschema/schema.go

@@ -115,9 +115,6 @@ func setDefaults(ischema interface{}, ivars interface{}) interface{} {
 			}
 			out[key] = defval
 		}
-		if len(out) == 0 {
-			return nil
-		}
 		return out
 	case "array":
 		var vars []interface{}

jsonschema/schema_test.go

@@ -47,7 +47,7 @@ func (s *SchemaSuite) TestDefaults(c *C) {
 		},
 		{
 			schema: `{
-                 "type": "object", 
+                 "type": "object",
                  "properties": {
                     "value": {"type": "string", "default": "hello"},
                     "value2": {"type": "string"}
@@ -60,9 +60,9 @@ func (s *SchemaSuite) TestDefaults(c *C) {
 		},
 		{
 			schema: `{
-                 "type": "array", 
+                 "type": "array",
                  "items": {
-                    "type": "string", 
+                    "type": "string",
                     "default": "hello"
                  }
             }`,
@@ -71,9 +71,9 @@ func (s *SchemaSuite) TestDefaults(c *C) {
 		},
 		{
 			schema: `{
-                 "type": "array", 
+                 "type": "array",
                  "items": {
-                    "type": "object", 
+                    "type": "object",
                     "properties": {
                        "val": {"type": "string", "default": "hello"}
                     }
@@ -84,7 +84,7 @@ func (s *SchemaSuite) TestDefaults(c *C) {
 		},
 		{
 			schema: `{
-                 "type": "object", 
+                 "type": "object",
                  "default": {},
                  "properties": {
                      "values": {
@@ -105,12 +105,12 @@ func (s *SchemaSuite) TestDefaults(c *C) {
 		},
 		{
 			schema: `{
-                 "type": "object", 
+                 "type": "object",
                  "properties": {
                      "values": {
-                        "type": "array", 
+                        "type": "array",
                          "items": {
-                             "type": "object", 
+                             "type": "object",
                              "properties": {
                                 "val": {"type": "string", "default": "hello"}
                              }
@@ -131,6 +131,16 @@ func (s *SchemaSuite) TestDefaults(c *C) {
 				},
 			},
 		},
+		{
+			schema: `{
+                 "type": "object",
+                 "properties": {
+                     "value": {"type": "string"}
+                 }
+            }`,
+			input:  map[string]interface{}{},
+			output: map[string]interface{}{},
+		},
 	}
 	for i, tc := range tcs {
 		comment := Commentf("test #%d", i+1)