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 5e62aea825 Fix stale Javadoc examples in
EncoderSet/ObjectMerger/ObjectIntrospector (TODO-297 / READY-306)
5e62aea825 is described below
commit 5e62aea825fb585ddd7c003b78057d5c11f35910
Author: James Bognar <[email protected]>
AuthorDate: Sun Jul 26 13:50:49 2026 -0400
Fix stale Javadoc examples in EncoderSet/ObjectMerger/ObjectIntrospector
(TODO-297 / READY-306)
getEncoder()/getEncoderMatch() (was findMatch), merge() (was merger),
invokeMethod() (was invoke) + undefined-var fix; keeps source Javadoc
consistent with the corrected doc pages so docs-from-Javadoc sync
won't regress.
Co-authored-by: Cursor <[email protected]>
---
.../main/java/org/apache/juneau/marshall/encoders/EncoderSet.java | 7 ++-----
.../org/apache/juneau/marshall/objecttools/ObjectIntrospector.java | 4 ++--
.../java/org/apache/juneau/marshall/objecttools/ObjectMerger.java | 6 +++---
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/encoders/EncoderSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/encoders/EncoderSet.java
index 19a442d6a3..7f3dfab23e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/encoders/EncoderSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/encoders/EncoderSet.java
@@ -59,11 +59,8 @@ import org.apache.juneau.commons.reflect.*;
* .add(GzipEncoder.<jk>class</jk>)
* .build();
*
- * <jc>// Should return "gzip"</jc>
- * String <jv>matchedCoding</jv> =
<jv>encoders</jv>.findMatch(<js>"compress;q=1.0, gzip;q=0.8, identity;q=0.5,
*;q=0"</js>);
- *
- * <jc>// Get the encoder</jc>
- * Encoder <jv>encoder</jv> =
<jv>encoders</jv>.getEncoder(<jv>matchedCoding</jv>);
+ * <jc>// Get the encoder for "gzip"</jc>
+ * Encoder <jv>encoder</jv> =
<jv>encoders</jv>.getEncoder(<js>"compress;q=1.0, gzip;q=0.8, identity;q=0.5,
*;q=0"</js>);
* </p>
*
* <h5 class='section'>Notes:</h5><ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectIntrospector.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectIntrospector.java
index 4b4ebb3afa..a5920a36c1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectIntrospector.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectIntrospector.java
@@ -36,8 +36,8 @@ import org.apache.juneau.marshall.parser.*;
* <p class='bjava'>
* String <jv>string1</jv> = <js>"foobar"</js>;
* String <jv>string2</jv> = ObjectIntrospector
- * .create(<jv>string</jv>)
- * .invoke(String.<jk>class</jk>, <js>"substring(int,int)"</js>,
<js>"[3,6]"</js>); <jc>// "bar"</jc>
+ * .create(<jv>string1</jv>)
+ * .invokeMethod(String.<jk>class</jk>,
<js>"substring(int,int)"</js>, <js>"[3,6]"</js>); <jc>// "bar"</jc>
* </p>
* <p>
* The arguments passed to the identified method are POJOs serialized in
JSON format. Arbitrarily complex arguments can be passed
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectMerger.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectMerger.java
index ea9e74e438..6303cdd4ff 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectMerger.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/objecttools/ObjectMerger.java
@@ -58,13 +58,13 @@ import org.apache.juneau.commons.reflect.*;
* The getters will be called in order until the first non-null value is
returned...
*
* <p class='bjava'>
- * <jv>merge</jv> = ObjectMerger.<jsm>merger</jsm>(IA.<jk>class</jk>,
<jk>new</jk> A(<js>"1"</js>), <jk>new</jk> A(<js>"2"</js>));
+ * <jv>merge</jv> = ObjectMerger.<jsm>merge</jsm>(IA.<jk>class</jk>,
<jk>new</jk> A(<js>"1"</js>), <jk>new</jk> A(<js>"2"</js>));
* <jsm>assertEquals</jsm>(<js>"1"</js>, <jv>merge</jv>.getX());
*
- * <jv>merge</jv> = ObjectMerger.<jsm>merger</jsm>(IA.<jk>class</jk>,
<jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<js>"2"</js>));
+ * <jv>merge</jv> = ObjectMerger.<jsm>merge</jsm>(IA.<jk>class</jk>,
<jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<js>"2"</js>));
* <jsm>assertEquals</jsm>(<js>"2"</js>, <jv>merge</jv>.getX());
*
- * <jv>merge</jv> = ObjectMerger.<jsm>merger</jsm>(IA.<jk>class</jk>,
<jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<jk>null</jk>));
+ * <jv>merge</jv> = ObjectMerger.<jsm>merge</jsm>(IA.<jk>class</jk>,
<jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<jk>null</jk>));
* <jsm>assertEquals</jsm>(<jk>null</jk>, <jv>merge</jv>.getX());
* </p>
*
