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 71359bbb90 Utility class modernization
71359bbb90 is described below
commit 71359bbb904c58e51d41ba6b0c32dcba16720c92
Author: James Bognar <[email protected]>
AuthorDate: Fri Nov 7 12:52:37 2025 -0500
Utility class modernization
---
.../juneau/common/reflect/ParameterInfo.java | 24 +++++++++++-----------
.../main/java/org/apache/juneau/cp/BeanStore.java | 6 +++---
.../org/apache/juneau/rest/arg/DefaultArg.java | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ParameterInfo.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ParameterInfo.java
index 6e7d05c816..c695eb2f13 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ParameterInfo.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ParameterInfo.java
@@ -63,8 +63,8 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
private final Supplier<List<AnnotationInfo<Annotation>>>
declaredAnnotations; // All annotations declared directly on this parameter.
private final Supplier<List<ParameterInfo>> matchingParameters; //
Matching parameters in parent methods.
- private final ResettableSupplier<String> foundName =
memoizeResettable(this::findNameInternal);
- private final ResettableSupplier<String> foundQualifier =
memoizeResettable(this::findQualifierInternal);
+ private final ResettableSupplier<String> resolvedName =
memoizeResettable(this::findNameInternal); // Resolved name from @Name
annotation or bytecode.
+ private final ResettableSupplier<String> resolvedQualifier =
memoizeResettable(this::findQualifierInternal); // Resolved qualifier from
@Named annotation.
/**
* Constructor.
@@ -336,15 +336,15 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
* This method is used for mapping constructor parameters to bean
properties.
*
* <p>
- * <b>Note:</b> This is different from {@link #findQualifier()} which
looks for {@link org.apache.juneau.annotation.Named @Named}
+ * <b>Note:</b> This is different from {@link #getResolvedQualifier()}
which looks for {@link org.apache.juneau.annotation.Named @Named}
* annotations for bean injection purposes.
*
* @return The parameter name if found, or <jk>null</jk> if not
available.
- * @see #findQualifier()
+ * @see #getResolvedQualifier()
* @see #getName()
*/
- public String findName() {
- return foundName.get();
+ public String getResolvedName() {
+ return resolvedName.get();
}
static void reset() {
@@ -384,14 +384,14 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
* This method is used by the {@link org.apache.juneau.cp.BeanStore}
for bean injection.
*
* <p>
- * <b>Note:</b> This is different from {@link #findName()} which looks
for {@link org.apache.juneau.annotation.Name @Name}
+ * <b>Note:</b> This is different from {@link #getResolvedName()} which
looks for {@link org.apache.juneau.annotation.Name @Name}
* annotations for bean property mapping.
*
* @return The bean qualifier name if {@code @Named} annotation is
found, or <jk>null</jk> if not annotated.
- * @see #findName()
+ * @see #getResolvedName()
*/
- public String findQualifier() {
- return foundQualifier.get();
+ public String getResolvedQualifier() {
+ return resolvedQualifier.get();
}
private String findQualifierInternal() {
@@ -424,7 +424,7 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
* @see Parameter#getName()
*/
public String getName() {
- String name = findName();
+ String name = getResolvedName();
return name != null ? name : inner.getName();
}
@@ -457,7 +457,7 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
* @return <jk>true</jk> if the parameter has a name.
*/
public boolean hasName() {
- return findName() != null;
+ return getResolvedName() != null;
}
/**
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 475a12b022..e3b6da6ef2 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
@@ -511,7 +511,7 @@ public class BeanStore {
continue loop;
if (pt.is(Optional.class) || pt.is(BeanStore.class))
continue loop;
- String beanName = pi.findQualifier(); // Use @Named
for bean injection
+ String beanName = pi.getResolvedQualifier(); // Use
@Named for bean injection
Class<?> ptc = pt.inner();
if (beanName == null && ! hasBean(ptc))
l.add(pt.getNameSimple());
@@ -537,7 +537,7 @@ public class BeanStore {
} else if (pt.is(BeanStore.class)) {
o[i] = this;
} else {
- String beanQualifier = pi.findQualifier();
+ String beanQualifier =
pi.getResolvedQualifier();
Class<?> ptc =
pt.unwrap(Optional.class).inner();
Optional<?> o2 = beanQualifier == null ?
getBean(ptc) : getBean(ptc, beanQualifier);
o[i] = pt.is(Optional.class) ? o2 :
o2.orElse(null);
@@ -560,7 +560,7 @@ public class BeanStore {
continue loop;
if (pt.is(Optional.class) || pt.is(BeanStore.class))
continue loop;
- String beanQualifier = pi.findQualifier();
+ String beanQualifier = pi.getResolvedQualifier();
Class<?> ptc = pt.inner();
if ((beanQualifier == null && ! hasBean(ptc)) ||
(nn(beanQualifier) && ! hasBean(ptc, beanQualifier)))
return false;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/DefaultArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/DefaultArg.java
index c3449a8cb9..2ec868220d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/DefaultArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/DefaultArg.java
@@ -66,7 +66,7 @@ public class DefaultArg implements RestOpArg {
protected DefaultArg(ParameterInfo paramInfo) {
this.type = paramInfo.getParameterType().inner();
this.paramInfo = paramInfo;
- this.qualifier = paramInfo.findQualifier();
+ this.qualifier = paramInfo.getResolvedQualifier();
}
@Override /* Overridden from RestOpArg */
