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 a9d28034a2 juneau-marshall improvements
a9d28034a2 is described below
commit a9d28034a21a05440de8568a66b3c7d6ac6a9c85
Author: James Bognar <[email protected]>
AuthorDate: Wed Dec 17 13:48:14 2025 -0500
juneau-marshall improvements
---
.../org/apache/juneau/commons/reflect/ReflectionMap.java | 14 +++++++-------
.../src/main/java/org/apache/juneau/BeanPropertyMeta.java | 6 +++---
.../src/main/java/org/apache/juneau/UriContext.java | 10 +++++-----
.../main/java/org/apache/juneau/cp/BasicFileFinder.java | 6 +++---
.../src/main/java/org/apache/juneau/cp/BeanStore.java | 2 +-
.../java/org/apache/juneau/svl/VarResolverSession.java | 2 +-
.../java/org/apache/juneau/rest/mock/MockPathResolver.java | 6 +++---
.../java/org/apache/juneau/rest/debug/DebugEnablement.java | 4 ++--
.../java/org/apache/juneau/rest/logger/CallLogger.java | 8 ++++----
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ReflectionMap.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ReflectionMap.java
index 7f58be65be..0309ab89b2 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ReflectionMap.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ReflectionMap.java
@@ -317,8 +317,8 @@ public class ReflectionMap<V> {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("simpleName", simpleName)
.a("fullName", fullName)
+ .a("simpleName", simpleName)
.a("value", value);
// @formatter:on
}
@@ -356,9 +356,9 @@ public class ReflectionMap<V> {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("simpleClassName", simpleClassName)
- .a("fullClassName", fullClassName)
.a("args", args)
+ .a("fullClassName", fullClassName)
+ .a("simpleClassName", simpleClassName)
.a("value", value);
// @formatter:on
}
@@ -393,9 +393,9 @@ public class ReflectionMap<V> {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("simpleClassName", simpleClassName)
- .a("fullClassName", fullClassName)
.a("fieldName", fieldName)
+ .a("fullClassName", fullClassName)
+ .a("simpleClassName", simpleClassName)
.a("value", value);
// @formatter:on
}
@@ -444,10 +444,10 @@ public class ReflectionMap<V> {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("simpleClassName", simpleClassName)
+ .a("args", opt(args).map(x -> '[' + toCdl(x) +
"]").orElse(null))
.a("fullClassName", fullClassName)
.a("methodName", methodName)
- .a("args", opt(args).map(x -> '[' + toCdl(x) +
"]").orElse(null))
+ .a("simpleClassName", simpleClassName)
.a("value", value);
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index cc7c6b5421..30a8983d92 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -1142,11 +1142,11 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("name", name)
- .a("type", cn(rawTypeMeta))
.a("field", field)
.a("getter", getter)
- .a("setter", setter);
+ .a("name", name)
+ .a("setter", setter)
+ .a("type", cn(rawTypeMeta));
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
index 89cb6ef970..790feeee28 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
@@ -411,16 +411,16 @@ public class UriContext {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
+ .a("aContextRoot", aContextRoot.get())
+ .a("aPathInfo", aPathInfo.get())
+ .a("aServletPath", aServletPath.get())
.a("authority", authority)
.a("contextRoot", contextRoot)
- .a("servletPath", servletPath)
- .a("pathInfo", pathInfo)
.a("parentPath", parentPath)
- .a("aContextRoot", aContextRoot.get())
+ .a("pathInfo", pathInfo)
.a("rContextRoot", rContextRoot.get())
- .a("aServletPath", aServletPath.get())
.a("rResource", rResource.get())
- .a("aPathInfo", aPathInfo.get())
+ .a("servletPath", servletPath)
.a("rPath", rPath.get());
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index e1b18445f8..77892f0d76 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -118,11 +118,11 @@ public class BasicFileFinder implements FileFinder {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("class", cns(getClass()))
- .a("roots", roots)
.a("cachingLimit", cachingLimit)
- .a("include", includePatterns)
+ .a("class", cns(getClass()))
.a("exclude", excludePatterns)
+ .a("include", includePatterns)
+ .a("roots", roots)
.a("hashCode", hashCode);
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
index 841941218d..e4146f788b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
@@ -635,8 +635,8 @@ public class BeanStore {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("identity", identity(this))
.a("entries",
entries.stream().map(BeanStoreEntry::properties).collect(toList()))
+ .a("identity", identity(this))
.a("outer", identity(outer.orElse(null)))
.a("parent",
parent.map(BeanStore::properties).orElse(null))
.ai(readOnly, "readOnly", readOnly)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index 6b427e7dd0..4e6d85c1d3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -433,8 +433,8 @@ public class VarResolverSession {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("var", this.context.getVarMap().keySet())
.a("context.beanStore", this.context.beanStore)
+ .a("var", this.context.getVarMap().keySet())
.a("session.beanStore", beanStore);
// @formatter:on
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
index 8ab87b05b6..447c2f06bc 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
@@ -121,12 +121,12 @@ class MockPathResolver {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("uri", uri)
.a("contextPath", contextPath)
- .a("servletPath", servletPath)
+ .a("error", error)
.a("remainder", remainder)
+ .a("servletPath", servletPath)
.a("target", target)
- .a("error", error);
+ .a("uri", uri);
// @formatter:on
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
index b41fe2277e..65ea2e75b5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
@@ -277,9 +277,9 @@ public abstract class DebugEnablement {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
+ .a("conditionalPredicate", conditionalPredicate)
.a("defaultEnablement", defaultEnablement)
- .a("enablementMap", enablementMap)
- .a("conditionalPredicate", conditionalPredicate);
+ .a("enablementMap", enablementMap);
// @formatter:on
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index 7c4d37bcf7..a84d6df5fb 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
@@ -657,14 +657,14 @@ public class CallLogger {
protected FluentMap<String,Object> properties() {
// @formatter:off
return filteredBeanPropertyMap()
- .a("logger", logger)
- .a("thrownStore", thrownStore)
+ .a("debugRules", debugRules)
.a("enabled", enabled)
.a("level", level)
+ .a("logger", logger)
+ .a("normalRules", normalRules)
.a("requestDetail", requestDetail)
.a("responseDetail", responseDetail)
- .a("normalRules", normalRules)
- .a("debugRules", debugRules);
+ .a("thrownStore", thrownStore);
// @formatter:on
}
