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 63fb259029 org.apache.juneau.common.reflect API improvements
63fb259029 is described below
commit 63fb2590298447d886b74528a950192428882a83
Author: James Bognar <[email protected]>
AuthorDate: Mon Nov 24 06:57:19 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../apache/juneau/common/collections/ListBuilder.java | 2 +-
.../org/apache/juneau/common/collections/MultiSet.java | 2 +-
.../apache/juneau/common/collections/SetBuilder.java | 2 +-
.../apache/juneau/common/io/CharSequenceReader.java | 2 +-
.../org/apache/juneau/common/reflect/ClassInfo.java | 14 +++++++-------
.../apache/juneau/common/reflect/ConstructorInfo.java | 2 +-
.../apache/juneau/common/reflect/ExecutableInfo.java | 4 ++--
.../org/apache/juneau/common/reflect/MethodInfo.java | 4 ++--
.../apache/juneau/common/utils/AnnotationUtils.java | 2 +-
.../org/apache/juneau/common/utils/AssertionUtils.java | 2 +-
.../apache/juneau/common/utils/CollectionUtils.java | 16 ++++++++--------
.../java/org/apache/juneau/common/utils/DateUtils.java | 2 +-
.../apache/juneau/common/utils/MimeTypeDetector.java | 2 +-
.../java/org/apache/juneau/common/utils/Utils.java | 2 +-
.../java/org/apache/juneau/common/utils/Version.java | 6 +++---
.../src/main/java/org/apache/juneau/config/Config.java | 2 +-
.../java/org/apache/juneau/AnnotationWorkList.java | 2 +-
.../src/main/java/org/apache/juneau/BeanContext.java | 4 ++--
.../main/java/org/apache/juneau/BeanDictionaryMap.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 4 ++--
.../main/java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../src/main/java/org/apache/juneau/BeanRegistry.java | 2 +-
.../java/org/apache/juneau/BeanTraverseSession.java | 2 +-
.../src/main/java/org/apache/juneau/UriResolver.java | 2 +-
.../java/org/apache/juneau/collections/JsonList.java | 2 +-
.../src/main/java/org/apache/juneau/cp/Messages.java | 2 +-
.../src/main/java/org/apache/juneau/csv/CsvWriter.java | 2 +-
.../java/org/apache/juneau/html/HtmlParserSession.java | 6 +++---
.../main/java/org/apache/juneau/html/HtmlWriter.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 4 ++--
.../java/org/apache/juneau/internal/ClassUtils2.java | 2 +-
.../main/java/org/apache/juneau/json/JsonWriter.java | 6 +++---
.../apache/juneau/msgpack/MsgPackParserSession.java | 18 +++++++++---------
.../org/apache/juneau/oapi/OpenApiParserSession.java | 2 +-
.../apache/juneau/oapi/OpenApiSerializerSession.java | 4 ++--
.../org/apache/juneau/objecttools/ObjectSearcher.java | 8 ++++----
.../org/apache/juneau/objecttools/ObjectSorter.java | 2 +-
.../org/apache/juneau/objecttools/ObjectViewer.java | 2 +-
.../juneau/objecttools/StringMatcherFactory.java | 2 +-
.../src/main/java/org/apache/juneau/parser/Parser.java | 2 +-
.../java/org/apache/juneau/parser/ParserReader.java | 6 +++---
.../apache/juneau/serializer/SerializerSession.java | 2 +-
.../org/apache/juneau/serializer/SerializerWriter.java | 4 ++--
.../src/main/java/org/apache/juneau/svl/Var.java | 2 +-
.../java/org/apache/juneau/svl/VarResolverSession.java | 2 +-
.../java/org/apache/juneau/svl/vars/SwitchVar.java | 2 +-
.../java/org/apache/juneau/swaps/MatchResultSwap.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonReader.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonWriter.java | 2 +-
.../urlencoding/UrlEncodingSerializerSession.java | 6 +++---
.../src/main/java/org/apache/juneau/utils/HashKey.java | 2 +-
.../apache/juneau/utils/StringExpressionMatcher.java | 2 +-
.../java/org/apache/juneau/xml/XmlParserSession.java | 6 +++---
.../src/main/java/org/apache/juneau/xml/XmlUtils.java | 10 +++++-----
.../org/apache/juneau/examples/rest/TestUtils.java | 4 ++--
.../microservice/resources/LogEntryFormatter.java | 2 +-
.../apache/juneau/rest/client/RestCallException.java | 4 ++--
.../java/org/apache/juneau/rest/client/RestClient.java | 2 +-
.../org/apache/juneau/http/entity/StringEntity.java | 2 +-
.../java/org/apache/juneau/http/header/HeaderList.java | 4 ++--
.../java/org/apache/juneau/http/part/PartList.java | 4 ++--
.../juneau/http/remote/RrpcInterfaceMethodMeta.java | 2 +-
.../org/apache/juneau/rest/mock/MockPathResolver.java | 2 +-
.../main/java/org/apache/juneau/rest/RestContext.java | 4 ++--
.../java/org/apache/juneau/rest/RestOpContext.java | 2 +-
.../java/org/apache/juneau/rest/RestOpInvoker.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/PathArg.java | 2 +-
.../java/org/apache/juneau/rest/guard/RoleMatcher.java | 2 +-
.../apache/juneau/rest/httppart/RequestHeaders.java | 2 +-
.../apache/juneau/rest/httppart/RequestPathParams.java | 2 +-
.../juneau/rest/httppart/RequestQueryParams.java | 2 +-
.../org/apache/juneau/rest/remote/RrpcServlet.java | 2 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 4 ++--
.../main/java/org/apache/juneau/rest/util/UrlPath.java | 2 +-
.../org/apache/juneau/rest/util/UrlPathMatcher.java | 6 +++---
.../test/java/org/apache/juneau/BenchmarkRunner.java | 2 +-
.../test/java/org/apache/juneau/ParserReader_Test.java | 2 +-
.../juneau/a/rttests/RoundTripLargeObjects_Test.java | 4 ++--
.../juneau/common/collections/ByteValue_Test.java | 4 ++--
.../apache/juneau/common/collections/Cache_Test.java | 6 +++---
.../juneau/common/collections/CharValue_Test.java | 2 +-
.../juneau/common/collections/DoubleValue_Test.java | 2 +-
.../juneau/common/collections/IntegerValue_Test.java | 2 +-
.../juneau/common/collections/ReversedList_Test.java | 2 +-
.../apache/juneau/common/reflect/ClassInfo_Test.java | 10 +++++-----
.../juneau/common/reflect/ThrowingSupplier_Test.java | 4 ++--
.../juneau/common/utils/ThrowableUtils_Test.java | 2 +-
.../java/org/apache/juneau/html/BasicHtml_Test.java | 2 +-
.../apache/juneau/junit/bct/AssertionArgs_Test.java | 2 +-
.../juneau/junit/bct/BasicBeanConverter_Test.java | 2 +-
.../apache/juneau/junit/bct/BeanConverter_Test.java | 2 +-
.../org/apache/juneau/junit/bct/Listifier_Test.java | 6 +++---
.../apache/juneau/junit/bct/NestedTokenizer_Test.java | 6 +++---
.../org/apache/juneau/junit/bct/Stringifier_Test.java | 6 +++---
.../java/org/apache/juneau/junit/bct/Swapper_Test.java | 4 ++--
95 files changed, 166 insertions(+), 166 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ListBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ListBuilder.java
index b2fa69bf86..450f51dc67 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ListBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ListBuilder.java
@@ -244,7 +244,7 @@ public class ListBuilder<E> {
if (o instanceof Collection<?> o2) {
o2.forEach(x -> addAny(x));
} else if (isArray(o)) {
- for (int i = 0; i <
Array.getLength(o); i++)
+ for (var i = 0; i <
Array.getLength(o); i++)
addAny(Array.get(o, i));
} else if (elementType.isInstance(o)) {
add(elementType.cast(o));
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
index e739d7d0c2..20b363c6ce 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
@@ -211,7 +211,7 @@ public class MultiSet<E> extends AbstractSet<E> {
return false;
if (i2.hasNext())
return true;
- for (int j = i; j < l.length; j++)
+ for (var j = i; j < l.length; j++)
if (l[j].size() > 0)
return true;
return false;
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 3c4ce7fe90..a94108dd8e 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
@@ -218,7 +218,7 @@ public class SetBuilder<E> {
if (o instanceof Collection<?> o2) {
o2.forEach(x -> addAny(x));
} else if (isArray(o)) {
- for (int i = 0; i <
Array.getLength(o); i++)
+ for (var i = 0; i <
Array.getLength(o); i++)
addAny(Array.get(o, i));
} else if (elementType.isInstance(o)) {
add(elementType.cast(o));
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
index 5b4f6aa7b9..e989de5185 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
@@ -84,7 +84,7 @@ public class CharSequenceReader extends BufferedReader {
else if (nn(sb2))
sb2.getChars(next, next + n, cbuf, off);
else {
- for (int i = 0; i < n; i++)
+ for (var i = 0; i < n; i++)
cbuf[off + i] = cs.charAt(next + i);
}
next += n;
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 01cb9dc7a4..fa4f8ad2bc 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
@@ -1292,10 +1292,10 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
componentType.appendNameFormatted(sb, nameFormat,
includeTypeParams, separator, arrayFormat);
if (arrayFormat == ClassArrayFormat.WORD) {
- for (int i = 0; i < dim; i++)
+ for (var i = 0; i < dim; i++)
sb.append("Array");
} else if (arrayFormat == ClassArrayFormat.BRACKETS) {
- for (int i = 0; i < dim; i++)
+ for (var i = 0; i < dim; i++)
sb.append("[]");
}
// JVM format is already in getName() - would need
special handling
@@ -1318,7 +1318,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
sb.append(ct.getName());
// Apply separator if not '$'
if (separator != '$' && sb.indexOf("$")
!= -1) {
- for (int i = 0; i <
sb.length(); i++) {
+ for (var i = 0; i <
sb.length(); i++) {
if (sb.charAt(i) == '$')
sb.setCharAt(i,
separator);
}
@@ -2380,13 +2380,13 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
// Process all parent classes (includes this class)
var parents = getParents();
- for (int i = 0; i < parents.size(); i++) {
+ for (var i = 0; i < parents.size(); i++) {
var parent = parents.get(i);
set.add(parent);
// Process interfaces declared on this parent (and
their parent interfaces)
var declaredInterfaces = parent.getDeclaredInterfaces();
- for (int j = 0; j < declaredInterfaces.size(); j++)
+ for (var j = 0; j < declaredInterfaces.size(); j++)
addInterfaceHierarchy(set,
declaredInterfaces.get(j));
}
@@ -2405,7 +2405,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
// Process parent interfaces recursively
var parentInterfaces = iface.getDeclaredInterfaces();
- for (int i = 0; i < parentInterfaces.size(); i++)
+ for (var i = 0; i < parentInterfaces.size(); i++)
addInterfaceHierarchy(set, parentInterfaces.get(i));
}
@@ -2431,7 +2431,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable {
// On all parent classes and interfaces (properly traversed to
avoid duplicates)
var parentsAndInterfaces = getParentsAndInterfaces();
- for (int i = 0; i < parentsAndInterfaces.size(); i++) {
+ for (var i = 0; i < parentsAndInterfaces.size(); i++) {
var ci = parentsAndInterfaces.get(i);
// Add declared annotations from this class/interface
for (var a : ci.inner().getDeclaredAnnotations())
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ConstructorInfo.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ConstructorInfo.java
index 1a40a89f08..8878be8318 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ConstructorInfo.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ConstructorInfo.java
@@ -77,7 +77,7 @@ public class ConstructorInfo extends ExecutableInfo
implements Comparable<Constr
if (i == 0) {
var params = getParameters();
var oParams = o.getParameters();
- for (int j = 0; j < params.size() && i == 0;
j++) {
+ for (var j = 0; j < params.size() && i == 0;
j++) {
i =
params.get(j).getParameterType().getName().compareTo(oParams.get(j).getParameterType().getName());
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ExecutableInfo.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ExecutableInfo.java
index 47ceb6b483..476b3568ef 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ExecutableInfo.java
@@ -322,7 +322,7 @@ public abstract class ExecutableInfo extends AccessibleInfo
{
Class<?>[] pt = inner.getParameterTypes();
if (pt.length != args.length)
return false;
- for (int i = 0; i < pt.length; i++)
+ for (var i = 0; i < pt.length; i++)
if (! pt[i].isInstance(args[i]))
return false;
return true;
@@ -725,7 +725,7 @@ public abstract class ExecutableInfo extends AccessibleInfo
{
if (ptt.length + 1 == ptc.length) {
var ptt2 = new Type[ptc.length];
ptt2[0] = ptc[0];
- for (int i = 0; i < ptt.length; i++)
+ for (var i = 0; i < ptt.length; i++)
ptt2[i + 1] = ptt[i];
genericTypes = ptt2;
} else {
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/MethodInfo.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/MethodInfo.java
index 69c8fafabf..3c554ac76d 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/MethodInfo.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/MethodInfo.java
@@ -263,7 +263,7 @@ public class MethodInfo extends ExecutableInfo implements
Comparable<MethodInfo>
var oParams = o.getParameters();
i = params.size() - oParams.size();
if (i == 0) {
- for (int j = 0; j < params.size() && i == 0;
j++) {
+ for (var j = 0; j < params.size() && i == 0;
j++) {
i =
params.get(j).getParameterType().getName().compareTo(oParams.get(j).getParameterType().getName());
}
}
@@ -315,7 +315,7 @@ public class MethodInfo extends ExecutableInfo implements
Comparable<MethodInfo>
var params = getParameters();
if (params.size() > 0) {
sb.append('(');
- for (int i = 0; i < params.size(); i++) {
+ for (var i = 0; i < params.size(); i++) {
if (i > 0)
sb.append(',');
params.get(i).getParameterType().appendNameFormatted(sb, ClassNameFormat.FULL,
true, '$', ClassArrayFormat.BRACKETS);
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AnnotationUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AnnotationUtils.java
index 0585eeb514..10b609a015 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AnnotationUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AnnotationUtils.java
@@ -73,7 +73,7 @@ public class AnnotationUtils {
private static boolean annotationArrayMemberEquals(Annotation[] a1,
Annotation[] a2) {
if (a1.length != a2.length)
return false;
- for (int i = 0; i < a1.length; i++)
+ for (var i = 0; i < a1.length; i++)
if (ne(a1[i], a2[i]))
return false;
return true;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AssertionUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AssertionUtils.java
index b0c701216f..d0b8fa5082 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AssertionUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/AssertionUtils.java
@@ -242,7 +242,7 @@ public class AssertionUtils {
@SuppressWarnings("null")
public static final <T> T[] assertVarargsNotNull(String name, T[] o)
throws IllegalArgumentException {
assertArg(o != null, "Argument ''{0}'' cannot be null.", name);
- for (int i = 0; i < o.length; i++)
+ for (var i = 0; i < o.length; i++)
assertArg(nn(o[i]), "Argument ''{0}'' parameter {1}
cannot be null.", name, i);
return o;
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
index 81b42f5207..3a3a1cda72 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
@@ -340,7 +340,7 @@ public class CollectionUtils {
* @param action The action to perform.
*/
public static <E> void forEachReverse(E[] value, Consumer<E> action) {
- for (int i = value.length - 1; i >= 0; i--)
+ for (var i = value.length - 1; i >= 0; i--)
action.accept(value[i]);
}
@@ -353,7 +353,7 @@ public class CollectionUtils {
*/
public static <E> void forEachReverse(List<E> value, Consumer<E>
action) {
if (value instanceof ArrayList) {
- for (int i = value.size() - 1; i >= 0; i--)
+ for (var i = value.size() - 1; i >= 0; i--)
action.accept(value.get(i));
} else {
ListIterator<E> i = value.listIterator(value.size());
@@ -1270,9 +1270,9 @@ public class CollectionUtils {
if (newElements.length == 0)
return array;
var a =
(T[])Array.newInstance(array.getClass().getComponentType(), array.length +
newElements.length);
- for (int i = 0; i < array.length; i++)
+ for (var i = 0; i < array.length; i++)
a[i] = array[i];
- for (int i = 0; i < newElements.length; i++)
+ for (var i = 0; i < newElements.length; i++)
a[i + array.length] = newElements[i];
return a;
}
@@ -1364,7 +1364,7 @@ public class CollectionUtils {
public static <T> int indexOf(T element, T[] array) {
if (element == null || array == null)
return -1;
- for (int i = 0; i < array.length; i++)
+ for (var i = 0; i < array.length; i++)
if (eq(element, array[i]))
return i;
return -1;
@@ -1400,7 +1400,7 @@ public class CollectionUtils {
public static boolean equals(String[] a1, String[] a2) {
if (a1.length != a2.length)
return false;
- for (int i = 0; i < a1.length; i++)
+ for (var i = 0; i < a1.length; i++)
if (ne(a1[i], a2[i]))
return false;
return true;
@@ -1421,7 +1421,7 @@ public class CollectionUtils {
* @return The same array, reversed.
*/
public static <E> E[] reverse(E[] array) {
- for (int i = 0; i < array.length / 2; i++) {
+ for (var i = 0; i < array.length / 2; i++) {
E temp = array[i];
array[i] = array[array.length - i - 1];
array[array.length - i - 1] = temp;
@@ -1522,7 +1522,7 @@ public class CollectionUtils {
public static List copyArrayToList(Object array, List list) {
if (nn(array)) {
var length = Array.getLength(array);
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
list.add(Array.get(array, i));
}
return list;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
index e71191276b..3124ca04fd 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
@@ -514,7 +514,7 @@ public class DateUtils {
var state = S1;
var precision = ChronoField.YEAR; // Track precision as we go
- for (int i = 0; i < seg.length(); i++) {
+ for (var i = 0; i < seg.length(); i++) {
var c = seg.charAt(i);
if (state == S1) {
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
index 1870342b1d..765e6eb3b9 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
@@ -201,7 +201,7 @@ public class MimeTypeDetector {
var parts =
line.trim().split("\\s+");
if (parts.length >= 2) {
var mimeType =
parts[0];
- for (int i = 1;
i < parts.length; i++) {
+ for (var i = 1;
i < parts.length; i++) {
addExtensionType(parts[i], mimeType);
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
index dd6da5907a..3ab3a69990 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
@@ -200,7 +200,7 @@ public class Utils {
int l1 = Array.getLength(o1), l2 = Array.getLength(o2);
if (l1 != l2)
return false;
- for (int i = 0; i < l1; i++)
+ for (var i = 0; i < l1; i++)
if (ne(Array.get(o1, i), Array.get(o2, i)))
return false;
return true;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
index 4e35b93cf7..86be548782 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
@@ -74,7 +74,7 @@ public class Version implements Comparable<Version> {
value = "0";
String[] sParts = splita(value, '.');
parts = new int[sParts.length];
- for (int i = 0; i < sParts.length; i++) {
+ for (var i = 0; i < sParts.length; i++) {
try {
parts[i] = sParts[i].isEmpty() ? 0 :
Integer.parseInt(sParts[i]);
} catch (@SuppressWarnings("unused")
NumberFormatException e) {
@@ -189,7 +189,7 @@ public class Version implements Comparable<Version> {
else if (c < 0)
return true;
}
- for (int i = parts.length; i < v.parts.length; i++)
+ for (var i = parts.length; i < v.parts.length; i++)
if (v.parts[i] != 0)
return false;
return ! exclusive;
@@ -234,7 +234,7 @@ public class Version implements Comparable<Version> {
else if (c < 0)
return true;
}
- for (int i = parts.length; i < v.parts.length; i++)
+ for (var i = parts.length; i < v.parts.length; i++)
if (v.parts[i] > 0)
return true;
return ! exclusive;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 7084dddfdf..4c62d10a6b 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -1216,7 +1216,7 @@ public class Config extends Context implements
ConfigEventListener {
String removeMods(String mods, String x) {
if (nn(mods) && nn(x))
- for (int i = mods.length() - 1; i > -1; i--)
+ for (var i = mods.length() - 1; i > -1; i--)
x = getMod(mods.charAt(i)).doRemove(x);
return x;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationWorkList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationWorkList.java
index 18c3ffca2f..7ab51a0de4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationWorkList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationWorkList.java
@@ -123,7 +123,7 @@ public class AnnotationWorkList extends
ArrayList<AnnotationWork> {
applyConstructors =
a(AnnotationApplier.NoOp.class.getConstructor(VarResolverSession.class));
} else {
applyConstructors = new
Constructor[cpa.value().length];
- for (int i = 0; i < cpa.value().length; i++)
+ for (var i = 0; i < cpa.value().length; i++)
applyConstructors[i] = (Constructor<?
extends
AnnotationApplier<?,?>>)cpa.value()[i].getConstructor(VarResolverSession.class);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 1fdfad9f0d..ce5b518824 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -3740,7 +3740,7 @@ public class BeanContext extends Context {
return cm;
ClassMeta<?>[] cma = new ClassMeta[args.length + 1];
cma[0] = cm;
- for (int i = 0; i < Array.getLength(args); i++) {
+ for (var i = 0; i < Array.getLength(args); i++) {
var arg = (Type)Array.get(args, i);
cma[i + 1] = arg instanceof Class arg2 ?
getClassMeta(arg2) : resolveClassMeta(arg, null);
}
@@ -4409,7 +4409,7 @@ public class BeanContext extends Context {
int varIndex = -1;
var gc = (Class)t4.getGenericDeclaration();
TypeVariable[] tvv = gc.getTypeParameters();
- for (int i = 0; i < tvv.length; i++) {
+ for (var i = 0; i < tvv.length; i++) {
if (tvv[i].getName().equals(varName)) {
varIndex = i;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
index 3c341cf1db..c4140a2c07 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
@@ -83,7 +83,7 @@ public class BeanDictionaryMap extends
LinkedHashMap<String,Object> {
if (o instanceof Class)
return;
if (isArray(o)) {
- for (int i = 0; i < Array.getLength(o); i++)
+ for (var i = 0; i < Array.getLength(o); i++)
assertValidParameter(Array.get(o, i));
return;
}
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 3e4f5ba7d5..227b8b31f9 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
@@ -761,7 +761,7 @@ public class BeanMeta<T> {
if (rt instanceof Class) {
Type[] gImpls = t2.getActualTypeArguments();
Class<?>[] gTypes = new Class[gImpls.length];
- for (int i = 0; i < gImpls.length; i++) {
+ for (var i = 0; i < gImpls.length; i++) {
Type gt = gImpls[i];
if (gt instanceof Class<?> c)
gTypes[i] = c;
@@ -810,7 +810,7 @@ public class BeanMeta<T> {
// Check if parameter types match
var paramsMatch = true;
List<ParameterInfo> parentParams =
parentMethod.getParameters();
- for (int i = 0; i < params.size(); i++)
{
+ for (var i = 0; i < params.size(); i++)
{
if (!
params.get(i).getParameterType().is(parentParams.get(i).getParameterType().inner()))
{
paramsMatch = false;
break;
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 137cfa575b..328882ab83 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
@@ -988,7 +988,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
// Process in reverse order (parent-to-child) to match the
"ParentFirst" semantics
- for (int i = parentMethods.size() - 1; i >= 0; i--) {
+ for (var i = parentMethods.size() - 1; i >= 0; i--) {
consumer.accept(parentMethods.get(i));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index 811ca1bbc4..5856c02d13 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -180,7 +180,7 @@ public class BeanRegistry {
throw bex("Map entry had an empty array value.");
var type = (Type)Array.get(array, 0);
var args = new Type[len - 1];
- for (int i = 1; i < len; i++)
+ for (var i = 1; i < len; i++)
args[i - 1] = (Type)Array.get(array, i);
return bc.getClassMeta(type, args);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 6960d9280f..48dfa3dedb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -281,7 +281,7 @@ public class BeanTraverseSession extends BeanSession {
stack.forEach(x -> {
if (full) {
sb.append("\n\t");
- for (int i = 1; i < x.depth; i++)
+ for (var i = 1; i < x.depth; i++)
sb.append(" ");
if (x.depth > 0)
sb.append("->");
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
index c9ec7ac9af..2e6f7985a8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
@@ -77,7 +77,7 @@ public class UriResolver {
private static boolean hasDotSegments(String s) {
if (s == null)
return false;
- for (int i = 0; i < s.length() - 1; i++) {
+ for (var i = 0; i < s.length() - 1; i++) {
var c = s.charAt(i);
if ((i == 0 && c == '/') || (c == '/' && s.charAt(i +
1) == '.'))
return true;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index e7928827c0..1209c536dd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -488,7 +488,7 @@ public class JsonList extends LinkedList<Object> {
* @return This object.
*/
public JsonList appendReverse(Object...values) {
- for (int i = values.length - 1; i >= 0; i--)
+ for (var i = values.length - 1; i >= 0; i--)
add(values[i]);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index 052f8c9c0c..a8beef55af 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -259,7 +259,7 @@ public class Messages extends ResourceBundle {
var x = (Builder)null;
- for (int i = mbl.length - 1; i >= 0; i--) {
+ for (var i = mbl.length - 1; i >= 0; i--) {
var c = firstNonNull(mbl[i].getA(),
forClass);
var value = mbl[i].getB();
if (isJsonObject(value, true)) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvWriter.java
index f4b8d00bf2..f7375d09cb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvWriter.java
@@ -189,7 +189,7 @@ public class CsvWriter extends SerializerWriter {
else {
var s = value.toString();
var mustQuote = false;
- for (int i = 0; i < s.length() && ! mustQuote; i++) {
+ for (var i = 0; i < s.length() && ! mustQuote; i++) {
var c = s.charAt(i);
if (Character.isWhitespace(c) || c == ',')
mustQuote = true;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 2bd7c95e12..ad665c579a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -192,7 +192,7 @@ public class HtmlParserSession extends XmlParserSession {
}
private static String getAttribute(XmlReader r, String name, String
def) {
- for (int i = 0; i < r.getAttributeCount(); i++)
+ for (var i = 0; i < r.getAttributeCount(); i++)
if (r.getAttributeLocalName(i).equals(name))
return r.getAttributeValue(i);
return def;
@@ -200,7 +200,7 @@ public class HtmlParserSession extends XmlParserSession {
private static Map<String,String> getAttributes(XmlReader r) {
var m = new TreeMap<String,String>();
- for (int i = 0; i < r.getAttributeCount(); i++)
+ for (var i = 0; i < r.getAttributeCount(); i++)
m.put(r.getAttributeLocalName(i),
r.getAttributeValue(i));
return m;
}
@@ -852,7 +852,7 @@ public class HtmlParserSession extends XmlParserSession {
}
} else {
sb.append('<').append(r.getLocalName());
- for (int i = 0; i <
r.getAttributeCount(); i++)
+ for (var i = 0; i <
r.getAttributeCount(); i++)
sb.append('
').append(r.getAttributeName(i)).append('=').append('\'').append(r.getAttributeValue(i)).append('\'');
sb.append('>');
depth++;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
index cdef06612b..f9a31837de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
@@ -390,7 +390,7 @@ public class HtmlWriter extends XmlWriter {
return this;
}
- for (int i = 0; i < s.length(); i++) {
+ for (var i = 0; i < s.length(); i++) {
var test = s.charAt(i);
if (test == '&')
append("&");
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 882601a57d..516184f9f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -4221,7 +4221,7 @@ public class HttpPartSchema {
throw new
SchemaValidationException("Duplicate items not allowed.");
HttpPartSchema items = getItems();
if (nn(items))
- for (int i = 0; i <
Array.getLength(o); i++)
+ for (var i = 0; i <
Array.getLength(o); i++)
items.validateOutput(Array.get(o, i), bc);
} else if (cm.isCollection()) {
Collection<?> c = (Collection<?>)o;
@@ -4576,7 +4576,7 @@ public class HttpPartSchema {
private boolean isValidUniqueItems(Object x) {
if (uniqueItems) {
var s = new HashSet<>();
- for (int i = 0; i < Array.getLength(x); i++) {
+ for (var i = 0; i < Array.getLength(x); i++) {
var o = Array.get(x, i);
if (! s.add(o))
return false;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils2.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils2.java
index f66c83e28e..65b8afa841 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils2.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils2.java
@@ -43,7 +43,7 @@ public class ClassUtils2 {
public static Object[] getMatchingArgs(Class<?>[] paramTypes,
Object...args) {
boolean needsShuffle = paramTypes.length != args.length;
if (! needsShuffle) {
- for (int i = 0; i < paramTypes.length; i++) {
+ for (var i = 0; i < paramTypes.length; i++) {
if (! paramTypes[i].isInstance(args[i]))
needsShuffle = true;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
index ff96486eb7..91103d8ce6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
@@ -181,7 +181,7 @@ public class JsonWriter extends SerializerWriter {
// Look for characters that would require the attribute
to be quoted.
// All possible numbers should be caught here.
if (! doConvert) {
- for (int i = 0; i < s.length() && ! doConvert;
i++) {
+ for (var i = 0; i < s.length() && ! doConvert;
i++) {
var c = s.charAt(i);
doConvert |= ! (i == 0 ?
validFirstAttrChars.contains(c) : validAttrChars.contains(c));
}
@@ -291,7 +291,7 @@ public class JsonWriter extends SerializerWriter {
if (s == null)
return this;
boolean doConvert = false;
- for (int i = 0; i < s.length() && ! doConvert; i++) {
+ for (var i = 0; i < s.length() && ! doConvert; i++) {
var c = s.charAt(i);
doConvert |= ec.contains(c);
}
@@ -299,7 +299,7 @@ public class JsonWriter extends SerializerWriter {
if (! doConvert) {
w(s);
} else {
- for (int i = 0; i < s.length(); i++) {
+ for (var i = 0; i < s.length(); i++) {
var c = s.charAt(i);
if (ec.contains(c)) {
if (c == '\n')
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
index 683f465104..2b8511fb74 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
@@ -220,12 +220,12 @@ public class MsgPackParserSession extends
InputStreamParserSession {
o = is.readBinary();
else if (dt == ARRAY && sType.isObject()) {
var jl = new JsonList(this);
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
jl.add(parseAnything(object(), is,
outer, pMeta));
o = jl;
} else if (dt == MAP && sType.isObject()) {
var jm = new JsonMap(this);
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
jm.put((String)parseAnything(string(),
is, outer, pMeta), parseAnything(object(), is, jm, pMeta));
o = cast(jm, pMeta, eType);
}
@@ -237,7 +237,7 @@ public class MsgPackParserSession extends
InputStreamParserSession {
} else if (sType.isMap()) {
if (dt == MAP) {
Map m =
(sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) :
newGenericMap(sType));
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
Object key =
parseAnything(sType.getKeyType(), is, outer, pMeta);
var vt = sType.getValueType();
Object value =
parseAnything(vt, is, m, pMeta);
@@ -251,7 +251,7 @@ public class MsgPackParserSession extends
InputStreamParserSession {
} else if (nn(builder) ||
sType.canCreateNewBean(outer)) {
if (dt == MAP) {
BeanMap m = builder == null ?
newBeanMap(outer, sType.getInnerClass()) : toBeanMap(builder.create(this,
eType));
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
String pName =
parseAnything(string(), is, m.getBean(false), null);
var bpm =
m.getPropertyMeta(pName);
if (bpm == null) {
@@ -280,12 +280,12 @@ public class MsgPackParserSession extends
InputStreamParserSession {
} else if (sType.isCollection()) {
if (dt == MAP) {
var m = new JsonMap(this);
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
m.put((String)parseAnything(string(), is, outer, pMeta),
parseAnything(object(), is, m, pMeta));
o = cast(m, pMeta, eType);
} else if (dt == ARRAY) {
Collection l =
(sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new
JsonList(this));
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
l.add(parseAnything(sType.getElementType(), is, l, pMeta));
o = l;
} else {
@@ -294,12 +294,12 @@ public class MsgPackParserSession extends
InputStreamParserSession {
} else if (sType.isArray() || sType.isArgs()) {
if (dt == MAP) {
var m = new JsonMap(this);
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
m.put((String)parseAnything(string(), is, outer, pMeta),
parseAnything(object(), is, m, pMeta));
o = cast(m, pMeta, eType);
} else if (dt == ARRAY) {
Collection l = (sType.isCollection() &&
sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new
JsonList(this));
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
l.add(parseAnything(sType.isArgs() ? sType.getArg(i) : sType.getElementType(),
is, l, pMeta));
o = toArray(sType, l);
} else {
@@ -307,7 +307,7 @@ public class MsgPackParserSession extends
InputStreamParserSession {
}
} else if (dt == MAP) {
var m = new JsonMap(this);
- for (int i = 0; i < length; i++)
+ for (var i = 0; i < length; i++)
m.put((String)parseAnything(string(),
is, outer, pMeta), parseAnything(object(), is, m, pMeta));
if
(m.containsKey(getBeanTypePropertyName(eType)))
o = cast(m, pMeta, eType);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index fc20b63b46..dcb70d1ce6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -396,7 +396,7 @@ public class OpenApiParserSession extends UonParserSession {
if (items == null)
items = HttpPartSchema.DEFAULT;
var o = Array.newInstance(eType.getInnerClass(),
ss.length);
- for (int i = 0; i < ss.length; i++)
+ for (var i = 0; i < ss.length; i++)
Array.set(o, i, parse(partType, items,
ss[i], eType));
if (type.hasMutaterFrom(schema.getParsedType())
|| schema.getParsedType().hasMutaterTo(type))
return toType(toType(o,
schema.getParsedType()), type);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index a4b5be9ecb..f2fc3b6712 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -407,7 +407,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
var sb = new OapiStringBuilder(cf);
if (type.isArray()) {
- for (int i = 0; i <
Array.getLength(value); i++)
+ for (var i = 0; i <
Array.getLength(value); i++)
sb.append(serialize(partType, items, Array.get(value, i)));
} else if (type.isCollection()) {
((Collection<?>)value).forEach(x -> sb.append(serialize(partType, items, x)));
@@ -474,7 +474,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
var l = new JsonList();
HttpPartSchema items = s.getItems();
if (type.isArray()) {
- for (int i = 0; i < Array.getLength(o); i++)
+ for (var i = 0; i < Array.getLength(o); i++)
l.add(toObject(partType, Array.get(o, i),
items));
} else if (type.isCollection()) {
((Collection<?>)o).forEach(x ->
l.add(toObject(partType, x, items)));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index 58b68a04b5..757e704f19 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -130,12 +130,12 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
return false;
}
if (cm.isArray()) {
- for (int i = 0; i < Array.getLength(o); i++)
+ for (var i = 0; i < Array.getLength(o); i++)
if (matches(Array.get(o, i)))
return true;
return false;
}
- for (int i = 0; i < factories.length; i++) {
+ for (var i = 0; i < factories.length; i++) {
if (factories[i].canMatch(cm)) {
if (matchers[i] == null)
matchers[i] =
factories[i].create(searchPattern);
@@ -186,7 +186,7 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
return true;
}
if (cm.isArray()) {
- for (int i = 0; i < Array.getLength(o); i++)
+ for (var i = 0; i < Array.getLength(o); i++)
if (! matches(Array.get(o, i)))
return false;
return true;
@@ -259,7 +259,7 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
} else /* isArray */ {
var size = Array.getLength(input);
l = listOfSize(size);
- for (int i = 0; i < size; i++) {
+ for (var i = 0; i < size; i++) {
var o = Array.get(input, i);
if (rowMatcher.matches(o))
l.add(o);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
index a016ece5ff..317557c615 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
@@ -128,7 +128,7 @@ public class ObjectSorter implements ObjectTool<SortArgs> {
if (type.isArray()) {
var size = Array.getLength(input);
l = listOfSize(size);
- for (int i = 0; i < size; i++)
+ for (var i = 0; i < size; i++)
l.add(new SortEntry(session, Array.get(input,
i)));
} else /* isCollection() */ {
var c = (Collection)input;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
index 4f81b6fbbb..62a1100ac4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
@@ -89,7 +89,7 @@ public class ObjectViewer implements ObjectTool<ViewArgs> {
if (type.isArray()) {
var size = Array.getLength(input);
l = listOfSize(size);
- for (int i = 0; i < size; i++)
+ for (var i = 0; i < size; i++)
l.add(Array.get(input, i));
} else if (type.isCollection()) {
var c = (Collection)input;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
index ecf48ba4d1..58cb833a50 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
@@ -93,7 +93,7 @@ public class StringMatcherFactory extends MatcherFactory {
if (REGEX_CHARS.contains(s) ||
META_CHARS.contains(s)) {
var sb = new StringBuilder();
boolean isInEscape = false;
- for (int i = 0; i < s.length();
i++) {
+ for (var i = 0; i < s.length();
i++) {
var c = s.charAt(i);
if (isInEscape) {
if (c == '?' ||
c == '*' || c == '\\')
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 3f0097f938..11a96d64be 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -1011,7 +1011,7 @@ public class Parser extends BeanContextable {
String[] _consumes = splita(nn(consumes) ? consumes : "");
this.consumesArray = new MediaType[_consumes.length];
- for (int i = 0; i < _consumes.length; i++) {
+ for (var i = 0; i < _consumes.length; i++) {
this.consumesArray[i] = MediaType.of(_consumes[i]);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
index 8723c34213..50bacb06de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -113,7 +113,7 @@ public class ParserReader extends Reader implements
Positionable {
* @return This object.
*/
public final ParserReader delete(int count) {
- for (int i = 0; i < count; i++)
+ for (var i = 0; i < count; i++)
buff[iCurrent - i - 1] = 127;
holesExist = true;
return this;
@@ -144,7 +144,7 @@ public class ParserReader extends Reader implements
Positionable {
// Holes are \u00FF 'delete' characters that we need to get rid
of now.
if (holesExist) {
- for (int i = iMark; i < iCurrent; i++) {
+ for (var i = iMark; i < iCurrent; i++) {
char c = buff[i];
if (c == 127)
offset++;
@@ -350,7 +350,7 @@ public class ParserReader extends Reader implements
Positionable {
offset--;
}
// Fill in the gap with DEL characters.
- for (int i = 1; i < offset; i++)
+ for (var i = 1; i < offset; i++)
buff[iCurrent - i] = 127;
holesExist |= (offset > 1);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 8d732726f5..b8fb3ada70 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -304,7 +304,7 @@ public class SerializerSession extends BeanTraverseSession {
if (componentType.isPrimitive()) {
var l = Array.getLength(array);
var list = new ArrayList<>(l);
- for (int i = 0; i < l; i++)
+ for (var i = 0; i < l; i++)
list.add(Array.get(array, i));
return list;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
index 7982b7f97d..858c828dc6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
@@ -277,7 +277,7 @@ public class SerializerWriter extends Writer {
*/
public SerializerWriter i(int indent) {
if (useWhitespace && indent <= maxIndent)
- for (int i = 0; i < indent; i++)
+ for (var i = 0; i < indent; i++)
w('\t');
return this;
}
@@ -290,7 +290,7 @@ public class SerializerWriter extends Writer {
*/
public SerializerWriter ie(int indent) {
if (useWhitespace && indent <= maxIndent - 1)
- for (int i = 0; i < indent; i++)
+ for (var i = 0; i < indent; i++)
w('\t');
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
index 8bb378678e..9e3657114b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
@@ -71,7 +71,7 @@ public abstract class Var {
this.name = name;
this.streamed = streamed;
- for (int i = 0; i < name.length(); i++) {
+ for (var i = 0; i < name.length(); i++) {
// Need to make sure only ASCII characters are used.
var c = name.charAt(i);
if (c < 'A' || c > 'z' || (c > 'Z' && c < 'a'))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index fb7f530287..8ce19d10c2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -96,7 +96,7 @@ public class VarResolverSession {
int length = s.length();
var state = S1;
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
var c = s.charAt(i);
if (state == S1) {
if (c == '$') {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
index 9a6946c813..1d9a14b0e8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
@@ -71,7 +71,7 @@ public class SwitchVar extends MultipartVar {
assertArg(args.length >= 2, "Invalid number of arguments passed
to $SW var. Must have 2 or more arguments.");
String stringArg = args[0];
- for (int i = 1; i < args.length; i++) {
+ for (var i = 1; i < args.length; i++) {
String pattern = args[i];
String[] parts = splita(pattern, ':', 2);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
index 6ea22e1312..56c11d4ed8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
@@ -43,7 +43,7 @@ public class MatchResultSwap extends
ObjectSwap<MatchResult,List<String>> {
@Override /* Overridden from ObjectSwap */
public List<String> swap(BeanSession session, MatchResult o) {
List<String> l = listOfSize(o.groupCount());
- for (int i = 0; i <= o.groupCount(); i++)
+ for (var i = 0; i <= o.groupCount(); i++)
l.add(o.group(i));
return l;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
index 55b78a2ef4..daca48571c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
@@ -200,7 +200,7 @@ public class UonReader extends ParserReader {
private int readUTF8(int n, final int numBytes) throws IOException {
if (iCurrent + numBytes * 3 > iEnd)
return -1;
- for (int i = 0; i < numBytes; i++) {
+ for (var i = 0; i < numBytes; i++) {
n <<= 6;
n += readHex() - 128;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
index 7212e8113d..faaab7e7c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
@@ -165,7 +165,7 @@ public class UonWriter extends SerializerWriter {
if (needsQuotes)
w(quoteChar);
- for (int i = 0; i < s.length(); i++) {
+ for (var i = 0; i < s.length(); i++) {
var c = s.charAt(i);
if (esc.contains(c))
w('~');
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index fc2e15701c..5cd19726e4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -213,7 +213,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
*/
private static Map<Integer,Object> getCollectionMap(Object array) {
var m = new TreeMap<Integer,Object>();
- for (int i = 0; i < Array.getLength(array); i++)
+ for (var i = 0; i < Array.getLength(array); i++)
m.put(i, Array.get(array, i));
return m;
}
@@ -316,7 +316,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
super.serializeAnything(out, x,
cMeta.getElementType(), key, pMeta);
});
} else /* array */ {
- for (int i = 0; i <
Array.getLength(value); i++) {
+ for (var i = 0; i <
Array.getLength(value); i++) {
addAmp.ifSet(() ->
out.cr(indent).append('&')).set();
out.appendObject(key,
true).append('=');
super.serializeAnything(out,
Array.get(value, i), cMeta.getElementType(), key, pMeta);
@@ -366,7 +366,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
super.serializeAnything(out, x,
null, s(key), null);
});
} else /* array */ {
- for (int i = 0; i <
Array.getLength(value); i++) {
+ for (var i = 0; i <
Array.getLength(value); i++) {
addAmp.ifSet(() ->
out.cr(indent).append('&')).set();
out.appendObject(key,
true).append('=');
super.serializeAnything(out,
Array.get(value, i), null, s(key), null);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/HashKey.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/HashKey.java
index 622c07f1cb..20ba114a82 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/HashKey.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/HashKey.java
@@ -51,7 +51,7 @@ public class HashKey {
var x = (HashKey)o;
if (array.length != x.array.length)
return false;
- for (int i = 0; i < array.length; i++)
+ for (var i = 0; i < array.length; i++)
if (ne(array[i], x.array[i]))
return false;
return true;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
index 74ef291dc4..78bd675bc7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
@@ -183,7 +183,7 @@ public class StringExpressionMatcher {
private static Exp parseOperand(String operand) {
boolean hasMeta = false;
- for (int i = 0; i < operand.length() && ! hasMeta; i++) {
+ for (var i = 0; i < operand.length() && ! hasMeta; i++) {
var c = operand.charAt(i);
hasMeta |= META.contains(c);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 8fbdc6887a..099951230c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -252,7 +252,7 @@ public class XmlParserSession extends ReaderParserSession {
rsb.setLength(0);
rsb.append("<").append(t == 1 ? "" :
"/").append(r.getLocalName());
if (t == 1)
- for (int i = 0; i < r.getAttributeCount(); i++)
+ for (var i = 0; i < r.getAttributeCount(); i++)
rsb.append('
').append(r.getAttributeName(i)).append('=').append('\'').append(r.getAttributeValue(i)).append('\'');
rsb.append('>');
return rsb.toString();
@@ -379,7 +379,7 @@ public class XmlParserSession extends ReaderParserSession {
var bMeta = m.getMeta();
var xmlMeta = getXmlBeanMeta(bMeta);
- for (int i = 0; i < r.getAttributeCount(); i++) {
+ for (var i = 0; i < r.getAttributeCount(); i++) {
String key = getAttributeName(r, i);
if (! ("nil".equals(key) || isSpecialAttr(key))) {
var val = r.getAttributeValue(i);
@@ -551,7 +551,7 @@ public class XmlParserSession extends ReaderParserSession {
private <K,V> Map<K,V> parseIntoMap(XmlReader r, Map<K,V> m,
ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta)
throws IOException, ParseException, ExecutableException,
XMLStreamException {
int depth = 0;
- for (int i = 0; i < r.getAttributeCount(); i++) {
+ for (var i = 0; i < r.getAttributeCount(); i++) {
var a = r.getAttributeLocalName(i);
// TODO - Need better handling of namespaces here.
if (! isSpecialAttr(a)) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index e7ea6e91ff..5fcf82cb69 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -291,7 +291,7 @@ public class XmlUtils {
if (needsTextEncoding(s)) {
var len = s.length();
- for (int i = 0; i < len; i++) {
+ for (var i = 0; i < len; i++) {
var c = s.charAt(i);
if ((i == 0 || i == len - 1) &&
Character.isWhitespace(c) && ! preserveWhitespace)
appendPaddedHexChar(w, c);
@@ -330,7 +330,7 @@ public class XmlUtils {
return s;
var len = s.length();
var sw = new StringWriter(s.length() * 2);
- for (int i = 0; i < len; i++) {
+ for (var i = 0; i < len; i++) {
var c = s.charAt(i);
if ((i == 0 || i == len - 1) &&
Character.isWhitespace(c))
appendPaddedHexChar(sw, c);
@@ -359,14 +359,14 @@ public class XmlUtils {
*/
public static Namespace findNamespace(List<Xml> xmls, List<XmlSchema>
schemas) {
- for (int i = xmls.size() - 1; i >= 0; i--) {
+ for (var i = xmls.size() - 1; i >= 0; i--) {
var xml = xmls.get(i);
var ns = findNamespace(xml.prefix(), xml.namespace(),
xmls, schemas);
if (nn(ns))
return ns;
}
- for (int i = schemas.size() - 1; i >= 0; i--) {
+ for (var i = schemas.size() - 1; i >= 0; i--) {
var schema = schemas.get(i);
var ns = findNamespace(schema.prefix(),
schema.namespace(), null, schemas);
if (nn(ns))
@@ -426,7 +426,7 @@ public class XmlUtils {
}
private static Writer encodeElementNameInner(Writer w, String s) throws
IOException {
- for (int i = 0; i < s.length(); i++) {
+ for (var i = 0; i < s.length(); i++) {
var c = s.charAt(i);
// @formatter:off
if ((c >= 'A' && c <= 'Z')
diff --git
a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
index f2ffbe92ff..9e29eb8632 100644
---
a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
+++
b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
@@ -95,7 +95,7 @@ public class TestUtils {
var tagWithContent =
Pattern.compile("^(\\s*)<[^>]+>.*</[^>]+>$");
var lines = out.split("\n");
try {
- for (int i = 0; i < lines.length; i++) {
+ for (var i = 0; i < lines.length; i++) {
var line = lines[i];
var m = startTag.matcher(line);
if (m.matches()) {
@@ -146,7 +146,7 @@ public class TestUtils {
}
private static void printLines(String[] lines) {
- for (int i = 0; i < lines.length; i++)
+ for (var i = 0; i < lines.length; i++)
System.err.println(String.format("%4s:" + lines[i], i +
1)); // NOT DEBUG
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 9564bc44b7..83665c74e6 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -119,7 +119,7 @@ public class LogEntryFormatter extends Formatter {
// S4: Found $, looking for s.
var state = S1;
int i1 = 0;
- for (int i = 0; i < format.length(); i++) {
+ for (var i = 0; i < format.length(); i++) {
var c = format.charAt(i);
if (state == S1) {
if (c == '%')
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
index bb9730622d..174174a2b8 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
@@ -42,7 +42,7 @@ public class RestCallException extends HttpException {
message = emptyIfNull(message);
boolean needsCleaning = false;
- for (int i = 0; i < message.length() && ! needsCleaning; i++)
+ for (var i = 0; i < message.length() && ! needsCleaning; i++)
if (message.charAt(i) < 32)
needsCleaning = true;
@@ -50,7 +50,7 @@ public class RestCallException extends HttpException {
return message;
var sb = new StringBuilder(message.length());
- for (int i = 0; i < message.length(); i++) {
+ for (var i = 0; i < message.length(); i++) {
var c = message.charAt(i);
sb.append(c < 32 ? ' ' : c);
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index ce66ada78e..9df550b4e6 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -6184,7 +6184,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
var headers = (String)null;
var uri = (String)null;
var content = (String)null;
- for (int i = 0; i < callString.length(); i++) {
+ for (var i = 0; i < callString.length(); i++) {
var c = callString.charAt(i);
if (state == S1) {
if (isWhitespace(c)) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
index ed815fced4..2b5fd803da 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
@@ -98,7 +98,7 @@ public class StringEntity extends BasicHttpEntity {
return l;
String s = content();
if (getCharset() == UTF8)
- for (int i = 0; i < s.length(); i++)
+ for (var i = 0; i < s.length(); i++)
if (s.charAt(i) > 127)
return -1;
return s.length();
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 9716b7f0b3..2b7037541e 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -479,7 +479,7 @@ public class HeaderList extends ControlledArrayList<Header>
{
* @return The first matching header, or {@link Optional#empty()} if
not found.
*/
public Optional<Header> getFirst(String name) {
- for (int i = 0; i < size(); i++) {
+ for (var i = 0; i < size(); i++) {
var x = get(i);
if (eq(x.getName(), name))
return opt(x);
@@ -497,7 +497,7 @@ public class HeaderList extends ControlledArrayList<Header>
{
* @return The last matching header, or {@link Optional#empty()} if not
found.
*/
public Optional<Header> getLast(String name) {
- for (int i = size() - 1; i >= 0; i--) {
+ for (var i = size() - 1; i >= 0; i--) {
var x = get(i);
if (eq(x.getName(), name))
return opt(x);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
index 1e19bf9492..f6c21c0bb2 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -463,7 +463,7 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
* @return The first matching part, or {@link Optional#empty()} if not
found.
*/
public Optional<NameValuePair> getFirst(String name) {
- for (int i = 0; i < size(); i++) {
+ for (var i = 0; i < size(); i++) {
var x = get(i);
if (eq(x.getName(), name))
return opt(x);
@@ -481,7 +481,7 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
* @return The last matching part, or {@link Optional#empty()} if not
found.
*/
public Optional<NameValuePair> getLast(String name) {
- for (int i = size() - 1; i >= 0; i--) {
+ for (var i = size() - 1; i >= 0; i--) {
var x = get(i);
if (eq(x.getName(), name))
return opt(x);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
index 627c9847c5..7da13cc7ea 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
@@ -47,7 +47,7 @@ public class RrpcInterfaceMethodMeta {
if (pt.length == 0)
return "";
sb.append('(');
- for (int i = 0; i < pt.length; i++) {
+ for (var i = 0; i < pt.length; i++) {
var pti = ClassInfo.of(pt[i]);
if (i > 0)
sb.append(',');
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
index 439a4bdc79..6deb41dc05 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
@@ -169,7 +169,7 @@ class MockPathResolver {
this.remainder = "";
int mark = 0;
- for (int i = uri.indexOf("://") + 3; i < uri.length(); i++) {
+ for (var i = uri.indexOf("://") + 3; i < uri.length(); i++) {
var c = uri.charAt(i);
if (state == S3) {
if (c != '/')
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index d24bbed9a6..1ff18d982b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -5915,7 +5915,7 @@ public class RestContext extends Context {
beanStore = BeanStore.of(beanStore, getResource());
- for (int i = 0; i < params.size(); i++) {
+ for (var i = 0; i < params.size(); i++) {
var pi = params.get(i);
beanStore.addBean(ParameterInfo.class, pi);
for (var c : restOpArgs) {
@@ -6091,7 +6091,7 @@ public class RestContext extends Context {
// Loop until we find the correct processor for the POJO.
int loops = 5;
- for (int i = 0; i < responseProcessors.length; i++) {
+ for (var i = 0; i < responseProcessors.length; i++) {
var j = responseProcessors[i].process(opSession);
if (j == FINISHED)
return;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 27db87c45f..f20f82ee11 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -2239,7 +2239,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (c != 0)
return c;
- for (int i = 0; i < method.getParameterCount(); i++) {
+ for (var i = 0; i < method.getParameterCount(); i++) {
c = compare(method.getParameterTypes()[i].getName(),
o.method.getParameterTypes()[i].getName());
if (c != 0)
return c;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
index 191b869d64..c9fc9e3931 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
@@ -56,7 +56,7 @@ public class RestOpInvoker extends MethodInvoker {
*/
public void invoke(RestOpSession opSession) throws Throwable {
var args = new Object[opArgs.length];
- for (int i = 0; i < opArgs.length; i++) {
+ for (var i = 0; i < opArgs.length; i++) {
ParameterInfo pi = inner().getParameter(i);
try {
args[i] = opArgs[i].resolve(opSession);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
index 9cc153b94d..7451f34f3a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
@@ -199,7 +199,7 @@ public class PathArg implements RestOpArg {
var i = pi.getIndex();
var mi = pi.getMethod();
- for (int j = 0; j < i; j++) {
+ for (var j = 0; j < i; j++) {
var hasAnnotation = AP.has(Path.class,
mi.getParameter(j));
if (hasAnnotation)
idx++;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
index b5f2e52909..18353e7da7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
@@ -191,7 +191,7 @@ public class RoleMatcher {
private static Exp parseOperand(String operand) {
boolean hasMeta = false;
- for (int i = 0; i < operand.length() && ! hasMeta; i++) {
+ for (var i = 0; i < operand.length() && ! hasMeta; i++) {
var c = operand.charAt(i);
hasMeta |= META.contains(c);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index 81a3c6339a..fb75039bf2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -331,7 +331,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
if (l.size() == 1)
return l.get(0);
var sb = new StringBuilder(128);
- for (int i = 0; i < l.size(); i++) {
+ for (var i = 0; i < l.size(); i++) {
if (i > 0)
sb.append(", ");
sb.append(l.get(i).getValue());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index f91852e330..9ef2af9fd5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -330,7 +330,7 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
if (l.size() == 1)
return l.get(0);
var sb = new StringBuilder(128);
- for (int i = 0; i < l.size(); i++) {
+ for (var i = 0; i < l.size(); i++) {
if (i > 0)
sb.append(", ");
sb.append(l.get(i).getValue());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index f8a41f3a4a..a370ba276a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -365,7 +365,7 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
if (l.size() == 1)
return l.get(0);
var sb = new StringBuilder(128);
- for (int i = 0; i < l.size(); i++) {
+ for (var i = 0; i < l.size(); i++) {
if (i > 0)
sb.append(", ");
sb.append(l.get(i).getValue());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
index d7ae32452c..76c4dd762a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
@@ -181,7 +181,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
t.child(tr(td("No
arguments").colspan(3).style("text-align:center")));
} else {
t.child(tr(th("Index"), th("Type"), th("Value")));
- for (int i = 0; i < types.length; i++) {
+ for (var i = 0; i < types.length; i++) {
String type = Mutaters.toString(types[i]);
t.child(tr(td(i), td(type),
td(input().name(String.valueOf(i)).type("text"))));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index 4d4f1f0d8a..7c0a6ca4dd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -446,7 +446,7 @@ public class BasicSwaggerProviderSession {
}
}
var methods = eci.getAllMethods();
- for (int i = methods.size() - 1; i >= 0; i--) {
+ for (var i = methods.size() - 1; i >= 0; i--) {
var ecmi = methods.get(i);
var a =
ecmi.getAnnotations(Header.class).findFirst().map(AnnotationInfo::inner).orElse(null);
if (a == null)
@@ -482,7 +482,7 @@ public class BasicSwaggerProviderSession {
}
if (mi.getReturnType().hasAnnotation(Response.class)) {
var methods =
mi.getReturnType().getAllMethods();
- for (int i = methods.size() - 1; i >= 0; i--) {
+ for (var i = methods.size() - 1; i >= 0; i--) {
var ecmi = methods.get(i);
if
(ecmi.hasAnnotation(Header.class)) {
var a =
ecmi.getAnnotations(Header.class).findFirst().map(AnnotationInfo::inner).orElse(null);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
index 0292b340b9..73d94ddbd4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
@@ -57,7 +57,7 @@ public class UrlPath {
UrlPath(String path) {
this.path = path;
parts = path == null ? new String[0] :
StringUtils.splita(path.substring(1), '/');
- for (int i = 0; i < parts.length; i++)
+ for (var i = 0; i < parts.length; i++)
parts[i] = urlDecode(parts[i]);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
index b5903e14fb..e40739b965 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
@@ -100,7 +100,7 @@ public abstract class UrlPathMatcher implements
Comparable<UrlPathMatcher> {
this.vars = new String[parts.length];
List<String> vars = list();
- for (int i = 0; i < parts.length; i++) {
+ for (var i = 0; i < parts.length; i++) {
Matcher m = VAR_PATTERN.matcher(parts[i]);
if (m.matches()) {
this.vars[i] = m.group(1);
@@ -147,7 +147,7 @@ public abstract class UrlPathMatcher implements
Comparable<UrlPathMatcher> {
}
}
- for (int i = 0; i < parts.length; i++)
+ for (var i = 0; i < parts.length; i++)
if (vars[i] == null && (pip.length <= i || !
("*".equals(parts[i]) || pip[i].equals(parts[i]))))
return null;
@@ -155,7 +155,7 @@ public abstract class UrlPathMatcher implements
Comparable<UrlPathMatcher> {
var j = 0;
if (nn(vals))
- for (int i = 0; i < parts.length; i++)
+ for (var i = 0; i < parts.length; i++)
if (nn(vars[i]))
vals[j++] = pip[i];
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
index 5bf0055917..547711d595 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
@@ -75,7 +75,7 @@ public class BenchmarkRunner {
list = new ArrayList<>(size);
map = new LinkedHashMap<>();
- for (int i = 0; i < size; i++) {
+ for (var i = 0; i < size; i++) {
list.add(random.nextInt(100));
map.put(String.valueOf(i), random.nextInt(100));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
index e20fd2a9a4..e00a132fd8 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
@@ -164,7 +164,7 @@ class ParserReader_Test extends TestBase {
private static String read(ParserReader r, int length) throws
IOException {
var sb = new StringBuilder();
- for (int i = 0; i < length; i++) {
+ for (var i = 0; i < length; i++) {
int c = r.read();
if (c == -1)
return sb.toString();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
index 6d4224ed8d..f9cc89ea7b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
@@ -115,11 +115,11 @@ class RoundTripLargeObjects_Test extends TestBase {
p.parse(r, A.class);
startTime = System.currentTimeMillis();
- for (int i = 0; i < numRuns; i++)
+ for (var i = 0; i < numRuns; i++)
r = s.serialize(a);
System.err.println(format("Average serialize time:
{0,number}ms", (System.currentTimeMillis()-startTime)/numRuns)); // NOT DEBUG
startTime = System.currentTimeMillis();
- for (int i = 0; i < numRuns; i++)
+ for (var i = 0; i < numRuns; i++)
p.parse(r, A.class);
System.err.println(format("Average parsed time: {0,number}ms",
(System.currentTimeMillis()-startTime)/numRuns)); // NOT DEBUG
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/ByteValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/ByteValue_Test.java
index f3e05aacdb..8093c344ef 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/ByteValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/ByteValue_Test.java
@@ -240,7 +240,7 @@ class ByteValue_Test extends TestBase {
@Test
void g01_counter() {
var a = ByteValue.create();
- for (byte i = 0; i < 10; i++) {
+ for (var i = 0; i < 10; i++) {
a.increment();
}
assertEquals((byte)10, a.get());
@@ -257,7 +257,7 @@ class ByteValue_Test extends TestBase {
@Test
void g03_conditionalCounter() {
var a = ByteValue.create();
- for (byte i = 0; i < 20; i++) {
+ for (var i = 0; i < 20; i++) {
a.setIf(i % 2 == 0, (byte)(a.get() + 1));
}
assertEquals((byte)10, a.get()); // 10 even numbers
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
index 51b5bc54a3..6e5c759f1f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
@@ -188,7 +188,7 @@ class Cache_Test extends TestBase {
.maxSize(5)
.build();
- for (int i = 1; i <= 5; i++) {
+ for (var i = 1; i <= 5; i++) {
final int index = i;
cache.get("key" + index, () -> "value" + index);
}
@@ -323,7 +323,7 @@ class Cache_Test extends TestBase {
// Submit 100 tasks that all try to cache the same key
var futures = new CompletableFuture[100];
- for (int i = 0; i < 100; i++) {
+ for (var i = 0; i < 100; i++) {
futures[i] = CompletableFuture.runAsync(() -> {
cache.get(1, () -> {
callCount.incrementAndGet();
@@ -349,7 +349,7 @@ class Cache_Test extends TestBase {
// Submit tasks for different keys
var futures = new CompletableFuture[10];
- for (int i = 0; i < 10; i++) {
+ for (var i = 0; i < 10; i++) {
final int key = i;
futures[i] = CompletableFuture.runAsync(() -> {
cache.get(key, () -> "value" + key);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/CharValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/CharValue_Test.java
index a5dd62c4ec..168a19af67 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/CharValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/CharValue_Test.java
@@ -176,7 +176,7 @@ class CharValue_Test extends TestBase {
var mostFrequent = CharValue.of('\0');
var maxCount = IntegerValue.create();
- for (char c = 'a'; c <= 'z'; c++) {
+ for (var c = 'a'; c <= 'z'; c++) {
final char current = c;
var count = IntegerValue.create();
text.chars().mapToObj(ch -> (char)ch).forEach(ch -> {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/DoubleValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/DoubleValue_Test.java
index b95a1ea01e..095724d763 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/DoubleValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/DoubleValue_Test.java
@@ -178,7 +178,7 @@ class DoubleValue_Test extends TestBase {
double rate = 0.05; // 5% interest
// Apply interest 3 times
- for (int i = 0; i < 3; i++) {
+ for (var i = 0; i < 3; i++) {
principal.set(principal.get() * (1 + rate));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/IntegerValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/IntegerValue_Test.java
index ed19941b7f..6c1058e332 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/IntegerValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/IntegerValue_Test.java
@@ -325,7 +325,7 @@ class IntegerValue_Test extends TestBase {
a.set(0);
assertEquals(0, a.get());
- for (int i = 0; i < 10; i++) {
+ for (var i = 0; i < 10; i++) {
a.getAndIncrement();
}
assertEquals(10, a.get());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/ReversedList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/ReversedList_Test.java
index cb520ea74b..efec612f20 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/ReversedList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/ReversedList_Test.java
@@ -393,7 +393,7 @@ class ReversedList_Test extends TestBase {
@Test
void i01_largeList() {
var original = new ArrayList<Integer>();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
original.add(i);
}
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 49263302a8..b299330e8b 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
@@ -1205,7 +1205,7 @@ public class ClassInfo_Test extends TestBase {
@Test
void getPrimitiveWrapper() {
- for (int i = 0; i < primitives.size(); i++)
+ for (var i = 0; i < primitives.size(); i++)
assertEquals(of(primitives.get(i)).getPrimitiveWrapper(),
primitiveWrappers.get(i));
assertNull(of(String.class).getPrimitiveWrapper());
}
@@ -1217,7 +1217,7 @@ public class ClassInfo_Test extends TestBase {
@Test
void getPrimitiveForWrapper() {
- for (int i = 0; i < primitives.size(); i++)
+ for (var i = 0; i < primitives.size(); i++)
assertEquals(of(primitiveWrappers.get(i)).getPrimitiveForWrapper(),
primitives.get(i));
assertNull(of(String.class).getPrimitiveForWrapper());
}
@@ -1229,7 +1229,7 @@ public class ClassInfo_Test extends TestBase {
@Test
void getWrapperIfPrimitive() {
- for (int i = 0; i < primitives.size(); i++)
+ for (var i = 0; i < primitives.size(); i++)
assertEquals(of(primitives.get(i)).getWrapperIfPrimitive().inner(),
primitiveWrappers.get(i));
assertEquals(of(String.class).getWrapperIfPrimitive().inner(),
String.class);
}
@@ -1245,7 +1245,7 @@ public class ClassInfo_Test extends TestBase {
@Test
void getWrapperIfPrimitive_asClassInfo() {
- for (int i = 0; i < primitives.size(); i++)
+ for (var i = 0; i < primitives.size(); i++)
assertEquals(of(primitives.get(i)).getWrapperIfPrimitive().inner(),
primitiveWrappers.get(i));
assertEquals(of(String.class).getWrapperIfPrimitive().inner(),
String.class);
}
@@ -1258,7 +1258,7 @@ public class ClassInfo_Test extends TestBase {
@Test
void getPrimitiveDefault() {
- for (int i = 0; i < primitives.size(); i++)
+ for (var i = 0; i < primitives.size(); i++)
assertEquals(of(primitives.get(i)).getPrimitiveDefault(),
primitiveDefaults.get(i));
assertNull(of(String.class).getPrimitiveDefault());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ThrowingSupplier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ThrowingSupplier_Test.java
index 72b871dbf8..11b14e6082 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ThrowingSupplier_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/reflect/ThrowingSupplier_Test.java
@@ -325,7 +325,7 @@ class ThrowingSupplier_Test extends TestBase {
// Test concurrent execution
var futures = new
ArrayList<java.util.concurrent.CompletableFuture<String>>();
- for (int i = 0; i < 10; i++) {
+ for (var i = 0; i < 10; i++) {
futures.add(java.util.concurrent.CompletableFuture.supplyAsync(() ->
safe(supplier)));
}
@@ -343,7 +343,7 @@ class ThrowingSupplier_Test extends TestBase {
// Test concurrent exception handling
var futures = new
ArrayList<java.util.concurrent.CompletableFuture<RuntimeException>>();
- for (int i = 0; i < 5; i++) {
+ for (var i = 0; i < 5; i++) {
futures.add(java.util.concurrent.CompletableFuture.supplyAsync(() -> {
try {
safe(throwingSupplier);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/ThrowableUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/ThrowableUtils_Test.java
index 553be78eb4..39c258920e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/ThrowableUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/ThrowableUtils_Test.java
@@ -71,7 +71,7 @@ class ThrowableUtils_Test extends TestBase {
@Test
void a03_findCause_longChain() {
Throwable cause = new IllegalStateException("root");
- for (int i = 0; i < 10; i++) {
+ for (var i = 0; i < 10; i++) {
cause = new RuntimeException("level" + i, cause);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
index 4ea424d5ee..322a4f007b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
@@ -3110,7 +3110,7 @@ class BasicHtml_Test extends TestBase {
}
private static void assertInstancesOf(Class<?> c, Object...values) {
- for (int i = 0; i < values.length; i++) {
+ for (var i = 0; i < values.length; i++) {
assertInstanceOf(c, values[i], fs("Object {0} not
expected type. Expected={1}, Actual={2}", i, c, scn(values[i])));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
index 54cf961858..10d3479bbb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
@@ -368,7 +368,7 @@ class AssertionArgs_Test extends TestBase {
// Simulate multiple threads modifying the same instance
var threads = new Thread[5];
- for (int i = 0; i < threads.length; i++) {
+ for (var i = 0; i < threads.length; i++) {
final int threadId = i;
threads[i] = new Thread(() -> {
sharedArgs.setMessage("Thread " + threadId + "
message");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
index cf5c81cd14..137fe61a96 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
@@ -477,7 +477,7 @@ class BasicBeanConverter_Test extends TestBase {
// Test performance with larger objects
var largeList = list();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
largeList.add("item_" + i);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
index 4ed3bac04c..c16fb4a849 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
@@ -150,7 +150,7 @@ class BeanConverter_Test extends TestBase {
// Large collection
var largeList = list();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
largeList.add(i);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
index a632de67dc..3e4495a5cc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
@@ -191,7 +191,7 @@ class Listifier_Test extends TestBase {
void c04_largeListHandling() {
Listifier<Integer> largeListGenerator = (converter,
count) -> {
List<Object> result = list();
- for (int i = 0; i < count; i++) {
+ for (var i = 0; i < count; i++) {
result.add("item_" + i);
}
return result;
@@ -280,7 +280,7 @@ class Listifier_Test extends TestBase {
void e01_performanceWithLargeLists() {
Listifier<Integer> rangeGenerator = (converter, count)
-> {
List<Object> result = list();
- for (int i = 0; i < count; i++) {
+ for (var i = 0; i < count; i++) {
result.add(i);
}
return result;
@@ -301,7 +301,7 @@ class Listifier_Test extends TestBase {
Listifier<String> memoryTest = (converter, str) -> {
// Create a reasonably sized list
List<Object> result = list();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
result.add(str + "_" + i);
}
return result;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
index f0736085c5..e0a09fc556 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
@@ -170,7 +170,7 @@ class NestedTokenizer_Test extends TestBase {
assertSize(1, tokens);
var current = tokens.get(0);
- for (int i = 1; i <= 5; i++) {
+ for (var i = 1; i <= 5; i++) {
assertEquals("l" + i, current.getValue());
assertSize(1, current.getNested());
current = current.getNested().get(0);
@@ -439,7 +439,7 @@ class NestedTokenizer_Test extends TestBase {
@Test void e02_performanceTest() {
// Test with large input to ensure reasonable performance
var sb = new StringBuilder();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
if (i > 0) sb.append(",");
sb.append("token").append(i);
if (i % 10 == 0) {
@@ -476,7 +476,7 @@ class NestedTokenizer_Test extends TestBase {
} else {
assertTrue(actual.hasNested());
assertEquals(expectedNested.length,
actual.getNested().size());
- for (int i = 0; i < expectedNested.length; i++) {
+ for (var i = 0; i < expectedNested.length; i++) {
assertEquals(expectedNested[i],
actual.getNested().get(i).getValue());
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
index 2e9605e6c7..bb9fbc38ce 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
@@ -299,7 +299,7 @@ class Stringifier_Test extends TestBase {
Stringifier<List<?>> listStringifier = (converter,
list) -> {
// Use the converter parameter to stringify
elements
var sb = new StringBuilder("[");
- for (int i = 0; i < list.size(); i++) {
+ for (var i = 0; i < list.size(); i++) {
if (i > 0) sb.append(",");
sb.append(converter.stringify(list.get(i)));
}
@@ -342,7 +342,7 @@ class Stringifier_Test extends TestBase {
void f01_performanceWithLargeStrings() {
Stringifier<String> largeStringHandler = (converter,
str) -> {
var sb = new StringBuilder();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
sb.append(str).append("_").append(i);
if (i < 999) sb.append(",");
}
@@ -364,7 +364,7 @@ class Stringifier_Test extends TestBase {
Stringifier<Integer> memoryTest = (converter, num) -> {
// Create a reasonably large string
var sb = new StringBuilder();
- for (int i = 0; i < num; i++) {
+ for (var i = 0; i < num; i++) {
sb.append("item_").append(i);
if (i < num - 1) sb.append(",");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
index 7b495a2b2c..c48347f21f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
@@ -398,7 +398,7 @@ class Swapper_Test extends TestBase {
// Test that simple swappers execute quickly
var start = System.nanoTime();
- for (int i = 0; i < 1000; i++) {
+ for (var i = 0; i < 1000; i++) {
simpleSwapper.apply(converter, "test" + i);
}
var end = System.nanoTime();
@@ -420,7 +420,7 @@ class Swapper_Test extends TestBase {
var testList = l("z", "a", "m", "c", "x");
var start = System.nanoTime();
- for (int i = 0; i < 100; i++) {
+ for (var i = 0; i < 100; i++) {
complexSwapper.apply(converter, testList);
}
var end = System.nanoTime();
