grafana
diff --git a/‎testdata/jennies/rawtypes/constant_references/JSONSchema/constant_references.jsonschema.json‎
Lines changed: 11 additions & 4 deletions b/‎testdata/jennies/rawtypes/constant_references/JSONSchema/constant_references.jsonschema.json‎
Lines changed: 11 additions & 4 deletions
diff --git a/‎testdata/jennies/rawtypes/constant_references/OpenAPI/constant_references.openapi.json‎
Lines changed: 8 additions & 3 deletions b/‎testdata/jennies/rawtypes/constant_references/OpenAPI/constant_references.openapi.json‎
Lines changed: 8 additions & 3 deletions
diff --git a/‎testdata/jennies/rawtypes/disjunctions/JSONSchema/disjunctions.jsonschema.json‎
Lines changed: 8 additions & 1 deletion b/‎testdata/jennies/rawtypes/disjunctions/JSONSchema/disjunctions.jsonschema.json‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎testdata/jennies/rawtypes/disjunctions/OpenAPI/disjunctions.openapi.json‎
Lines changed: 2 additions & 1 deletion b/‎testdata/jennies/rawtypes/disjunctions/OpenAPI/disjunctions.openapi.json‎
Lines changed: 2 additions & 1 deletion
@@ -53,12 +53,19 @@
           "default": "ValueA"
         },
         "other": {
-          "allOf": [
+          "anyOf": [
             {
-              "$ref": "#/definitions/Enum"
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Enum"
+                }
+              ],
+              "default": "ValueA"
+            },
+            {
+              "type": "null"
             }
-          ],
-          "default": "ValueA"
+          ]
         }
       }
     },
 
@@ -61,12 +61,17 @@
             "default": "ValueA"
           },
           "other": {
+            "nullable": true,
             "allOf": [
               {
-                "$ref": "#/components/schemas/Enum"
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/Enum"
+                  }
+                ],
+                "default": "ValueA"
               }
-            ],
-            "default": "ValueA"
+            ]
           }
         }
       },
 
@@ -13,7 +13,14 @@
       "description": "Refresh rate or disabled."
     },
     "StringOrNull": {
-      "type": "string"
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "SomeStruct": {
       "type": "object",
 
@@ -21,7 +21,8 @@
         "description": "Refresh rate or disabled."
       },
       "StringOrNull": {
-        "type": "string"
+        "type": "string",
+        "nullable": true
       },
       "SomeStruct": {
         "type": "object",
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,19 @@`
`53`	`53`	`"default": "ValueA"`
`54`	`54`	`},`
`55`	`55`	`"other": {`
`56`		`- "allOf": [`
	`56`	`+ "anyOf": [`
`57`	`57`	`{`
`58`		`- "$ref": "#/definitions/Enum"`
	`58`	`+ "allOf": [`
	`59`	`+ {`
	`60`	`+ "$ref": "#/definitions/Enum"`
	`61`	`+ }`
	`62`	`+ ],`
	`63`	`+ "default": "ValueA"`
	`64`	`+ },`
	`65`	`+ {`
	`66`	`+ "type": "null"`
`59`	`67`	`}`
`60`		`- ],`
`61`		`- "default": "ValueA"`
	`68`	`+ ]`
`62`	`69`	`}`
`63`	`70`	`}`
`64`	`71`	`},`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,17 @@`
`61`	`61`	`"default": "ValueA"`
`62`	`62`	`},`
`63`	`63`	`"other": {`
	`64`	`+ "nullable": true,`
`64`	`65`	`"allOf": [`
`65`	`66`	`{`
`66`		`- "$ref": "#/components/schemas/Enum"`
	`67`	`+ "allOf": [`
	`68`	`+ {`
	`69`	`+ "$ref": "#/components/schemas/Enum"`
	`70`	`+ }`
	`71`	`+ ],`
	`72`	`+ "default": "ValueA"`
`67`	`73`	`}`
`68`		`- ],`
`69`		`- "default": "ValueA"`
	`74`	`+ ]`
`70`	`75`	`}`
`71`	`76`	`}`
`72`	`77`	`},`