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 969806ef80 juneau-marshall improvements
969806ef80 is described below
commit 969806ef80c6b62c248f9f8f8da6e5a8605da9e7
Author: James Bognar <[email protected]>
AuthorDate: Wed Dec 17 13:42:18 2025 -0500
juneau-marshall improvements
---
.../src/main/java/org/apache/juneau/config/Config.java | 16 ++++++++--------
.../main/java/org/apache/juneau/jena/RdfSerializer.java | 12 ++++++------
.../src/main/java/org/apache/juneau/BeanContext.java | 6 +++---
.../src/main/java/org/apache/juneau/BeanSession.java | 4 ++--
.../main/java/org/apache/juneau/BeanTraverseContext.java | 4 ++--
.../java/org/apache/juneau/html/HtmlDocSerializer.java | 12 ++++++------
.../main/java/org/apache/juneau/json/JsonSerializer.java | 4 ++--
.../apache/juneau/jsonschema/JsonSchemaGenerator.java | 10 +++++-----
.../java/org/apache/juneau/serializer/Serializer.java | 10 +++++-----
.../main/java/org/apache/juneau/uon/UonSerializer.java | 2 +-
.../src/main/java/org/apache/juneau/xml/XmlParser.java | 4 ++--
.../main/java/org/apache/juneau/xml/XmlSerializer.java | 8 ++++----
.../main/java/org/apache/juneau/rest/RestContext.java | 4 ++--
13 files changed, 48 insertions(+), 48 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 1befb979d9..c01668f259 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -1120,16 +1120,16 @@ public class Config extends Context implements
ConfigEventListener {
@Override /* Overridden from Context */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("name", name)
- .a("store", store)
- .a("serializer", serializer)
- .a("parser", parser)
- .a("mods", mods)
- .a("varResolver", varResolver)
- .a("binaryLineLength", binaryLineLength)
.a("binaryFormat", binaryFormat)
+ .a("binaryLineLength", binaryLineLength)
+ .a("mods", mods)
.a("multiLineValuesOnSeparateLines",
multiLineValuesOnSeparateLines)
- .a("readOnly", readOnly);
+ .a("name", name)
+ .a("parser", parser)
+ .a("readOnly", readOnly)
+ .a("serializer", serializer)
+ .a("store", store)
+ .a("varResolver", varResolver);
}
@Override /* Overridden from Object */
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 0f14b76b75..9b33a74512 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -2054,16 +2054,16 @@ public class RdfSerializer extends WriterSerializer
implements RdfMetaProvider {
@Override /* Overridden from WriterSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
+ .a("addBeanTypes", addBeanTypes)
.a("addLiteralTypes", addLiteralTypes)
.a("addRootProperty", addRootProperty)
- .a("useXmlNamespaces", useXmlNamespaces)
- .a("looseCollections", looseCollections)
.a("autoDetectNamespaces", autoDetectNamespaces)
- .a("language", language)
- .a("juneauNs", juneauNs)
- .a("juneauBpNs", juneauBpNs)
.a("collectionFormat", collectionFormat)
+ .a("juneauBpNs", juneauBpNs)
+ .a("juneauNs", juneauNs)
+ .a("language", language)
+ .a("looseCollections", looseCollections)
.a("namespaces", namespaces)
- .a("addBeanTypes", addBeanTypes);
+ .a("useXmlNamespaces", useXmlNamespaces);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 40aa7b9520..703c5837d7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -4305,7 +4305,6 @@ public class BeanContext extends Context {
@Override /* Overridden from Context */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("id", System.identityHashCode(this))
.a("beanClassVisibility", beanClassVisibility)
.a("beanConstructorVisibility",
beanConstructorVisibility)
.a("beanDictionary", beanDictionary)
@@ -4315,16 +4314,17 @@ public class BeanContext extends Context {
.a("beansRequireSerializable", beansRequireSerializable)
.a("beansRequireSettersForGetters",
beansRequireSettersForGetters)
.a("beansRequireSomeProperties",
beansRequireSomeProperties)
- .a("ignoreTransientFields", ignoreTransientFields)
+ .a("id", System.identityHashCode(this))
.a("ignoreInvocationExceptionsOnGetters",
ignoreInvocationExceptionsOnGetters)
.a("ignoreInvocationExceptionsOnSetters",
ignoreInvocationExceptionsOnSetters)
+ .a("ignoreTransientFields", ignoreTransientFields)
.a("ignoreUnknownBeanProperties",
ignoreUnknownBeanProperties)
.a("ignoreUnknownNullBeanProperties",
ignoreUnknownNullBeanProperties)
.a("notBeanClasses", notBeanClasses)
.a("notBeanPackageNames", notBeanPackageNames)
.a("notBeanPackagePrefixes", notBeanPackagePrefixes)
- .a("swaps", swaps)
.a("sortProperties", sortProperties)
+ .a("swaps", swaps)
.a("useEnumNames", useEnumNames)
.a("useInterfaceProxies", useInterfaceProxies)
.a("useJavaBeanIntrospector", useJavaBeanIntrospector);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index c409be445f..b4bbbef1fa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -1685,7 +1685,7 @@ public class BeanSession extends ContextSession {
protected FluentMap<String,Object> properties() {
return super.properties()
.a("locale", locale)
- .a("timeZone", timeZone)
- .a("mediaType", mediaType);
+ .a("mediaType", mediaType)
+ .a("timeZone", timeZone);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 325a4e5dde..7fdb2c8eec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -764,8 +764,8 @@ public abstract class BeanTraverseContext extends
BeanContextable {
protected FluentMap<String,Object> properties() {
return super.properties()
.a("detectRecursions", detectRecursions)
- .a("maxDepth", maxDepth)
.a("ignoreRecursions", ignoreRecursions)
- .a("initialDepth", initialDepth);
+ .a("initialDepth", initialDepth)
+ .a("maxDepth", maxDepth);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 2ea7fdfade..ceca46f1b2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -1850,18 +1850,18 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
@Override /* Overridden from HtmlSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("header", header)
- .a("nav", nav)
- .a("navlinks", navlinks)
.a("aside", aside)
.a("asideFloat", asideFloat)
.a("footer", footer)
- .a("style", style)
.a("head", head)
- .a("stylesheet", stylesheet)
+ .a("header", header)
+ .a("nav", nav)
+ .a("navlinks", navlinks)
+ .a("noResultsMessage", noResultsMessage)
.a("nowrap", nowrap)
+ .a("style", style)
+ .a("stylesheet", stylesheet)
.a("template", template)
- .a("noResultsMessage", noResultsMessage)
.a("widgets", widgets);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index cda0bfafba..567dd70d21 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -1152,8 +1152,8 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
@Override /* Overridden from WriterSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("simpleAttrs", simpleAttrs)
+ .a("addBeanTypesJson", addBeanTypesJson)
.a("escapeSolidus", escapeSolidus)
- .a("addBeanTypesJson", addBeanTypesJson);
+ .a("simpleAttrs", simpleAttrs);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index d9fcf73f18..90b3a7bb58 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -999,13 +999,13 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
@Override /* Overridden from BeanTraverseContext */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("useBeanDefs", useBeanDefs)
- .a("allowNestedExamples", allowNestedExamples)
+ .a("addDescriptionsTo", addDescriptionsTo)
+ .a("addExamplesTo", addExamplesTo)
.a("allowNestedDescriptions", allowNestedDescriptions)
+ .a("allowNestedExamples", allowNestedExamples)
.a("beanDefMapper", beanDefMapper)
- .a("addExamplesTo", addExamplesTo)
- .a("addDescriptionsTo", addDescriptionsTo)
- .a("ignoreTypes", ignoreTypes);
+ .a("ignoreTypes", ignoreTypes)
+ .a("useBeanDefs", useBeanDefs);
}
JsonParser getJsonParser() { return jsonParser; }
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 4a95324a96..985fa175fb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -1600,16 +1600,16 @@ public class Serializer extends BeanTraverseContext {
protected FluentMap<String,Object> properties() {
return super.properties()
.a("addBeanTypes", addBeanTypes)
+ .a("addRootType", addRootType)
.a("keepNullProperties", keepNullProperties)
+ .a("listener", listener)
+ .a("sortCollections", sortCollections)
+ .a("sortMaps", sortMaps)
.a("trimEmptyCollections", trimEmptyCollections)
.a("trimEmptyMaps", trimEmptyMaps)
.a("trimStrings", trimStrings)
- .a("sortCollections", sortCollections)
- .a("sortMaps", sortMaps)
- .a("addRootType", addRootType)
.a("uriContext", uriContext)
- .a("uriResolution", uriResolution)
.a("uriRelativity", uriRelativity)
- .a("listener", listener);
+ .a("uriResolution", uriResolution);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index df28292e99..da54326ff7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -1199,8 +1199,8 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
@Override /* Overridden from WriterSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("encoding", encoding)
.a("addBeanTypes", addBeanTypes)
+ .a("encoding", encoding)
.a("paramFormat", paramFormat);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index bc50f2dd31..5e1d9d11ea 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -898,10 +898,10 @@ public class XmlParser extends ReaderParser implements
XmlMetaProvider {
@Override /* Overridden from ReaderParser */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("validating", validating)
+ .a("eventAllocator", eventAllocator)
.a("preserveRootElement", preserveRootElement)
.a("reporter", reporter)
.a("resolver", resolver)
- .a("eventAllocator", eventAllocator);
+ .a("validating", validating);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index a6ed04be89..ba4caff303 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -1351,11 +1351,11 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
@Override /* Overridden from WriterSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("autoDetectNamespaces", autoDetectNamespaces)
- .a("enableNamespaces", enableNamespaces)
+ .a("addBeanTypes", addBeanTypes)
.a("addNamespaceUrlsToRoot", addNamespaceUrlsToRoot)
+ .a("autoDetectNamespaces", autoDetectNamespaces)
.a("defaultNamespace", defaultNamespace)
- .a("namespaces", namespaces)
- .a("addBeanTypes", addBeanTypes);
+ .a("enableNamespaces", enableNamespaces)
+ .a("namespaces", namespaces);
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 3549a6d1d5..3dc12d9983 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -6140,20 +6140,20 @@ public class RestContext extends Context {
protected FluentMap<String,Object> properties() {
return super.properties()
.a("allowContentParam", allowContentParam)
+ .a("allowedHeaderParams", allowedHeaderParams)
.a("allowedMethodHeader", allowedMethodHeaders)
.a("allowedMethodParams", allowedMethodParams)
- .a("allowedHeaderParams", allowedHeaderParams)
.a("beanStore", beanStore)
.a("clientVersionHeader", clientVersionHeader)
.a("consumes", consumes)
.a("defaultRequestHeaders", defaultRequestHeaders)
.a("defaultResponseHeaders", defaultResponseHeaders)
- .a("restOpArgs", restOpArgs)
.a("partParser", partParser)
.a("partSerializer", partSerializer)
.a("produces", produces)
.a("renderResponseStackTraces",
renderResponseStackTraces)
.a("responseProcessors", responseProcessors)
+ .a("restOpArgs", restOpArgs)
.a("staticFiles", staticFiles)
.a("swaggerProvider", swaggerProvider)
.a("uriAuthority", uriAuthority)
