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 01565de434 Marshall module improvements
01565de434 is described below
commit 01565de4348dcab7e0819283c558e4edc35c1818
Author: James Bognar <[email protected]>
AuthorDate: Fri Dec 12 16:12:56 2025 -0500
Marshall module improvements
---
.../apache/juneau/commons/collections/Cache.java | 16 +++++++--------
.../apache/juneau/commons/collections/Cache2.java | 16 +++++++--------
.../apache/juneau/commons/collections/Cache3.java | 16 +++++++--------
.../apache/juneau/commons/collections/Cache4.java | 24 +++++++++++-----------
.../apache/juneau/commons/collections/Cache5.java | 24 +++++++++++-----------
5 files changed, 48 insertions(+), 48 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
index 57481beacf..739dd092d0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
@@ -249,12 +249,12 @@ public class Cache<K,V> {
* total cache hits, and total cache misses (size of cache) to
help analyze cache effectiveness.
*
* @param value Whether to enable logging on exit.
- * @param id The identifier to use in the log message.
+ * @param idValue The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K,V> logOnExit(boolean value, String id) {
- this.id = id;
- this.logOnExit = value;
+ public Builder<K,V> logOnExit(boolean value, String idValue) {
+ id = idValue;
+ logOnExit = value;
return this;
}
@@ -279,12 +279,12 @@ public class Cache<K,V> {
* <li>Monitoring cache efficiency in production
* </ul>
*
- * @param id The identifier to use in the log message.
+ * @param value The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K,V> logOnExit(String id) {
- this.id = id;
- this.logOnExit = true;
+ public Builder<K,V> logOnExit(String value) {
+ id = value;
+ logOnExit = true;
return this;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache2.java
index e6af45b27b..3d89e434cb 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache2.java
@@ -207,12 +207,12 @@ public class Cache2<K1,K2,V> {
* total cache hits, and total cache misses (size of cache) to
help analyze cache effectiveness.
*
* @param value Whether to enable logging on exit.
- * @param id The identifier to use in the log message.
+ * @param idValue The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,V> logOnExit(boolean value, String id) {
- this.id = id;
- this.logOnExit = value;
+ public Builder<K1,K2,V> logOnExit(boolean value, String
idValue) {
+ id = idValue;
+ logOnExit = value;
return this;
}
@@ -237,12 +237,12 @@ public class Cache2<K1,K2,V> {
* <li>Monitoring cache efficiency in production
* </ul>
*
- * @param id The identifier to use in the log message.
+ * @param value The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,V> logOnExit(String id) {
- this.id = id;
- this.logOnExit = true;
+ public Builder<K1,K2,V> logOnExit(String value) {
+ id = value;
+ logOnExit = true;
return this;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache3.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache3.java
index d35b45c71b..2b9344c64d 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache3.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache3.java
@@ -138,24 +138,24 @@ public class Cache3<K1,K2,K3,V> {
* total cache hits, and total cache misses (size of cache) to
help analyze cache effectiveness.
*
* @param value Whether to enable logging on exit.
- * @param id The identifier to use in the log message.
+ * @param idValue The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,K3,V> logOnExit(boolean value, String id) {
- this.id = id;
- this.logOnExit = value;
+ public Builder<K1,K2,K3,V> logOnExit(boolean value, String
idValue) {
+ id = idValue;
+ logOnExit = value;
return this;
}
/**
* Enables logging of cache statistics when the JVM exits.
*
- * @param id The identifier to use in the log message.
+ * @param value The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,K3,V> logOnExit(String id) {
- this.id = id;
- this.logOnExit = true;
+ public Builder<K1,K2,K3,V> logOnExit(String value) {
+ id = value;
+ logOnExit = true;
return this;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache4.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache4.java
index 58539f82a1..1ada67f2a7 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache4.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache4.java
@@ -125,24 +125,24 @@ public class Cache4<K1,K2,K3,K4,V> {
* total cache hits, and total cache misses (size of cache) to
help analyze cache effectiveness.
*
* @param value Whether to enable logging on exit.
- * @param id The identifier to use in the log message.
+ * @param idValue The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,K3,K4,V> logOnExit(boolean value, String
id) {
- this.id = id;
- this.logOnExit = value;
+ public Builder<K1,K2,K3,K4,V> logOnExit(boolean value, String
idValue) {
+ id = idValue;
+ logOnExit = value;
return this;
}
/**
* Enables logging of cache statistics when the JVM exits.
*
- * @param id The identifier to use in the log message.
+ * @param value The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,K3,K4,V> logOnExit(String id) {
- this.id = id;
- this.logOnExit = true;
+ public Builder<K1,K2,K3,K4,V> logOnExit(String value) {
+ id = value;
+ logOnExit = true;
return this;
}
@@ -329,7 +329,7 @@ public class Cache4<K1,K2,K3,K4,V> {
* @param key4 Fourth key component. Can be <jk>null</jk>.
* @return The cached or computed value. May be <jk>null</jk> if the
supplier returns <jk>null</jk>.
* @throws NullPointerException if no default supplier was configured.
- *
+ *
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4) {
return get(key1, key2, key3, key4, () -> supplier.apply(key1,
key2, key3, key4));
@@ -344,7 +344,7 @@ public class Cache4<K1,K2,K3,K4,V> {
* @param key4 Fourth key component. Can be <jk>null</jk>.
* @param supplier The supplier to compute the value if it's not in the
cache. Must not be <jk>null</jk>.
* @return The cached or computed value. May be <jk>null</jk> if the
supplier returns <jk>null</jk>.
- *
+ *
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4,
java.util.function.Supplier<V> supplier) {
assertArgNotNull("supplier", supplier);
@@ -390,7 +390,7 @@ public class Cache4<K1,K2,K3,K4,V> {
* @param key4 The fourth key.
* @param value The value to associate with the four-part key.
* @return The previous value associated with the four-part key, or
<jk>null</jk> if there was no mapping.
- *
+ *
*/
public V put(K1 key1, K2 key2, K3 key3, K4 key4, V value) {
var m = getMap();
@@ -407,7 +407,7 @@ public class Cache4<K1,K2,K3,K4,V> {
* @param key3 The third key.
* @param key4 The fourth key.
* @return The previous value associated with the four-part key, or
<jk>null</jk> if there was no mapping.
- *
+ *
*/
public V remove(K1 key1, K2 key2, K3 key3, K4 key4) {
return getMap().remove(Tuple4.of(key1, key2, key3, key4));
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache5.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache5.java
index cc72519dc3..7980b088d4 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache5.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache5.java
@@ -128,24 +128,24 @@ public class Cache5<K1,K2,K3,K4,K5,V> {
* total cache hits, and total cache misses (size of cache) to
help analyze cache effectiveness.
*
* @param value Whether to enable logging on exit.
- * @param id The identifier to use in the log message.
+ * @param idValue The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,K3,K4,K5,V> logOnExit(boolean value,
String id) {
- this.id = id;
- this.logOnExit = value;
+ public Builder<K1,K2,K3,K4,K5,V> logOnExit(boolean value,
String idValue) {
+ id = idValue;
+ logOnExit = value;
return this;
}
/**
* Enables logging of cache statistics when the JVM exits.
*
- * @param id The identifier to use in the log message.
+ * @param value The identifier to use in the log message.
* @return This object for method chaining.
*/
- public Builder<K1,K2,K3,K4,K5,V> logOnExit(String id) {
- this.id = id;
- this.logOnExit = true;
+ public Builder<K1,K2,K3,K4,K5,V> logOnExit(String value) {
+ id = value;
+ logOnExit = true;
return this;
}
@@ -337,7 +337,7 @@ public class Cache5<K1,K2,K3,K4,K5,V> {
* @param key5 Fifth key component. Can be <jk>null</jk>.
* @return The cached or computed value. May be <jk>null</jk> if the
supplier returns <jk>null</jk>.
* @throws NullPointerException if no default supplier was configured.
- *
+ *
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5) {
return get(key1, key2, key3, key4, key5, () ->
supplier.apply(key1, key2, key3, key4, key5));
@@ -353,7 +353,7 @@ public class Cache5<K1,K2,K3,K4,K5,V> {
* @param key5 Fifth key component. Can be <jk>null</jk>.
* @param supplier The supplier to compute the value if it's not in the
cache. Must not be <jk>null</jk>.
* @return The cached or computed value. May be <jk>null</jk> if the
supplier returns <jk>null</jk>.
- *
+ *
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5,
java.util.function.Supplier<V> supplier) {
assertArgNotNull("supplier", supplier);
@@ -400,7 +400,7 @@ public class Cache5<K1,K2,K3,K4,K5,V> {
* @param key5 The fifth key.
* @param value The value to associate with the five-part key.
* @return The previous value associated with the five-part key, or
<jk>null</jk> if there was no mapping.
- *
+ *
*/
public V put(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5, V value) {
var m = getMap();
@@ -418,7 +418,7 @@ public class Cache5<K1,K2,K3,K4,K5,V> {
* @param key4 The fourth key.
* @param key5 The fifth key.
* @return The previous value associated with the five-part key, or
<jk>null</jk> if there was no mapping.
- *
+ *
*/
public V remove(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5) {
return getMap().remove(Tuple5.of(key1, key2, key3, key4, key5));
