This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 586418b39c Marshall module improvements
586418b39c is described below

commit 586418b39c8c9d6f81e063a11d635cd510161e91
Author: James Bognar <[email protected]>
AuthorDate: Wed Dec 10 12:09:38 2025 -0500

    Marshall module improvements
---
 .../org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 1a9ca2baa1..e77f9ba5e1 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -302,9 +302,8 @@ public class JsonSchemaGeneratorSession extends 
BeanTraverseSession {
                return null;
        }
 
-       // TODO - Convert pNames to List<String>
-       @SuppressWarnings({ "unchecked", "rawtypes", "null" })
-       private JsonMap getSchema(ClassMeta<?> eType, String attrName, String[] 
pNames, boolean exampleAdded, boolean descriptionAdded, 
JsonSchemaBeanPropertyMeta jsbpm)
+       @SuppressWarnings({ "unchecked", "rawtypes" })
+       private JsonMap getSchema(ClassMeta<?> eType, String attrName, 
List<String> pNames, boolean exampleAdded, boolean descriptionAdded, 
JsonSchemaBeanPropertyMeta jsbpm)
                throws BeanRecursionException, SerializeException {
 
                if (ctx.isIgnoredType(eType))
@@ -425,8 +424,7 @@ public class JsonSchemaGeneratorSession extends 
BeanTraverseSession {
                                        BeanPropertyMeta p = i.next();
                                        if (p.canRead()) {
                                                var pProps = p.getProperties();
-                                               var pNamesArray = pProps == 
null ? null : pProps.toArray(new String[0]);
-                                               properties.put(p.getName(), 
getSchema(p.getClassMeta(), p.getName(), pNamesArray, exampleAdded, 
descriptionAdded, getJsonSchemaBeanPropertyMeta(p)));
+                                               properties.put(p.getName(), 
getSchema(p.getClassMeta(), p.getName(), pProps, exampleAdded, 
descriptionAdded, getJsonSchemaBeanPropertyMeta(p)));
                                        }
                                }
                                out.put("properties", properties);

Reply via email to