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 0bb9c85f66 Utility class modernization
0bb9c85f66 is described below
commit 0bb9c85f66afed554b87f68b4dd4d8925c8ba1d3
Author: James Bognar <[email protected]>
AuthorDate: Thu Nov 6 19:35:34 2025 -0500
Utility class modernization
---
.../org/apache/juneau/common/reflect/ClassInfo.java | 10 +++++-----
.../src/main/java/org/apache/juneau/BeanMeta.java | 8 ++++----
.../java/org/apache/juneau/BeanPropertyMeta.java | 20 ++++++++++----------
.../src/main/java/org/apache/juneau/Context.java | 18 +++++++++---------
.../org/apache/juneau/html/HtmlBeanPropertyMeta.java | 6 +++---
5 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ClassInfo.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ClassInfo.java
index 7d0bdad6dc..487f559316 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ClassInfo.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ClassInfo.java
@@ -426,10 +426,10 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
consumeIf(filter, action, t2);
var interfaces2 = interfaces.get();
for (int i = interfaces2.size() - 1; i >= 0; i--)
- annotationProvider.forEachDeclaredAnnotation(type,
interfaces2.get(i).inner(), filter, action);
+
annotationProvider.getAnnotationProvider().findDeclaredParentFirst(type,
interfaces2.get(i).inner()).map(x -> x.inner()).filter(x -> filter == null ||
filter.test(x)).forEach(x -> action.accept(x));
var parents2 = parents.get();
for (int i = parents2.size() - 1; i >= 0; i--)
- annotationProvider.forEachDeclaredAnnotation(type,
parents2.get(i).inner(), filter, action);
+
annotationProvider.getAnnotationProvider().findDeclaredParentFirst(type,
parents2.get(i).inner()).map(x -> x.inner()).filter(x -> filter == null ||
filter.test(x)).forEach(x -> action.accept(x));
return this;
}
@@ -2177,18 +2177,18 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
if (annotationProvider == null)
throw unsupportedOp();
A x = null;
- x = annotationProvider.lastAnnotation(type, inner(), filter);
+ x = annotationProvider.getAnnotationProvider().find(type,
inner()).map(y -> y.inner()).filter(y ->
filter.test(y)).findFirst().orElse(null);
if (nn(x) && test(filter, x))
return x;
var parents2 = parents.get();
for (var parent : parents2) {
- x = annotationProvider.lastAnnotation(type,
parent.inner(), filter);
+ x =
annotationProvider.getAnnotationProvider().find(type, parent.inner()).map(y ->
y.inner()).filter(y -> filter.test(y)).findFirst().orElse(null);
if (nn(x))
return x;
}
var interfaces2 = interfaces.get();
for (var element : interfaces2) {
- x = annotationProvider.lastAnnotation(type,
element.inner(), filter);
+ x =
annotationProvider.getAnnotationProvider().find(type, element.inner()).map(y ->
y.inner()).filter(y -> filter.test(y)).findFirst().orElse(null);
if (nn(x))
return x;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 07ce20942d..8173b42b69 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -603,8 +603,8 @@ public class BeanMeta<T> {
List<Beanp> lp = list();
List<Name> ln = list();
- ctx.forEachAnnotation(Beanp.class, m.inner(), x
-> true, x -> lp.add(x));
- ctx.forEachAnnotation(Name.class, m.inner(), x
-> true, x -> ln.add(x));
+ ctx.getAnnotationProvider().find(Beanp.class,
m.inner()).map(x -> x.inner()).filter(x -> true).forEach(x -> lp.add(x));
+ ctx.getAnnotationProvider().find(Name.class,
m.inner()).map(x -> x.inner()).filter(x -> true).forEach(x -> ln.add(x));
// If this method doesn't have @Beanp or @Name,
check if it overrides a parent method that does
// This ensures property names are inherited
correctly, preventing duplicate property definitions
@@ -819,8 +819,8 @@ public class BeanMeta<T> {
if (paramsMatch) {
// Found a matching parent
method - check for @Beanp and @Name annotations
-
ctx.forEachAnnotation(Beanp.class, parentMethod.inner(), x -> true, x ->
lp.add(x));
-
ctx.forEachAnnotation(Name.class, parentMethod.inner(), x -> true, x ->
ln.add(x));
+
ctx.getAnnotationProvider().find(Beanp.class, parentMethod.inner()).map(x ->
x.inner()).filter(x -> true).forEach(x -> lp.add(x));
+
ctx.getAnnotationProvider().find(Name.class, parentMethod.inner()).map(x ->
x.inner()).filter(x -> true).forEach(x -> ln.add(x));
// If we found annotations,
we're done
if (! lp.isEmpty() || !
ln.isEmpty())
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 625fbcc743..ef64114136 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
@@ -246,7 +246,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (nn(getter)) {
List<Beanp> lp = list();
- bc.forEachAnnotation(Beanp.class, getter, x ->
true, x -> lp.add(x));
+ bc.getAnnotationProvider().find(Beanp.class,
getter).map(x -> x.inner()).filter(x -> true).forEach(x -> lp.add(x));
if (rawTypeMeta == null)
rawTypeMeta =
bc.resolveClassMeta(last(lp), getter.getGenericReturnType(), typeVarImpls);
isUri |= (rawTypeMeta.isUri() ||
bc.hasAnnotation(Uri.class, getter));
@@ -261,12 +261,12 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (! x.wo().isEmpty())
writeOnly =
Boolean.valueOf(x.wo());
});
- bc.forEachAnnotation(Swap.class, getter, x ->
true, x -> swap = getPropertySwap(x));
+ bc.getAnnotationProvider().find(Swap.class,
getter).map(x -> x.inner()).filter(x -> true).forEach(x -> swap =
getPropertySwap(x));
}
if (nn(setter)) {
List<Beanp> lp = list();
- bc.forEachAnnotation(Beanp.class, setter, x ->
true, x -> lp.add(x));
+ bc.getAnnotationProvider().find(Beanp.class,
setter).map(x -> x.inner()).filter(x -> true).forEach(x -> lp.add(x));
if (rawTypeMeta == null)
rawTypeMeta =
bc.resolveClassMeta(last(lp), setter.getGenericParameterTypes()[0],
typeVarImpls);
isUri |= (rawTypeMeta.isUri() ||
bc.hasAnnotation(Uri.class, setter));
@@ -281,7 +281,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (! x.wo().isEmpty())
writeOnly =
Boolean.valueOf(x.wo());
});
- bc.forEachAnnotation(Swap.class, setter, x ->
true, x -> swap = getPropertySwap(x));
+ bc.getAnnotationProvider().find(Swap.class,
setter).map(x -> x.inner()).filter(x -> true).forEach(x -> swap =
getPropertySwap(x));
}
if (rawTypeMeta == null)
@@ -687,25 +687,25 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (nn(getter)) {
// Walk up the inheritance hierarchy for the getter
method
forEachParentMethod(getter, parentGetter -> {
- bc.forEachAnnotation(a, parentGetter, x ->
true, x -> l.add(x));
+ bc.getAnnotationProvider().find(a,
parentGetter).map(x -> x.inner()).filter(x -> true).forEach(x -> l.add(x));
});
- bc.forEachAnnotation(a, getter, x -> true, x ->
l.add(x));
+ bc.getAnnotationProvider().find(a, getter).map(x ->
x.inner()).filter(x -> true).forEach(x -> l.add(x));
ClassInfo.of(getter.getReturnType()).forEachAnnotation(bc, a, x -> true, x ->
l.add(x));
}
if (nn(setter)) {
// Walk up the inheritance hierarchy for the setter
method
forEachParentMethod(setter, parentSetter -> {
- bc.forEachAnnotation(a, parentSetter, x ->
true, x -> l.add(x));
+ bc.getAnnotationProvider().find(a,
parentSetter).map(x -> x.inner()).filter(x -> true).forEach(x -> l.add(x));
});
- bc.forEachAnnotation(a, setter, x -> true, x ->
l.add(x));
+ bc.getAnnotationProvider().find(a, setter).map(x ->
x.inner()).filter(x -> true).forEach(x -> l.add(x));
ClassInfo.of(setter.getReturnType()).forEachAnnotation(bc, a, x -> true, x ->
l.add(x));
}
if (nn(extraKeys)) {
// Walk up the inheritance hierarchy for the extraKeys
method
forEachParentMethod(extraKeys, parentExtraKeys -> {
- bc.forEachAnnotation(a, parentExtraKeys, x ->
true, x -> l.add(x));
+ bc.getAnnotationProvider().find(a,
parentExtraKeys).map(x -> x.inner()).filter(x -> true).forEach(x -> l.add(x));
});
- bc.forEachAnnotation(a, extraKeys, x -> true, x ->
l.add(x));
+ bc.getAnnotationProvider().find(a, extraKeys).map(x ->
x.inner()).filter(x -> true).forEach(x -> l.add(x));
ClassInfo.of(extraKeys.getReturnType()).forEachAnnotation(bc, a, x -> true, x
-> l.add(x));
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index e35c872bc1..b77b74182d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -844,22 +844,22 @@ public abstract class Context implements
AnnotationProvider {
@Override /* Overridden from MetaProvider */
public <A extends Annotation> void forEachAnnotation(Class<A> type,
Constructor<?> onConstructor, Predicate<A> filter, Consumer<A> action) {
- getAnnotationProvider().find(type, onConstructor).map(x ->
x.inner()).filter(x -> filter.test(x)).forEach(x -> action.accept(x));
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> void forEachAnnotation(Class<A> type,
Field onField, Predicate<A> filter, Consumer<A> action) {
- getAnnotationProvider().find(type, onField).map(x ->
x.inner()).filter(x -> filter.test(x)).forEach(x -> action.accept(x));
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> void forEachAnnotation(Class<A> type,
Method onMethod, Predicate<A> filter, Consumer<A> action) {
- getAnnotationProvider().find(type, onMethod).map(x ->
x.inner()).filter(x -> filter.test(x)).forEach(x -> action.accept(x));
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> void forEachDeclaredAnnotation(Class<A>
type, Class<?> onClass, Predicate<A> filter, Consumer<A> action) {
- getAnnotationProvider().findDeclaredParentFirst(type,
onClass).map(x -> x.inner()).filter(x -> filter == null ||
filter.test(x)).forEach(x -> action.accept(x));
+ throw unsupportedOp();
}
/**
@@ -931,27 +931,27 @@ public abstract class Context implements
AnnotationProvider {
@Override /* Overridden from MetaProvider */
public <A extends Annotation> A lastAnnotation(Class<A> type, Class<?>
onClass, Predicate<A> filter) {
- return getAnnotationProvider().find(type, onClass).map(x ->
x.inner()).filter(x -> filter.test(x)).findFirst().orElse(null);
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> A lastAnnotation(Class<A> type,
Constructor<?> onConstructor, Predicate<A> filter) {
- return getAnnotationProvider().find(type, onConstructor).map(x
-> x.inner()).filter(x -> filter.test(x)).findFirst().orElse(null);
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> A lastAnnotation(Class<A> type, Field
onField, Predicate<A> filter) {
- return getAnnotationProvider().find(type, onField).map(x ->
x.inner()).filter(x -> filter.test(x)).findFirst().orElse(null);
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> A lastAnnotation(Class<A> type, Method
onMethod, Predicate<A> filter) {
- return getAnnotationProvider().find(type, onMethod).map(x ->
x.inner()).filter(x -> filter.test(x)).findFirst().orElse(null);
+ throw unsupportedOp();
}
@Override /* Overridden from MetaProvider */
public <A extends Annotation> A lastDeclaredAnnotation(Class<A> type,
Class<?> onClass, Predicate<A> filter) {
- return getAnnotationProvider().findDeclared(type,
onClass).map(x -> x.inner()).filter(x ->
filter.test(x)).findFirst().orElse(null);
+ throw unsupportedOp();
}
@Override /* Overridden from Object */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
index 0f5249ef63..11994e8b80 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
@@ -80,11 +80,11 @@ public class HtmlBeanPropertyMeta extends
ExtendedBeanPropertyMeta {
Builder b = new Builder();
if (nn(bpm.getInnerField()))
- mp.forEachAnnotation(Html.class, bpm.getInnerField(), x
-> true, x -> b.findHtmlInfo(x));
+ mp.getAnnotationProvider().find(Html.class,
bpm.getInnerField()).map(x -> x.inner()).filter(x -> true).forEach(x ->
b.findHtmlInfo(x));
if (nn(bpm.getGetter()))
- mp.forEachAnnotation(Html.class, bpm.getGetter(), x ->
true, x -> b.findHtmlInfo(x));
+ mp.getAnnotationProvider().find(Html.class,
bpm.getGetter()).map(x -> x.inner()).filter(x -> true).forEach(x ->
b.findHtmlInfo(x));
if (nn(bpm.getSetter()))
- mp.forEachAnnotation(Html.class, bpm.getSetter(), x ->
true, x -> b.findHtmlInfo(x));
+ mp.getAnnotationProvider().find(Html.class,
bpm.getSetter()).map(x -> x.inner()).filter(x -> true).forEach(x ->
b.findHtmlInfo(x));
this.format = b.format;
this.noTables = b.noTables;
