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 344097ef3d Utility class modernization
344097ef3d is described below
commit 344097ef3dab441f8228c1647ae874473dfa8a77
Author: James Bognar <[email protected]>
AuthorDate: Thu Nov 6 14:28:16 2025 -0500
Utility class modernization
---
.../apache/juneau/common/reflect/ClassInfo.java | 27 ----------------------
.../java/org/apache/juneau/reflect/Mutaters.java | 2 +-
.../java/org/apache/juneau/swap/DefaultSwaps.java | 2 +-
.../juneau/rest/client/remote/RemoteMeta.java | 2 +-
.../juneau/common/reflect/ClassInfo_Test.java | 6 ++---
5 files changed, 6 insertions(+), 33 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 6d99deab23..27428067c7 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
@@ -515,33 +515,6 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
return l;
}
- /**
- * Returns all annotations of the specified type defined on the
specified class or parent classes/interfaces in parent-to-child order.
- *
- * @param <A> The annotation type to look for.
- * @param type The annotation type to look for.
- * @return The matching annotations.
- */
- public <A extends Annotation> List<A> getAnnotations(Class<A> type) {
- return getAnnotations(null, type);
- }
-
- /**
- * Returns the first matching parent class or interface.
- *
- * <p>
- * Results are classes-before-interfaces, then child-to-parent order.
- *
- * @param filter A predicate to apply to the entries to determine if
value should be used. Can be <jk>null</jk>.
- * @return The parent class or interface that matches the specified
predicate.
- */
- public ClassInfo getAnyParent(Predicate<ClassInfo> filter) {
- for (var ci : allParents.get())
- if (test(filter, ci))
- return ci;
- return null;
- }
-
/**
* Returns the {@link ClassLoader} for this class.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
index d4ceaebce8..06acc6d0e0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
@@ -205,7 +205,7 @@ public class Mutaters {
var ici = ClassInfo.of(ic);
var oci = ClassInfo.of(oc);
- ClassInfo pic = ici.getAnyParent(x -> nn(m.get(x.inner())));
+ ClassInfo pic = ici.getAllParents().stream().filter(x ->
nn(m.get(x.inner()))).findFirst().orElse(null);
if (nn(pic))
return m.get(pic.inner());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
index 12b64b60de..02d6afcaee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
@@ -72,7 +72,7 @@ public class DefaultSwaps {
* @return The matched swap, or <jk>null</jk> if it couldn't be found.
*/
public static ObjectSwap<?,?> find(ClassInfo ci) {
- var ci2 = ci.getAnyParent(x -> nn(SWAPS.get(x.inner())));
+ var ci2 = ci.getAllParents().stream().filter(x ->
nn(SWAPS.get(x.inner()))).findFirst().orElse(null);
return ci2 == null ? null : SWAPS.get(ci2.inner());
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index 600d83be7d..bef73de09c 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -62,7 +62,7 @@ public class RemoteMeta {
var path = "";
var ci = ClassInfo.of(c);
- var remotes = ci.getAnnotations(Remote.class);
+ var remotes =
rstream(ci.getAnnotationInfos(Remote.class).toList()).map(AnnotationInfo::inner).toList();
var versionHeader = "Client-Version";
var clientVersion = (String)null;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ClassInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ClassInfo_Test.java
index 91d995f108..11c3b88c7f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ClassInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ClassInfo_Test.java
@@ -572,9 +572,9 @@ public class ClassInfo_Test extends TestBase {
}
@Test void getAnnotations() {
- check("@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotations(A.class));
- check("@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g4.getAnnotations(A.class));
- check("@A(3)", g5.getAnnotations(A.class));
+ check("@A(2),@A(1),@A(5),@A(3),@A(6),@A(7)",
rstream(g3.getAnnotationInfos(A.class).toList()).map(AnnotationInfo::inner).toList());
+ check("@A(2),@A(1),@A(5),@A(3),@A(6),@A(7)",
rstream(g4.getAnnotationInfos(A.class).toList()).map(AnnotationInfo::inner).toList());
+ check("@A(3)",
rstream(g5.getAnnotationInfos(A.class).toList()).map(AnnotationInfo::inner).toList());
}
@Test void forEachAnnotation() {
