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 ff7c38d96b SonarQube bug fixes
ff7c38d96b is described below
commit ff7c38d96b6346ed58ee28557bf72144119a4b1a
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 20:20:22 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/commons/collections/BidiMap.java | 8 ++--
.../apache/juneau/commons/inject/BeanCreator2.java | 52 +++++++++++-----------
.../apache/juneau/commons/reflect/ClassInfo.java | 26 +++++------
.../apache/juneau/commons/reflect/FieldInfo.java | 6 +--
.../juneau/commons/reflect/ParameterInfo.java | 6 +--
.../main/java/org/apache/juneau/MediaRange.java | 18 ++++----
.../main/java/org/apache/juneau/StringRange.java | 22 ++++-----
.../main/java/org/apache/juneau/cp/Messages.java | 16 +++----
.../java/org/apache/juneau/html/HtmlClassMeta.java | 24 +++++-----
.../org/apache/juneau/httppart/HttpPartSchema.java | 34 +++++++-------
.../juneau/httppart/bean/ResponseBeanMeta.java | 10 ++---
.../java/org/apache/juneau/json/JsonClassMeta.java | 6 +--
.../juneau/jsonschema/JsonSchemaGenerator.java | 6 +--
.../org/apache/juneau/objecttools/SortArgs.java | 6 +--
.../org/apache/juneau/swap/AutoNumberSwap.java | 8 ++--
.../juneau/urlencoding/UrlEncodingClassMeta.java | 6 +--
.../apache/juneau/microservice/Microservice.java | 36 +++++++--------
.../microservice/resources/LogsResource.java | 2 +-
.../springboot/template/HelloWorldResource.java | 6 +--
.../org/apache/juneau/rest/client/RestRequest.java | 28 ++++++------
.../juneau/rest/client/remote/RemoteMeta.java | 16 +++----
.../juneau/http/header/SerializedHeader.java | 8 ++--
.../apache/juneau/http/part/SerializedPart.java | 8 ++--
.../juneau/http/remote/RrpcInterfaceMeta.java | 18 ++++----
.../java/org/apache/juneau/rest/RestContext.java | 12 ++---
.../java/org/apache/juneau/rest/RestOpContext.java | 18 ++++----
.../java/org/apache/juneau/rest/RestResponse.java | 4 +-
.../apache/juneau/rest/arg/ResponseBeanArg.java | 8 ++--
.../juneau/rest/httppart/RequestContent.java | 4 +-
.../org/apache/juneau/rest/logger/CallLogger.java | 12 ++---
.../apache/juneau/rest/servlet/RestServlet.java | 6 +--
.../apache/juneau/rest/util/UrlPathMatcher.java | 20 ++++-----
.../java/org/apache/juneau/BeanContext_Test.java | 24 +++++-----
.../juneau/commons/reflect/ClassInfo_Test.java | 30 ++++++-------
.../commons/reflect/ExecutableInfo_Test.java | 2 +-
.../juneau/commons/reflect/FieldInfo_Test.java | 2 +-
36 files changed, 259 insertions(+), 259 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
index bb84397ef7..d717ccaaab 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
@@ -182,10 +182,10 @@ public class BidiMap<K,V> implements Map<K,V> {
* @param builder The builder containing the initial entries.
*/
public BidiMap(Builder<K,V> builder) {
- var forward = builder.map.entrySet().stream().filter(x ->
nn(x.getKey()) && nn(x.getValue())).collect(toMap(Map.Entry::getKey,
Map.Entry::getValue, (a, b) -> b, LinkedHashMap::new));
- var reverse = builder.map.entrySet().stream().filter(x ->
nn(x.getKey()) && nn(x.getValue())).collect(toMap(Map.Entry::getValue,
Map.Entry::getKey, (a, b) -> b, LinkedHashMap::new));
- this.forward = builder.unmodifiable ? unmodifiableMap(forward)
: forward;
- this.reverse = builder.unmodifiable ? unmodifiableMap(reverse)
: reverse;
+ var forward2 = builder.map.entrySet().stream().filter(x ->
nn(x.getKey()) && nn(x.getValue())).collect(toMap(Map.Entry::getKey,
Map.Entry::getValue, (a, b) -> b, LinkedHashMap::new));
+ var reverse2 = builder.map.entrySet().stream().filter(x ->
nn(x.getKey()) && nn(x.getValue())).collect(toMap(Map.Entry::getValue,
Map.Entry::getKey, (a, b) -> b, LinkedHashMap::new));
+ this.forward = builder.unmodifiable ? unmodifiableMap(forward2)
: forward2;
+ this.reverse = builder.unmodifiable ? unmodifiableMap(reverse2)
: reverse2;
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
index fef6c12b80..a36597da50 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
@@ -1105,23 +1105,23 @@ public class BeanCreator2<T> {
*/
@SuppressWarnings({ "unchecked", "java:S3776", "java:S6541" })
private T findBeanImpl() {
- var store = this.store;
- var builder = explicitBuilder != null ? explicitBuilder :
this.builder.get(); // Use explicit builder if set, otherwise get from supplier
+ var store2 = this.store;
+ var builder2 = explicitBuilder != null ? explicitBuilder :
this.builder.get(); // Use explicit builder if set, otherwise get from supplier
T bean = null;
var methodComparator =
comparing(MethodInfo::getParameterCount).reversed();
var constructorComparator =
comparing(ConstructorInfo::getParameterCount).reversed();
- if (builder != null) {
- log("Builder detected: %s",
builder.getClass().getName());
+ if (builder2 != null) {
+ log("Builder detected: %s",
builder2.getClass().getName());
// Look for Builder.build()/create()/get() - REQUIRED
// Uses buildMethodNames configuration (defaults to
"build", "create", "get")
// Check declared methods first to get the most
specific override, then fall back to public methods
- var buildMethod =
info(builder.getClass()).getPublicMethods().stream()
+ var buildMethod =
info(builder2.getClass()).getPublicMethods().stream()
.filter(x -> x.isAll(NOT_STATIC,
NOT_DEPRECATED, NOT_SYNTHETIC, NOT_BRIDGE))
.filter(x ->
buildMethodNames.contains(x.getNameSimple()))
.filter(x -> opt(x).map(x2 ->
x2.getReturnType()).filter(x2 -> x2.is(beanSubType.inner()) ||
x2.isParentOf(beanSubType)).isPresent()) // Accept methods that return
beanSubType or a parent type of beanSubType
- .filter(x ->
x.getAnnotations().stream().map(AnnotationInfo::getNameSimple).anyMatch(n ->
eqAny(n, "Inject", "Autowired")) ? x.canResolveAllParameters(store) :
x.getParameterCount() == 0)
+ .filter(x ->
x.getAnnotations().stream().map(AnnotationInfo::getNameSimple).anyMatch(n ->
eqAny(n, "Inject", "Autowired")) ? x.canResolveAllParameters(store2) :
x.getParameterCount() == 0)
.sorted(methodComparator)
.findFirst();
@@ -1129,7 +1129,7 @@ public class BeanCreator2<T> {
var method = buildMethod.get();
log("Found build method: %s",
method.getNameFull());
log("Method declaring class: %s",
method.getDeclaringClass().getName());
- log("Builder class: %s",
builder.getClass().getName());
+ log("Builder class: %s",
builder2.getClass().getName());
var returnType = method.getReturnType();
log("Method return type: %s",
returnType.getName());
log("Expected beanSubType: %s",
beanSubType.getName());
@@ -1143,7 +1143,7 @@ public class BeanCreator2<T> {
}
// Call the builder method
- Object builtBean = method.inject(store,
builder);
+ Object builtBean = method.inject(store2,
builder2);
// Builder build method must return the exact
beanSubType
if (!returnType.is(beanSubType.inner())) {
@@ -1163,11 +1163,11 @@ public class BeanCreator2<T> {
// Builder was found but no appropriate build method
was found
// Try fallback: look for ANY method on builder that
returns the exact bean type
log("Attempting Builder.anything()");
- var anyMethod =
info(builder.getClass()).getPublicMethods().stream()
+ var anyMethod =
info(builder2.getClass()).getPublicMethods().stream()
.filter(x -> x.isAll(NOT_STATIC,
NOT_DEPRECATED, NOT_SYNTHETIC, NOT_BRIDGE))
.filter(x ->
!buildMethodNames.contains(x.getNameSimple())) // Skip standard build methods
we already checked
.filter(x ->
x.getReturnType().is(beanSubType.inner())) // Must return exact beanSubType,
not parent
- .filter(x ->
x.getAnnotations().stream().map(AnnotationInfo::getNameSimple).anyMatch(n ->
eqAny(n, "Inject", "Autowired")) ? x.canResolveAllParameters(store) :
x.getParameterCount() == 0)
+ .filter(x ->
x.getAnnotations().stream().map(AnnotationInfo::getNameSimple).anyMatch(n ->
eqAny(n, "Inject", "Autowired")) ? x.canResolveAllParameters(store2) :
x.getParameterCount() == 0)
.sorted(methodComparator)
.findFirst();
@@ -1177,7 +1177,7 @@ public class BeanCreator2<T> {
var returnType = method.getReturnType();
// Call the builder method
- Object builtBean = method.inject(store,
builder);
+ Object builtBean = method.inject(store2,
builder2);
// Builder method must return the exact
beanSubType
if (!returnType.is(beanSubType.inner())) {
@@ -1212,12 +1212,12 @@ public class BeanCreator2<T> {
if (hasAnyMethodWithRightReturnType &&
!hasBuildMethodWithRightReturnType) {
// Builder has a method returning the right
type but not with the expected name
- log("Builder detected but no appropriate build
method found. Builder type: %s. Expected method names: %s",
builder.getClass().getName(), buildMethodNames);
+ log("Builder detected but no appropriate build
method found. Builder type: %s. Expected method names: %s",
builder2.getClass().getName(), buildMethodNames);
// Fall through to factory methods/constructors
} else if (hasBuildMethodWithRightReturnType ||
isExplicitBuilder || isValidBuilder) {
// Builder has a build method with right return
type (even if can't be called) or was explicitly set
// Throw exception unless fallback exists
- log("Builder detected but no appropriate build
method found. Builder type: %s. Expected method names: %s",
builder.getClass().getName(), buildMethodNames);
+ log("Builder detected but no appropriate build
method found. Builder type: %s. Expected method names: %s",
builder2.getClass().getName(), buildMethodNames);
if (fallbackSupplier != null) {
log("Using fallback supplier");
@@ -1227,27 +1227,27 @@ public class BeanCreator2<T> {
}
log("Failed to create bean using builder");
- throw exex("Could not instantiate class {0}
using builder type {1}. Builder must have a build(), create(), or get() method
that returns {0}. The method may have @Inject annotation to allow injected
parameters.", beanSubType.getName(), builderTypeInfo != null ?
builderTypeInfo.getName() : builder.getClass().getName());
+ throw exex("Could not instantiate class {0}
using builder type {1}. Builder must have a build(), create(), or get() method
that returns {0}. The method may have @Inject annotation to allow injected
parameters.", beanSubType.getName(), builderTypeInfo != null ?
builderTypeInfo.getName() : builder2.getClass().getName());
} else {
// Builder type is invalid and was
auto-detected - fall through to factory methods/constructors
- log("Builder detected but builder type is
invalid. Builder type: %s. Falling back to factory methods/constructors.",
builder.getClass().getName());
+ log("Builder detected but builder type is
invalid. Builder type: %s. Falling back to factory methods/constructors.",
builder2.getClass().getName());
}
}
// Look for Bean.factoryMethod().
log("Attempting Bean.factoryMethod()");
// If builder was detected but has no build method, pass it as
extra bean for factory methods
- Object[] factoryMethodExtraBeans = builder != null ? new
Object[]{builder} : new Object[0];
+ Object[] factoryMethodExtraBeans = builder2 != null ? new
Object[]{builder2} : new Object[0];
bean = beanSubType.getPublicMethods().stream()
.filter(x -> x.isAll(STATIC, NOT_DEPRECATED,
NOT_SYNTHETIC, NOT_BRIDGE))
.filter(x ->
factoryMethodNames.contains(x.getNameSimple()))
.filter(x -> x.hasReturnType(beanSubType))
- .filter(x -> x.canResolveAllParameters(store,
factoryMethodExtraBeans))
+ .filter(x -> x.canResolveAllParameters(store2,
factoryMethodExtraBeans))
.sorted(methodComparator)
.findFirst()
.map(x -> {
log("Found factory method: %s",
x.getNameFull());
- return (T)beanType.cast(x.inject(store, null,
factoryMethodExtraBeans));
+ return (T)beanType.cast(x.inject(store2, null,
factoryMethodExtraBeans));
})
.orElse(null);
@@ -1255,16 +1255,16 @@ public class BeanCreator2<T> {
if (bean == null) {
log("Attempting Bean() constructor");
// If builder was detected but has no build method,
pass it as extra bean for constructors
- Object[] constructorExtraBeans = builder != null ? new
Object[]{builder} : new Object[0];
+ Object[] constructorExtraBeans = builder2 != null ? new
Object[]{builder2} : new Object[0];
bean = beanSubType.getPublicConstructors().stream()
.filter(x -> x.isAll(NOT_DEPRECATED))
.filter(x -> x.isDeclaringClass(beanSubType))
- .filter(x -> x.canResolveAllParameters(store,
enclosingInstance, constructorExtraBeans))
+ .filter(x -> x.canResolveAllParameters(store2,
enclosingInstance, constructorExtraBeans))
.sorted(constructorComparator)
.findFirst()
.map(x -> {
log("Found constructor: %s",
x.getNameFull());
- return (T)beanType.cast(x.inject(store,
enclosingInstance, constructorExtraBeans));
+ return
(T)beanType.cast(x.inject(store2, enclosingInstance, constructorExtraBeans));
})
.orElse(null);
}
@@ -1359,10 +1359,10 @@ public class BeanCreator2<T> {
private Object findBuilder() {
var bs = store;
- var builderType = this.builderType.get();
+ var builderType2 = this.builderType.get();
// If no builder type was determined, return null (builder not
needed)
- if (builderType == null)
+ if (builderType2 == null)
return null;
Optional<Object> r;
@@ -1371,7 +1371,7 @@ public class BeanCreator2<T> {
r = beanSubType.getPublicMethods().stream()
.filter(x -> x.isAll(STATIC, NOT_DEPRECATED,
NOT_SYNTHETIC, NOT_BRIDGE))
.filter(x ->
builderMethodNames.contains(x.getNameSimple()))
- .filter(x -> x.hasReturnType(builderType))
+ .filter(x -> x.hasReturnType(builderType2))
.filter(x -> x.canResolveAllParameters(bs,
enclosingInstance))
.sorted(comparing(MethodInfo::getParameterCount).reversed())
.findFirst()
@@ -1380,7 +1380,7 @@ public class BeanCreator2<T> {
return r.get();
// Step 2: Look for a public constructor on the builder type
- r = builderType.getPublicConstructors().stream()
+ r = builderType2.getPublicConstructors().stream()
.filter(x -> x.isAll(NOT_DEPRECATED))
.filter(x -> x.canResolveAllParameters(bs,
enclosingInstance))
.sorted(comparing(ConstructorInfo::getParameterCount).reversed())
@@ -1391,7 +1391,7 @@ public class BeanCreator2<T> {
return r.get();
// Step 3: Look for a protected constructor on the builder type
- r = builderType.getDeclaredConstructors().stream()
+ r = builderType2.getDeclaredConstructors().stream()
.filter(x -> x.isAll(ElementFlag.PROTECTED,
NOT_DEPRECATED))
.filter(x -> x.canResolveAllParameters(bs,
enclosingInstance))
.sorted(comparing(ConstructorInfo::getParameterCount).reversed())
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
index d2a09b60b6..79332c0e6a 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
@@ -303,8 +303,8 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
// Handle arrays - format component type recursively, then add
array notation
if (dim > 0) {
- var componentType = getComponentType();
- componentType.appendNameFormatted(sb, nameFormat,
includeTypeParams, separator, arrayFormat);
+ var componentType2 = getComponentType();
+ componentType2.appendNameFormatted(sb, nameFormat,
includeTypeParams, separator, arrayFormat);
if (arrayFormat == ClassArrayFormat.WORD) {
for (var i = 0; i < dim; i++)
@@ -2662,9 +2662,9 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
var list = new ArrayList<AnnotationInfo<Annotation>>();
// On all parent classes and interfaces (properly traversed to
avoid duplicates)
- var parentsAndInterfaces = getParentsAndInterfaces();
- for (var i = 0; i < parentsAndInterfaces.size(); i++) {
- var ci = parentsAndInterfaces.get(i);
+ var parentsAndInterfaces2 = getParentsAndInterfaces();
+ for (var i = 0; i < parentsAndInterfaces2.size(); i++) {
+ var ci = parentsAndInterfaces2.get(i);
// Add declared annotations from this class/interface
for (var a : ci.inner().getDeclaredAnnotations())
streamRepeated(a).forEach(a2 -> list.add(ai(ci,
a2)));
@@ -2744,15 +2744,15 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
var set = new LinkedHashSet<ClassInfo>();
// Process all parent classes (includes this class)
- var parents = getParents();
- for (var i = 0; i < parents.size(); i++) {
- var parent = parents.get(i);
+ var parents2 = getParents();
+ for (var i = 0; i < parents2.size(); i++) {
+ var parent = parents2.get(i);
set.add(parent);
// Process interfaces declared on this parent (and
their parent interfaces)
- var declaredInterfaces = parent.getDeclaredInterfaces();
- for (var j = 0; j < declaredInterfaces.size(); j++)
- addInterfaceHierarchy(set,
declaredInterfaces.get(j));
+ var declaredInterfaces2 =
parent.getDeclaredInterfaces();
+ for (var j = 0; j < declaredInterfaces2.size(); j++)
+ addInterfaceHierarchy(set,
declaredInterfaces2.get(j));
}
return u(toList(set));
@@ -2886,9 +2886,9 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
public boolean isInjectCollectionType() {
if (isArray())
return true;
- var inner = opt(this.inner()).orElse(Object.class);
+ var inner2 = opt(this.inner()).orElse(Object.class);
// Only match the exact interfaces, not their implementations
(matches Spring's behavior)
- return eq(inner, List.class) || eq(inner, Set.class) ||
eq(inner, Map.class);
+ return eq(inner2, List.class) || eq(inner2, Set.class) ||
eq(inner2, Map.class);
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
index ef1d42a693..991b0158f1 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
@@ -610,16 +610,16 @@ public class FieldInfo extends AccessibleInfo implements
Comparable<FieldInfo>,
elementType =
ptUnwrapped.getComponentType().inner();
} else {
Type parameterizedType = fieldType.innerType();
- var inner =
opt(ptUnwrapped.inner()).orElse(Object.class);
+ var inner2 =
opt(ptUnwrapped.inner()).orElse(Object.class);
- if (eq(inner, List.class) || eq(inner,
Set.class)) {
+ if (eq(inner2, List.class) || eq(inner2,
Set.class)) {
if (parameterizedType instanceof
ParameterizedType pt2) {
var typeArgs =
pt2.getActualTypeArguments();
if (typeArgs.length > 0 &&
typeArgs[0] instanceof Class<?> elementClass) {
elementType =
elementClass;
}
}
- } else if (eq(inner, Map.class)) {
+ } else if (eq(inner2, Map.class)) {
if (parameterizedType instanceof
ParameterizedType pt2) {
var typeArgs =
pt2.getActualTypeArguments();
if (typeArgs.length >= 2 &&
typeArgs[0] == String.class && typeArgs[1] instanceof Class<?> valueClass) {
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
index 3b924cdc39..3347780a5d 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
@@ -913,15 +913,15 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
}
// Handle List<T> or Set<T>
- var inner =
opt(ptu.inner()).orElse(Object.class);
- if (eq(inner, List.class) || eq(inner,
Set.class)) {
+ var inner2 =
opt(ptu.inner()).orElse(Object.class);
+ if (eq(inner2, List.class) || eq(inner2,
Set.class)) {
if (parameterizedType instanceof
ParameterizedType pt2) {
var typeArgs =
pt2.getActualTypeArguments();
if (typeArgs.length > 0 &&
typeArgs[0] instanceof Class<?> elementClass) {
elementType =
elementClass;
}
}
- } else if (eq(inner, Map.class)) {
+ } else if (eq(inner2, Map.class)) {
// Handle Map<String,T> - extract value
type (second type argument)
if (parameterizedType instanceof
ParameterizedType pt2) {
var typeArgs =
pt2.getActualTypeArguments();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
index 5acd04978d..cc092d76ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
@@ -47,35 +47,35 @@ public class MediaRange extends MediaType {
public MediaRange(HeaderElement e) {
super(e);
- Float qValue = 1f;
+ Float qValue2 = 1f;
// The media type consists of everything up to the q parameter.
// The q parameter and stuff after is part of the range.
- List<NameValuePair> extensions = list();
+ List<NameValuePair> extensions2 = list();
boolean foundQ = false;
for (var p : e.getParameters()) {
if (p.getName().equals("q")) {
- qValue = Float.parseFloat(p.getValue());
+ qValue2 = Float.parseFloat(p.getValue());
foundQ = true;
} else if (foundQ) {
- extensions.add(new
BasicNameValuePair(p.getName(), p.getValue()));
+ extensions2.add(new
BasicNameValuePair(p.getName(), p.getValue()));
}
}
- this.qValue = qValue;
- this.extensions = extensions.toArray(new
NameValuePair[extensions.size()]);
+ this.qValue = qValue2;
+ this.extensions = extensions2.toArray(new
NameValuePair[extensions2.size()]);
var sb = new StringBuffer().append(super.toString());
// '1' is equivalent to specifying no qValue. If there's no
extensions, then we won't include a qValue.
- if (qValue.floatValue() == 1.0) {
+ if (qValue2.floatValue() == 1.0) {
if (this.extensions.length > 0) {
sb.append(";q=").append(qValue);
- extensions.forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
+ Arrays.stream(extensions).forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
}
} else {
sb.append(";q=").append(qValue);
- extensions.forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
+ Arrays.stream(extensions).forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
}
string = sb.toString();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
index 1c0cf20df1..e029866b52 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
@@ -64,35 +64,35 @@ public class StringRange {
* @param e The parsed string range element.
*/
public StringRange(HeaderElement e) {
- Float qValue = 1f;
+ Float qValue2 = 1f;
// The media type consists of everything up to the q parameter.
// The q parameter and stuff after is part of the range.
- List<NameValuePair> extensions = list();
+ List<NameValuePair> extensions2 = list();
for (var p : e.getParameters()) {
if (p.getName().equals("q")) {
- qValue = Float.parseFloat(p.getValue());
+ qValue2 = Float.parseFloat(p.getValue());
} else {
- extensions.add(new
BasicNameValuePair(p.getName(), p.getValue()));
+ extensions2.add(new
BasicNameValuePair(p.getName(), p.getValue()));
}
}
- this.qValue = qValue;
- this.extensions = extensions.toArray(new
NameValuePair[extensions.size()]);
+ this.qValue = qValue2;
+ this.extensions = extensions2.toArray(new
NameValuePair[extensions2.size()]);
this.name = e.getName();
var sb = new StringBuffer();
sb.append(name);
// '1' is equivalent to specifying no qValue. If there's no
extensions, then we won't include a qValue.
- if (Float.compare(qValue.floatValue(), 1f) == 0) {
+ if (Float.compare(qValue2.floatValue(), 1f) == 0) {
if (this.extensions.length > 0) {
- sb.append(";q=").append(qValue);
- extensions.forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
+ sb.append(";q=").append(qValue2);
+ extensions2.forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
}
} else {
- sb.append(";q=").append(qValue);
- extensions.forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
+ sb.append(";q=").append(qValue2);
+ extensions2.forEach(x ->
sb.append(';').append(x.getName()).append('=').append(x.getValue()));
}
string = sb.toString();
}
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 c171afc178..1f9cbfa777 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
@@ -360,29 +360,29 @@ public class Messages extends ResourceBundle {
setParent(parent);
this.locale = locale == null ? Locale.getDefault() : locale;
- var keyMap = new TreeMap<String,String>();
+ var keyMap2 = new TreeMap<String,String>();
var cn = cns(c) + '.';
if (nn(rb)) {
rb.keySet().forEach(x -> {
- keyMap.put(x, x);
+ keyMap2.put(x, x);
if (x.startsWith(cn)) {
var shortKey = x.substring(cn.length());
- keyMap.put(shortKey, x);
+ keyMap2.put(shortKey, x);
}
});
}
if (nn(parent2)) {
parent2.keySet().forEach(x -> {
- keyMap.put(x, x);
+ keyMap2.put(x, x);
if (x.startsWith(cn)) {
var shortKey = x.substring(cn.length());
- keyMap.put(shortKey, x);
+ keyMap2.put(shortKey, x);
}
});
}
- this.keyMap = u(copyOf(keyMap));
+ this.keyMap = u(copyOf(keyMap2));
this.rbKeys = rb == null ? Collections.emptySet() : rb.keySet();
}
@@ -419,8 +419,8 @@ public class Messages extends ResourceBundle {
var mb = localizedMessages.get(locale);
if (mb == null) {
var parent = this.parent2 == null ? null :
this.parent2.forLocale(locale);
- var rb = this.rb == null ? null :
findBundle(this.rb.getBaseBundleName(), locale, c.getClassLoader());
- mb = new Messages(c, rb, locale, parent);
+ var rb2 = this.rb == null ? null :
findBundle(this.rb.getBaseBundleName(), locale, c.getClassLoader());
+ mb = new Messages(c, rb2, locale, parent);
localizedMessages.put(locale, mb);
}
return mb;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
index 4b6e80a6a1..6084950b8f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
@@ -49,21 +49,21 @@ public class HtmlClassMeta extends ExtendedClassMeta {
public HtmlClassMeta(ClassMeta<?> cm, HtmlMetaProvider mp) {
super(cm);
- var noTables = Value.<Boolean>empty();
- var noTableHeaders = Value.<Boolean>empty();
- var format = Value.<HtmlFormat>empty();
- var render = Value.<HtmlRender<?>>empty();
+ var noTables2 = Value.<Boolean>empty();
+ var noTableHeaders2 = Value.<Boolean>empty();
+ var format2 = Value.<HtmlFormat>empty();
+ var render2 = Value.<HtmlRender<?>>empty();
Consumer<Html> c = x -> {
if (x.noTables())
- noTables.set(true);
+ noTables2.set(true);
if (x.noTableHeaders())
- noTableHeaders.set(true);
+ noTableHeaders2.set(true);
if (x.format() != HtmlFormat.HTML)
- format.set(x.format());
+ format2.set(x.format());
if (x.render() != HtmlRender.class) {
try {
-
render.set(x.render().getDeclaredConstructor().newInstance());
+
render2.set(x.render().getDeclaredConstructor().newInstance());
} catch (Exception e) {
throw toRex(e);
}
@@ -71,10 +71,10 @@ public class HtmlClassMeta extends ExtendedClassMeta {
};
cm.forEachAnnotation(Html.class, x -> true, c);
- this.noTables = noTables.orElse(false);
- this.noTableHeaders = noTableHeaders.orElse(false);
- this.render = render.orElse(null);
- this.format = format.orElse(HtmlFormat.HTML);
+ this.noTables = noTables2.orElse(false);
+ this.noTableHeaders = noTableHeaders2.orElse(false);
+ this.render = render2.orElse(null);
+ this.format = format2.orElse(HtmlFormat.HTML);
}
/**
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 cdf53731f7..c8dea949d1 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
@@ -3684,31 +3684,31 @@ public class HttpPartSchema {
exclusiveMinimumValue = b.exclusiveMinimumValue;
// Calculate parse type
- Class<?> parsedType = Object.class;
+ Class<?> parsedType2 = Object.class;
if (type == ARRAY) {
if (nn(items))
- parsedType =
Array.newInstance(items.parsedType.inner(), 0).getClass();
+ parsedType2 =
Array.newInstance(items.parsedType.inner(), 0).getClass();
} else if (type == BOOLEAN) {
- parsedType = Boolean.class;
+ parsedType2 = Boolean.class;
} else if (type == INTEGER) {
if (format == INT64)
- parsedType = Long.class;
+ parsedType2 = Long.class;
else
- parsedType = Integer.class;
+ parsedType2 = Integer.class;
} else if (type == NUMBER) {
if (format == DOUBLE)
- parsedType = Double.class;
+ parsedType2 = Double.class;
else
- parsedType = Float.class;
+ parsedType2 = Float.class;
} else if (type == STRING) {
if (format == BYTE || format == BINARY || format ==
BINARY_SPACED)
- parsedType = byte[].class;
+ parsedType2 = byte[].class;
else if (format == DATE || format == DATE_TIME)
- parsedType = Calendar.class;
+ parsedType2 = Calendar.class;
else
- parsedType = String.class;
+ parsedType2 = String.class;
}
- this.parsedType = BeanContext.DEFAULT.getClassMeta(parsedType);
+ this.parsedType = BeanContext.DEFAULT.getClassMeta(parsedType2);
if (b.noValidate)
return;
@@ -4251,10 +4251,10 @@ public class HttpPartSchema {
throw new
SchemaValidationException("Maximum number of items exceeded.");
if (! isValidUniqueItems(o))
throw new
SchemaValidationException("Duplicate items not allowed.");
- HttpPartSchema items = getItems();
- if (nn(items))
+ HttpPartSchema items2 = getItems();
+ if (nn(items2))
for (var i = 0; i <
Array.getLength(o); i++)
-
items.validateOutput(Array.get(o, i), bc);
+
items2.validateOutput(Array.get(o, i), bc);
} else if (cm.isCollection()) {
Collection<?> c = (Collection<?>)o;
if (! isValidMinItems(c))
@@ -4263,9 +4263,9 @@ public class HttpPartSchema {
throw new
SchemaValidationException("Maximum number of items exceeded.");
if (! isValidUniqueItems(c))
throw new
SchemaValidationException("Duplicate items not allowed.");
- HttpPartSchema items = getItems();
- if (nn(items))
- c.forEach(x ->
items.validateOutput(x, bc));
+ HttpPartSchema items2 = getItems();
+ if (nn(items2))
+ c.forEach(x ->
items2.validateOutput(x, bc));
}
break;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index b8f3dc5efa..5fd063b931 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -187,13 +187,13 @@ public class ResponseBeanMeta {
partParser = opt(b.partParser).map(x ->
HttpPartParser.creator().type(x).apply(b.annotations).create());
schema = b.schema.build();
- Map<String,ResponseBeanPropertyMeta> properties = map();
+ Map<String,ResponseBeanPropertyMeta> properties2 = map();
Map<String,ResponseBeanPropertyMeta> hm = map();
b.headerMethods.forEach((k, v) -> {
ResponseBeanPropertyMeta pm = v.build(partSerializer,
partParser);
hm.put(k, pm);
- properties.put(pm.getGetter().getName(), pm);
+ properties2.put(pm.getGetter().getName(), pm);
});
this.headerMethods = u(hm);
@@ -201,11 +201,11 @@ public class ResponseBeanMeta {
statusMethod = b.statusMethod == null ? null :
b.statusMethod.build(opte(), opte());
if (nn(contentMethod))
- properties.put(contentMethod.getGetter().getName(),
contentMethod);
+ properties2.put(contentMethod.getGetter().getName(),
contentMethod);
if (nn(statusMethod))
- properties.put(statusMethod.getGetter().getName(),
statusMethod);
+ properties2.put(statusMethod.getGetter().getName(),
statusMethod);
- this.properties = u(properties);
+ this.properties = u(properties2);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
index e19c48d7d7..41876b8802 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
@@ -44,9 +44,9 @@ public class JsonClassMeta extends ExtendedClassMeta {
public JsonClassMeta(ClassMeta<?> cm, JsonMetaProvider mp) {
super(cm);
- var wrapperAttr = Value.<String>empty();
- cm.forEachAnnotation(Json.class, x -> ne(x.wrapperAttr()), x ->
wrapperAttr.set(x.wrapperAttr()));
- this.wrapperAttr = wrapperAttr.orElse(null);
+ var wrapperAttr2 = Value.<String>empty();
+ cm.forEachAnnotation(Json.class, x -> ne(x.wrapperAttr()), x ->
wrapperAttr2.set(x.wrapperAttr()));
+ this.wrapperAttr = wrapperAttr2.orElse(null);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index bc1997855e..a216c8ef27 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -873,9 +873,9 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
ignoreTypes = builder.ignoreTypes == null ?
Collections.emptySet() : new TreeSet<>(builder.ignoreTypes);
useBeanDefs = builder.useBeanDefs;
- Set<Pattern> ignoreTypePatterns = set();
- ignoreTypes.forEach(y -> split(y, x ->
ignoreTypePatterns.add(Pattern.compile(x.replace(".", "\\.").replace("*",
".*")))));
- this.ignoreTypePatterns = u(new
ArrayList<>(ignoreTypePatterns));
+ Set<Pattern> ignoreTypePatterns2 = set();
+ ignoreTypes.forEach(y -> split(y, x ->
ignoreTypePatterns2.add(Pattern.compile(x.replace(".", "\\.").replace("*",
".*")))));
+ this.ignoreTypePatterns = u(new
ArrayList<>(ignoreTypePatterns2));
try {
beanDefMapperBean =
beanDefMapper.getDeclaredConstructor().newInstance();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
index cf13d54177..71087f547e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
@@ -85,16 +85,16 @@ public class SortArgs {
* </ul>
*/
public SortArgs(Collection<String> sortArgs) {
- Map<String,Boolean> sort = map();
+ Map<String,Boolean> sort2 = map();
sortArgs.forEach(s -> {
var isDesc = false;
if (endsWithAny(s, '-', '+')) {
isDesc = endsWith(s, '-');
s = s.substring(0, s.length() - 1);
}
- sort.put(s, isDesc);
+ sort2.put(s, isDesc);
});
- this.sort = u(sort);
+ this.sort = u(sort2);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index 04c823bebb..756f6f2ba0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -209,17 +209,17 @@ public class AutoNumberSwap<T> extends
ObjectSwap<T,Number> {
this.unswapMethod = unswapMethod == null ? null :
bc.getBeanMethodVisibility().transform(unswapMethod.inner());
this.unswapConstructor = unswapConstructor == null ? null :
bc.getBeanConstructorVisibility().transform(unswapConstructor.inner());
- Class<?> unswapType = null;
+ Class<?> unswapType2 = null;
if (nn(unswapMethod)) {
for (var pi : unswapMethod.getParameters())
if (!
pi.getParameterType().is(BeanSession.class))
- unswapType =
pi.getParameterType().getWrapperIfPrimitive().inner();
+ unswapType2 =
pi.getParameterType().getWrapperIfPrimitive().inner();
} else if (nn(unswapConstructor)) {
for (var pi : unswapConstructor.getParameters())
if (!
pi.getParameterType().is(BeanSession.class))
- unswapType =
pi.getParameterType().getWrapperIfPrimitive().inner();
+ unswapType2 =
pi.getParameterType().getWrapperIfPrimitive().inner();
}
- this.unswapType = unswapType;
+ this.unswapType = unswapType2;
}
@Override /* Overridden from ObjectSwap */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
index 2f11c8706c..b7a2e7073a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
@@ -40,9 +40,9 @@ public class UrlEncodingClassMeta extends ExtendedClassMeta {
public UrlEncodingClassMeta(ClassMeta<?> cm, UrlEncodingMetaProvider
mp) {
super(cm);
- var expandedParams = Value.<Boolean>empty();
- cm.forEachAnnotation(UrlEncoding.class,
UrlEncoding::expandedParams, x -> expandedParams.set(true));
- this.expandedParams = expandedParams.orElse(false);
+ var expandedParams2 = Value.<Boolean>empty();
+ cm.forEachAnnotation(UrlEncoding.class,
UrlEncoding::expandedParams, x -> expandedParams2.set(true));
+ this.expandedParams = expandedParams2.orElse(false);
}
/**
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index 225f5216b6..3cd4319873 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -573,8 +573,8 @@ public class Microservice implements ConfigEventListener {
//
--------------------------------------------------------------------------------
// Try to get the manifest file if it wasn't already set.
//
--------------------------------------------------------------------------------
- var manifest = builder.manifest;
- if (manifest == null) {
+ var manifest2 = builder.manifest;
+ if (manifest2 == null) {
var m = new Manifest();
// If running within an eclipse workspace, need to get
it from the file system.
@@ -596,17 +596,17 @@ public class Microservice implements ConfigEventListener {
}
}
}
- manifest = new ManifestFile(m);
+ manifest2 = new ManifestFile(m);
}
- ManifestFileVar.init(manifest);
- this.manifest = manifest;
+ ManifestFileVar.init(manifest2);
+ this.manifest = manifest2;
//
--------------------------------------------------------------------------------
// Try to resolve the configuration if not specified.
//
--------------------------------------------------------------------------------
- var config = builder.config;
+ var config2 = builder.config;
var configBuilder =
builder.configBuilder.varResolver(builder.varResolver.build()).store(MemoryStore.DEFAULT);
- if (config == null) {
+ if (config2 == null) {
var store = builder.configStore;
var cfs = workingDir == null ? FileStore.DEFAULT :
FileStore.create().directory(workingDir).build();
for (var name : getCandidateConfigNames()) {
@@ -626,12 +626,12 @@ public class Microservice implements ConfigEventListener {
}
}
}
- config = configBuilder.build();
+ config2 = configBuilder.build();
}
- this.config = config;
+ this.config = config2;
Config.setSystemDefault(this.config);
this.config.addListener(this);
- this.varResolver = builder.varResolver.bean(Config.class,
config).build();
+ this.varResolver = builder.varResolver.bean(Config.class,
config2).build();
//
--------------------------------------------------------------------------------
// Initialize console commands.
@@ -667,9 +667,9 @@ public class Microservice implements ConfigEventListener {
while (true) {
out.append("> ").flush();
var line = in.nextLine();
- var args = new Args(line);
- if (! args.isEmpty())
- executeCommand(args,
in, out);
+ var args2 = new Args(line);
+ if (! args2.isEmpty())
+ executeCommand(args2,
in, out);
}
}
};
@@ -1117,13 +1117,13 @@ public class Microservice implements
ConfigEventListener {
if (nn(configName))
return Collections.singletonList(configName);
- var args = getArgs();
+ var args2 = getArgs();
if (getArgs().hasArg("configFile"))
- return
Collections.singletonList(args.getArg("configFile"));
+ return
Collections.singletonList(args2.getArg("configFile"));
- var manifest = getManifest();
- if (manifest.containsKey("Main-Config"))
- return
Collections.singletonList(manifest.getString("Main-Config"));
+ var manifest2 = getManifest();
+ if (manifest2.containsKey("Main-Config"))
+ return
Collections.singletonList(manifest2.getString("Main-Config"));
return Config.getCandidateSystemDefaultConfigNames();
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 4a9bb038ac..a22b46520a 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -84,7 +84,7 @@ public class LogsResource extends BasicRestServlet {
@Response(schema = @Schema(description = "File or directory details"))
@Bean(properties = "type,name,size,lastModified,actions,files")
public static class FileResource {
- static final FileFilter FILE_FILTER = f -> f.isDirectory() ||
f.getName().endsWith(".log");
+ static final FileFilter FILE_FILTER = f2 -> f2.isDirectory() ||
f2.getName().endsWith(".log");
static final Comparator<FileResource> FILE_COMPARATOR = (o1,
o2) -> {
int c = o1.getType().compareTo(o2.getType());
return c != 0 ? c :
o1.getName().compareTo(o2.getName());
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
index c9d3d13ddb..37ec1b4d90 100644
---
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
+++
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
@@ -71,9 +71,9 @@ public class HelloWorldResource extends BasicRestObject {
*/
@RestGet(path = "/*", summary = "Responds with \"Hello world!\"")
public String sayHello() {
- var message = this.message;
+ var message2 = this.message;
if (nn(messageProvider) && messageProvider.isPresent())
- message = messageProvider.get().get();
- return message;
+ message2 = messageProvider.get().get();
+ return message2;
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 565823ee84..e7891ef50a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -1911,20 +1911,20 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
var hl = headerData;
var h = hl.getLast("Content-Type");
var contentType = h.isPresent() ? h.get().getValue() :
null;
- var serializer = this.serializer;
- if (serializer == null)
- serializer =
client.getMatchingSerializer(contentType);
- if (contentType == null && nn(serializer))
- contentType =
serializer.getPrimaryMediaType().toString();
+ var serializer2 = this.serializer;
+ if (serializer2 == null)
+ serializer2 =
client.getMatchingSerializer(contentType);
+ if (contentType == null && nn(serializer2))
+ contentType =
serializer2.getPrimaryMediaType().toString();
// Pick the parser if it hasn't been overridden.
h = hl.getLast("Accept");
var accept = h.isPresent() ? h.get().getValue() : null;
- var parser = this.parser;
- if (parser == null)
- parser = client.getMatchingParser(accept);
- if (accept == null && nn(parser))
- hl.set(Accept.of(parser.getPrimaryMediaType()));
+ var parser2 = this.parser;
+ if (parser2 == null)
+ parser2 = client.getMatchingParser(accept);
+ if (accept == null && nn(parser2))
+
hl.set(Accept.of(parser2.getPrimaryMediaType()));
headerData.stream().map(SimpleHeader::new).filter(SimplePart::isValid).forEach(request::addHeader);
@@ -1951,7 +1951,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
entity = (HttpEntity)input2;
} else if (input2 instanceof HttpEntity input3)
{
if (input3 instanceof SerializedEntity
input4) {
- entity =
input4.copyWith(serializer, contentSchema);
+ entity =
input4.copyWith(serializer2, contentSchema);
} else {
entity = input3;
}
@@ -1959,8 +1959,8 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
entity = readerEntity(input3,
getRequestContentType(TEXT_PLAIN));
else if (input2 instanceof InputStream input3)
entity = streamEntity(input3, -1,
getRequestContentType(ContentType.APPLICATION_OCTET_STREAM));
- else if (nn(serializer))
- entity = serializedEntity(input2,
serializer, contentSchema).setContentType(contentType);
+ else if (nn(serializer2))
+ entity = serializedEntity(input2,
serializer2, contentSchema).setContentType(contentType);
else {
if (client.hasSerializers()) {
if (contentType == null)
@@ -1975,7 +1975,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
}
try {
- response = client.createResponse(this,
client.run(target, request, context), parser);
+ response = client.createResponse(this,
client.run(target, request, context), parser2);
} catch (Exception e) {
throw e;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index ecc3a5f707..a0937b73ae 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -66,20 +66,20 @@ public class RemoteMeta {
var versionHeader = "Client-Version";
String clientVersion = null;
- var headers = HeaderList.create().resolving();
+ var headers2 = HeaderList.create().resolving();
for (var r : remotes) {
if (ne(r.path()))
path = trimSlashes(resolve(r.path()));
for (var h : r.headers())
- headers.append(stringHeader(resolve(h)));
+ headers2.append(stringHeader(resolve(h)));
if (ne(r.version()))
clientVersion = resolve(r.version());
if (ne(r.versionHeader()))
versionHeader = resolve(r.versionHeader());
if (isNotVoid(r.headerList())) {
try {
-
headers.append(r.headerList().getDeclaredConstructor().newInstance().getAll());
+
headers2.append(r.headerList().getDeclaredConstructor().newInstance().getAll());
} catch (Exception e) {
throw rex(e, "Could not instantiate
HeaderSupplier class");
}
@@ -87,14 +87,14 @@ public class RemoteMeta {
}
if (nn(clientVersion))
- headers.append(stringHeader(versionHeader,
clientVersion));
+ headers2.append(stringHeader(versionHeader,
clientVersion));
- Map<Method,RemoteOperationMeta> operations = map();
+ Map<Method,RemoteOperationMeta> operations2 = map();
var path2 = path;
- ci.getPublicMethods().stream().forEach(x ->
operations.put(x.inner(), new RemoteOperationMeta(path2, x.inner(), "GET")));
+ ci.getPublicMethods().stream().forEach(x ->
operations2.put(x.inner(), new RemoteOperationMeta(path2, x.inner(), "GET")));
- this.operations = u(operations);
- this.headers = headers;
+ this.operations = u(operations2);
+ this.headers = headers2;
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
index 1e47aab6c2..c17847faad 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
@@ -224,15 +224,15 @@ public class SerializedHeader extends BasicHeader {
Object v = value;
if (nn(supplier))
v = supplier.get();
- HttpPartSchema schema = this.schema == null ?
HttpPartSchema.DEFAULT : this.schema;
- var def = schema.getDefault();
+ HttpPartSchema schema2 = this.schema == null ?
HttpPartSchema.DEFAULT : this.schema;
+ var def = schema2.getDefault();
if (v == null) {
- if ((def == null && ! schema.isRequired()) ||
(def == null && schema.isAllowEmptyValue()))
+ if ((def == null && ! schema2.isRequired()) ||
(def == null && schema2.isAllowEmptyValue()))
return null;
}
if (e(s(v)) && skipIfEmpty && def == null)
return null;
- return serializer == null ? s(v) :
serializer.serialize(HttpPartType.HEADER, schema, v);
+ return serializer == null ? s(v) :
serializer.serialize(HttpPartType.HEADER, schema2, v);
} catch (SchemaValidationException e) {
throw rex(e, "Validation error on request {0} parameter
''{1}''=''{2}''", HttpPartType.HEADER, getName(), value);
} catch (SerializeException e) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
index 1f30dba5c8..dd7bbcdda2 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
@@ -156,15 +156,15 @@ public class SerializedPart extends BasicPart {
public String getValue() {
try {
Object v = unwrap(value);
- HttpPartSchema schema = this.schema == null ?
HttpPartSchema.DEFAULT : this.schema;
- var def = schema.getDefault();
+ HttpPartSchema schema2 = this.schema == null ?
HttpPartSchema.DEFAULT : this.schema;
+ var def = schema2.getDefault();
if (v == null) {
- if ((def == null && ! schema.isRequired()) ||
(def == null && schema.isAllowEmptyValue()))
+ if ((def == null && ! schema2.isRequired()) ||
(def == null && schema2.isAllowEmptyValue()))
return null;
}
if (e(s(v)) && skipIfEmpty && def == null)
return null;
- return serializer == null ? s(v) :
serializer.serialize(type, schema, v);
+ return serializer == null ? s(v) :
serializer.serialize(type, schema2, v);
} catch (SchemaValidationException e) {
throw rex(e, "Validation error on request {0} part
''{1}''=''{2}''", type, getName(), value);
} catch (SerializeException e) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
index 7f317ce322..331cd670b9 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
@@ -57,20 +57,20 @@ public class RrpcInterfaceMeta {
*/
public RrpcInterfaceMeta(Class<?> c, String uri) {
this.c = c;
- Value<String> path = Value.of("");
+ Value<String> path2 = Value.of("");
var ci = ClassInfo.of(c);
- rstream(AP.find(Remote.class, ci)).map(x ->
x.inner().path()).filter(Utils::ne).forEach(x -> path.set(trimSlashes(x)));
+ rstream(AP.find(Remote.class, ci)).map(x ->
x.inner().path()).filter(Utils::ne).forEach(x -> path2.set(trimSlashes(x)));
- Map<Method,RrpcInterfaceMethodMeta> methods = map();
- ci.getPublicMethods().stream().forEach(x ->
methods.put(x.inner(), new RrpcInterfaceMethodMeta(uri, x.inner())));
+ Map<Method,RrpcInterfaceMethodMeta> methods2 = map();
+ ci.getPublicMethods().stream().forEach(x ->
methods2.put(x.inner(), new RrpcInterfaceMethodMeta(uri, x.inner())));
- Map<String,RrpcInterfaceMethodMeta> methodsByPath = map();
- methods.values().forEach(x -> methodsByPath.put(x.getPath(),
x));
+ Map<String,RrpcInterfaceMethodMeta> methodsByPath2 = map();
+ methods2.values().forEach(x -> methodsByPath2.put(x.getPath(),
x));
- this.methods = u(methods);
- this.methodsByPath = u(methodsByPath);
- this.path = path.get();
+ this.methods = u(methods2);
+ this.methodsByPath = u(methodsByPath2);
+ this.path = path2.get();
}
/**
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 c28874a52b..9035c30deb 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
@@ -4509,12 +4509,12 @@ public class RestContext extends Context {
// Initialize our child resources.
for (var o : children) {
- String path = null;
+ String path2 = null;
Supplier<?> so;
RestContext.Builder cb = null;
if (o instanceof RestChild o2) {
- path = o2.path;
+ path2 = o2.path;
var o3 = o2.resource;
so = () -> o3;
cb = RestContext.create(o3.getClass(),
restContext, inner);
@@ -4536,8 +4536,8 @@ public class RestContext extends Context {
}
}
- if (nn(path))
- cb.path(path);
+ if (nn(path2))
+ cb.path(path2);
var cc = cb.init(so).build();
@@ -5835,11 +5835,11 @@ public class RestContext extends Context {
public synchronized RestContext postInit() throws ServletException {
if (initialized.get())
return this;
- var resource = getResource();
+ var resource2 = getResource();
var mi = ClassInfo.of(getResource()).getPublicMethod(x ->
x.hasName("setContext") && x.hasParameterTypes(RestContext.class)).orElse(null);
if (nn(mi)) {
try {
- mi.accessible().invoke(resource, this);
+ mi.accessible().invoke(resource2, this);
} catch (ExecutableException e) {
throw new ServletException(e.unwrap());
}
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 4dc39bfc9f..bda5e45ca4 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
@@ -1991,18 +1991,18 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (v.get().isEmpty()) {
var mi = MethodInfo.of(restMethod);
String p = null;
- String httpMethod = null;
+ String httpMethod2 = null;
if (mi.hasAnnotation(RestGet.class))
- httpMethod = "get";
+ httpMethod2 = "get";
else if (mi.hasAnnotation(RestPut.class))
- httpMethod = "put";
+ httpMethod2 = "put";
else if (mi.hasAnnotation(RestPost.class))
- httpMethod = "post";
+ httpMethod2 = "post";
else if (mi.hasAnnotation(RestDelete.class))
- httpMethod = "delete";
+ httpMethod2 = "delete";
else if (mi.hasAnnotation(RestOp.class)) {
// @formatter:off
- httpMethod = AP.find(RestOp.class, mi)
+ httpMethod2 = AP.find(RestOp.class, mi)
.stream()
.map(x -> x.inner().method())
.filter(Utils::ne)
@@ -2011,7 +2011,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// @formatter:on
}
- p = HttpUtils.detectHttpPath(restMethod,
httpMethod);
+ p = HttpUtils.detectHttpPath(restMethod,
httpMethod2);
if (dotAll && ! p.endsWith("/*"))
p += "/*";
@@ -2085,9 +2085,9 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
RestGuardList getGuards() {
var b = guards();
- var roleGuard =
opt(this.roleGuard).orElseGet(CollectionUtils::set);
+ var roleGuard2 =
opt(this.roleGuard).orElseGet(CollectionUtils::set);
- for (var rg : roleGuard) {
+ for (var rg : roleGuard2) {
try {
b.append(new
RoleBasedRestGuard(rolesDeclared, rg));
} catch (java.text.ParseException e1) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index 26f919a793..2baca4a305 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -397,8 +397,8 @@ public class RestResponse extends
HttpServletResponseWrapper {
setHeader("content-encoding",
encoding);
}
}
- var sos = getOutputStream();
- os = new FinishableServletOutputStream(encoder == null
? sos : encoder.getOutputStream(sos));
+ var sos2 = getOutputStream();
+ os = new FinishableServletOutputStream(encoder == null
? sos2 : encoder.getOutputStream(sos2));
}
return os;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
index 49da42e239..550b19659a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
@@ -82,10 +82,10 @@ public class ResponseBeanArg implements RestOpArg {
v.listener(o -> {
RestRequest req = opSession.getRequest();
RestResponse res = opSession.getResponse();
- ResponseBeanMeta meta =
req.getOpContext().getResponseBeanMeta(o);
- if (meta == null)
- meta = ResponseBeanArg.this.meta;
- res.setResponseBeanMeta(meta);
+ ResponseBeanMeta meta2 =
req.getOpContext().getResponseBeanMeta(o);
+ if (meta2 == null)
+ meta2 = ResponseBeanArg.this.meta;
+ res.setResponseBeanMeta(meta2);
res.setContent(o);
});
return v;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index df856f40b6..747f180fd8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -541,7 +541,7 @@ public class RequestContent {
if (nn(pm)) {
var p = pm.getParser();
- var mediaType = pm.getMediaType();
+ var mediaType2 = pm.getMediaType();
// @formatter:off
var session = p
.createSession()
@@ -549,7 +549,7 @@ public class RequestContent {
.javaMethod(req.getOpContext().getJavaMethod())
.locale(locale)
.timeZone(timeZone.orElse(null))
- .mediaType(mediaType)
+ .mediaType(mediaType2)
.apply(ReaderParser.Builder.class, x ->
x.streamCharset(req.getCharset()))
.schema(schema)
.debug(req.isDebug() ? true : null)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index 82e7ef803e..6efec8820b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
@@ -554,9 +554,9 @@ public class CallLogger {
if (! isEnabled(rule, req))
return;
- var level = firstNonNull(rule.getLevel(), this.level);
+ var level2 = firstNonNull(rule.getLevel(), this.level);
- if (level == Level.OFF)
+ if (level2 == Level.OFF)
return;
var e = cast(Throwable.class, req.getAttribute("Exception"));
@@ -656,7 +656,7 @@ public class CallLogger {
sb.append("\n=== END
======================================================================");
}
- log(level, sb.toString(), e);
+ log(level2, sb.toString(), e);
}
@@ -773,9 +773,9 @@ public class CallLogger {
* @return <jk>true</jk> if logging is enabled for this request.
*/
protected boolean isEnabled(CallLoggerRule rule, HttpServletRequest
req) {
- var enabled = firstNonNull(rule.getEnabled(), this.enabled);
- var enabledTest = firstNonNull(rule.getEnabledTest(),
this.enabledTest);
- return enabled.isEnabled(enabledTest.test(req));
+ var enabled2 = firstNonNull(rule.getEnabled(), this.enabled);
+ var enabledTest2 = firstNonNull(rule.getEnabledTest(),
this.enabledTest);
+ return enabled2.isEnabled(enabledTest2.test(req));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
index 758aa791bf..e25e36a7a7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
@@ -108,9 +108,9 @@ public abstract class RestServlet extends HttpServlet {
* @return The path defined on this servlet, or an empty string if not
specified.
*/
public synchronized String getPath() {
- var context = this.context.get();
- if (nn(context))
- return context.getFullPath();
+ var context2 = this.context.get();
+ if (nn(context2))
+ return context2.getFullPath();
var ci = ClassInfo.of(getClass());
// @formatter:off
return rstream(AP.find(Rest.class, ci))
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 6996a22575..e89cfef38d 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
@@ -92,25 +92,25 @@ public abstract class UrlPathMatcher implements
Comparable<UrlPathMatcher> {
c = c + "/W";
this.comparator = c;
- String[] parts = new UrlPath(pattern).getParts();
+ String[] parts2 = new UrlPath(pattern).getParts();
- this.hasRemainder = parts.length > 0 &&
"*".equals(parts[parts.length - 1]);
+ this.hasRemainder = parts2.length > 0 &&
"*".equals(parts2[parts2.length - 1]);
- parts = hasRemainder ? Arrays.copyOf(parts,
parts.length - 1) : parts;
+ parts2 = hasRemainder ? Arrays.copyOf(parts2,
parts2.length - 1) : parts2;
- this.parts = parts;
- this.vars = new String[parts.length];
- List<String> vars = list();
+ this.parts = parts2;
+ this.vars = new String[parts2.length];
+ List<String> vars2 = list();
- for (var i = 0; i < parts.length; i++) {
- Matcher m = VAR_PATTERN.matcher(parts[i]);
+ for (var i = 0; i < parts2.length; i++) {
+ Matcher m = VAR_PATTERN.matcher(parts2[i]);
if (m.matches()) {
this.vars[i] = m.group(1);
- vars.add(this.vars[i]);
+ vars2.add(this.vars[i]);
}
}
- this.varKeys = vars.isEmpty() ? null : vars.toArray(new
String[vars.size()]);
+ this.varKeys = vars2.isEmpty() ? null :
vars2.toArray(new String[vars2.size()]);
}
@Override
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
index 0d77da5c80..ae01b23af0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
@@ -83,46 +83,46 @@ class BeanContext_Test extends TestBase {
@Test void c01_locale_fromSettings() {
Settings.get().setLocal("BeanContext.locale", "fr-CA");
try {
- var bc = BeanContext.create().build();
- assertEquals(Locale.forLanguageTag("fr-CA"),
bc.getLocale());
+ var bc2 = BeanContext.create().build();
+ assertEquals(Locale.forLanguageTag("fr-CA"),
bc2.getLocale());
} finally {
Settings.get().clearLocal();
}
}
@Test void c02_locale_defaultWhenNotSet() {
- var bc = BeanContext.create().build();
- assertEquals(Locale.getDefault(), bc.getLocale());
+ var bc2 = BeanContext.create().build();
+ assertEquals(Locale.getDefault(), bc2.getLocale());
}
@Test void c03_mediaType_fromSettings() {
Settings.get().setLocal("BeanContext.mediaType",
"application/json");
try {
- var bc = BeanContext.create().build();
- assertEquals(MediaType.of("application/json"),
bc.getMediaType());
+ var bc2 = BeanContext.create().build();
+ assertEquals(MediaType.of("application/json"),
bc2.getMediaType());
} finally {
Settings.get().clearLocal();
}
}
@Test void c04_mediaType_nullWhenNotSet() {
- var bc = BeanContext.create().build();
- assertNull(bc.getMediaType());
+ var bc2 = BeanContext.create().build();
+ assertNull(bc2.getMediaType());
}
@Test void c05_timeZone_fromSettings() {
Settings.get().setLocal("BeanContext.timeZone",
"America/New_York");
try {
- var bc = BeanContext.create().build();
- assertEquals(TimeZone.getTimeZone("America/New_York"),
bc.getTimeZone());
+ var bc2 = BeanContext.create().build();
+ assertEquals(TimeZone.getTimeZone("America/New_York"),
bc2.getTimeZone());
} finally {
Settings.get().clearLocal();
}
}
@Test void c06_timeZone_nullWhenNotSet() {
- var bc = BeanContext.create().build();
- assertNull(bc.getTimeZone());
+ var bc2 = BeanContext.create().build();
+ assertNull(bc2.getTimeZone());
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
index af755cca3e..29c566a566 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
@@ -546,8 +546,8 @@ public class ClassInfo_Test extends TestBase {
assertEquals(String[].class, arrayType.inner());
// Multi-dimensional
- var ci2 = ClassInfo.of(String[].class);
- var arrayType2 = ci2.arrayType();
+ var ci22 = ClassInfo.of(String[].class);
+ var arrayType2 = ci22.arrayType();
assertNotNull(arrayType2);
assertEquals(String[][].class, arrayType2.inner());
@@ -586,8 +586,8 @@ public class ClassInfo_Test extends TestBase {
assertThrows(ClassCastException.class, () ->
ci.asSubclass(Integer.class));
// For types without inner class, should return null
- var ci2 = ClassInfo.of((Class<?>)null, pType);
- assertNull(ci2.asSubclass(CharSequence.class));
+ var ci22 = ClassInfo.of((Class<?>)null, pType);
+ assertNull(ci22.asSubclass(CharSequence.class));
}
//====================================================================================================
@@ -803,9 +803,9 @@ public class ClassInfo_Test extends TestBase {
assertThrows(ClassCastException.class, () -> ci.cast(42));
// For types without inner class, should return null
- var ci2 = ClassInfo.of((Class<?>)null, pType);
- assertNull(ci2.cast("test"));
- assertNull(ci2.cast(null));
+ var ci22 = ClassInfo.of((Class<?>)null, pType);
+ assertNull(ci22.cast("test"));
+ assertNull(ci22.cast(null));
}
//====================================================================================================
@@ -869,8 +869,8 @@ public class ClassInfo_Test extends TestBase {
void a012c_equals() {
// Same class
var ci1 = ClassInfo.of(String.class);
- var ci2 = ClassInfo.of(String.class);
- assertEquals(ci1, ci2);
+ var ci22 = ClassInfo.of(String.class);
+ assertEquals(ci1, ci22);
// Different classes
var ci3 = ClassInfo.of(Integer.class);
@@ -1332,12 +1332,12 @@ public class ClassInfo_Test extends TestBase {
assertEquals("java.lang.String", ci.getNameFormatted(FULL,
true, '$', BRACKETS));
// Inner class
- var ci2 = ClassInfo.of(Map.Entry.class);
- assertEquals("Entry", ci2.getNameFormatted(SIMPLE, false, '$',
BRACKETS));
- assertEquals("Map$Entry", ci2.getNameFormatted(SHORT, false,
'$', BRACKETS));
- assertEquals("Map.Entry", ci2.getNameFormatted(SHORT, false,
'.', BRACKETS));
- assertEquals("java.util.Map$Entry", ci2.getNameFormatted(FULL,
false, '$', BRACKETS));
- assertEquals("java.util.Map.Entry", ci2.getNameFormatted(FULL,
false, '.', BRACKETS));
+ var ci22 = ClassInfo.of(Map.Entry.class);
+ assertEquals("Entry", ci22.getNameFormatted(SIMPLE, false, '$',
BRACKETS));
+ assertEquals("Map$Entry", ci22.getNameFormatted(SHORT, false,
'$', BRACKETS));
+ assertEquals("Map.Entry", ci22.getNameFormatted(SHORT, false,
'.', BRACKETS));
+ assertEquals("java.util.Map$Entry", ci22.getNameFormatted(FULL,
false, '$', BRACKETS));
+ assertEquals("java.util.Map.Entry", ci22.getNameFormatted(FULL,
false, '.', BRACKETS));
// Arrays
var ci3 = ClassInfo.of(String[].class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
index 04e8a28d84..533ea53611 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
@@ -334,7 +334,7 @@ class ExecutableInfo_Test extends TestBase {
// Verify no package prefix (no dots before the
class name, except for inner classes)
assertFalse(fullName.matches("^[a-z][a-z0-9]*(\\.[a-z][a-z0-9]*)+\\."), "Full
name should not have package prefix when package is null: " + fullName);
}
- } catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e2) {
// If class not found, skip this part of the test
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
index d525bf7741..9288392483 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
@@ -364,7 +364,7 @@ class FieldInfo_Test extends TestBase {
// Verify no package prefix (no dots before the
class name, except for inner classes)
assertFalse(fullName.matches("^[a-z][a-z0-9]*(\\.[a-z][a-z0-9]*)+\\."), "Full
name should not have package prefix when package is null: " + fullName);
}
- } catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e2) {
// If class not found, skip this part of the test
}
