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 2b4c70967c org.apache.juneau.common.reflect API improvements
2b4c70967c is described below
commit 2b4c70967c38c6a28518238c5eabbb235755beb8
Author: James Bognar <[email protected]>
AuthorDate: Fri Nov 21 19:40:05 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../org/apache/juneau/common/annotation/AnnotationImpl.java | 2 +-
.../org/apache/juneau/common/collections/MapBuilder.java | 12 ++++++------
.../org/apache/juneau/common/collections/SetBuilder.java | 12 ++++++------
.../java/org/apache/juneau/common/io/FileWriterBuilder.java | 2 +-
.../java/org/apache/juneau/common/reflect/ClassInfo.java | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
index 17ba0bff56..26692ec2d4 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
@@ -100,7 +100,7 @@ public class AnnotationImpl implements Annotation {
* @return This annotation as a map of key/value pairs.
*/
public Map<String,Object> toMap() {
- Map<String,Object> m = new LinkedHashMap<>();
+ var m = new LinkedHashMap<String,Object>();
// @formatter:off
stream(annotationType().getDeclaredMethods())
.filter(x->x.getParameterCount() == 0 &&
x.getDeclaringClass().isAnnotation())
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MapBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MapBuilder.java
index 7cb6164d41..d527bbfce6 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MapBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MapBuilder.java
@@ -300,12 +300,12 @@ public class MapBuilder<K,V> {
if (map == null)
map = new LinkedHashMap<>();
}
- if (nn(map)) {
- if (nn(comparator)) {
- Map<K,V> m2 = new TreeMap<>(comparator);
- m2.putAll(map);
- map = m2;
- }
+ if (nn(map)) {
+ if (nn(comparator)) {
+ var m2 = new TreeMap<K,V>(comparator);
+ m2.putAll(map);
+ map = m2;
+ }
if (unmodifiable)
map = Collections.unmodifiableMap(map);
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SetBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SetBuilder.java
index b2a7b892a9..6734f583db 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SetBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SetBuilder.java
@@ -301,12 +301,12 @@ public class SetBuilder<E> {
if (set == null)
set = new LinkedHashSet<>(0);
}
- if (nn(set)) {
- if (nn(comparator)) {
- Set<E> s = new TreeSet<>(comparator);
- s.addAll(set);
- set = s;
- }
+ if (nn(set)) {
+ if (nn(comparator)) {
+ var s = new TreeSet<E>(comparator);
+ s.addAll(set);
+ set = s;
+ }
if (unmodifiable)
set = unmodifiableSet(set);
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
index c0302d1e67..dc32db77c0 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
@@ -86,7 +86,7 @@ public class FileWriterBuilder {
* @throws FileNotFoundException If file could not be found.
*/
public Writer build() throws FileNotFoundException {
- OutputStream os = new FileOutputStream(file, append);
+ var os = (OutputStream)new FileOutputStream(file, append);
if (buffered)
os = new BufferedOutputStream(os);
return new OutputStreamWriter(os, cs);
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 9fa6f7dfe4..4829937812 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
@@ -1027,7 +1027,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
if (gct instanceof ParameterizedType pt3)
return Array.newInstance((Class<?>)pt3.getRawType(),
0).getClass();
} else if (actualType instanceof TypeVariable<?> typeVariable) {
- List<Class<?>> nestedOuterTypes = new LinkedList<>();
+ var nestedOuterTypes = new LinkedList<Class<?>>();
for (Class<?> ec = cc.getEnclosingClass(); nn(ec); ec =
ec.getEnclosingClass()) {
Class<?> outerClass = cc.getClass();
nestedOuterTypes.add(outerClass);
