Merge pull request #122 from nls-jajuko/121-output-format-fixes-for-s…

…chema output format fixes for schema
nlsfi · Nov 6, 2024 · 33d9da0 · 33d9da0
2 parents 1b1b4e6 + bd3b4f7
commit 33d9da0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...c/main/java/fi/nls/hakunapi/simple/servlet/jakarta/operation/GetCollectionSchemaImpl.java b/...c/main/java/fi/nls/hakunapi/simple/servlet/jakarta/operation/GetCollectionSchemaImpl.java
@@ -69,7 +69,8 @@ public SchemaDefinition handle(
             } else {
                 Schema<?> schema = p.getSchema();
                 if (schema != null) {
-                    properties.addProperties(p.getName(), OAS30toJsonSchema.toJsonSchema(schema));
+                    schema = OAS30toJsonSchema.toJsonSchema(schema).nullable(p.nullable());
+                    properties.addProperty(p.getName(), schema);
                 }
             }
         }

diff --git a/...src/main/java/fi/nls/hakunapi/simple/servlet/javax/operation/GetCollectionSchemaImpl.java b/...src/main/java/fi/nls/hakunapi/simple/servlet/javax/operation/GetCollectionSchemaImpl.java
@@ -69,7 +69,8 @@ public SchemaDefinition handle(
             } else {
                 Schema<?> schema = p.getSchema();
                 if (schema != null) {
-                    properties.addProperties(p.getName(), OAS30toJsonSchema.toJsonSchema(schema));
+                    schema = OAS30toJsonSchema.toJsonSchema(schema).nullable(p.nullable());
+                    properties.addProperty(p.getName(), schema);
                 }
             }
         }