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 2fd7e72a7d SonarQube bug fixes
2fd7e72a7d is described below
commit 2fd7e72a7d0f7cf6e5522e580e630cbf86344585
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 08:37:50 2026 -0500
SonarQube bug fixes
---
AI.md | 39 +++++++
.../org/apache/juneau/bean/openapi3/Items.java | 12 +-
.../juneau/commons/reflect/AnnotationInfo.java | 4 +-
.../juneau/commons/reflect/AnnotationProvider.java | 36 +++---
.../juneau/commons/reflect/ExecutableInfo.java | 10 +-
.../apache/juneau/commons/reflect/MethodInfo.java | 2 +-
.../juneau/commons/reflect/ParameterInfo.java | 4 +-
.../org/apache/juneau/commons/utils/Utils.java | 4 +-
.../main/java/org/apache/juneau/config/Config.java | 4 +-
.../apache/juneau/jena/RdfSerializerSession.java | 10 +-
.../main/java/org/apache/juneau/BeanContext.java | 4 +-
.../org/apache/juneau/html/HtmlParserSession.java | 2 +-
.../apache/juneau/html/HtmlSerializerSession.java | 4 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 36 +++---
.../juneau/httppart/SchemaValidationException.java | 5 +-
.../apache/juneau/json/JsonSerializerSession.java | 4 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 4 +-
.../juneau/oapi/OpenApiSerializerSession.java | 24 ++--
.../java/org/apache/juneau/parser/ParserSet.java | 4 +-
.../juneau/serializer/SerializerSession.java | 12 +-
.../apache/juneau/serializer/SerializerSet.java | 4 +-
.../apache/juneau/uon/UonSerializerSession.java | 4 +-
.../apache/juneau/xml/XmlSerializerSession.java | 10 +-
.../apache/juneau/microservice/Microservice.java | 32 ++---
.../microservice/jetty/JettyMicroservice.java | 16 +--
.../org/apache/juneau/rest/client/RestClient.java | 22 ++--
.../org/apache/juneau/rest/client/RestRequest.java | 32 ++---
.../juneau/rest/mock/MockServletRequest.java | 130 ++++++++++-----------
.../java/org/apache/juneau/rest/RestChildren.java | 4 +-
.../java/org/apache/juneau/rest/RestContext.java | 6 +-
.../java/org/apache/juneau/rest/RestResponse.java | 4 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 16 +--
.../juneau/junit/bct/PropertyExtractor_Test.java | 4 +-
33 files changed, 274 insertions(+), 234 deletions(-)
diff --git a/AI.md b/AI.md
index db5b83a201..bcf702c8a4 100644
--- a/AI.md
+++ b/AI.md
@@ -144,6 +144,45 @@ var map = new HashMap<String,Integer>();
var keys = map.keySet();
```
+#### Instanceof Pattern Matching Variable Naming
+When using instanceof pattern matching (Java 16+), follow this naming
convention:
+
+1. **General Rule**: Append "2" to the original variable name:
+ - `if (o instanceof Type o2)` - original variable is `o`, pattern variable
is `o2`
+ - `if (value instanceof Calendar value2)` - original variable is `value`,
pattern variable is `value2`
+ - `if (this instanceof MethodInfo this2)` - original variable is `this`,
pattern variable is `this2`
+
+2. **Exception for variables ending in "2"**: When the original variable
already ends in "2" (like `o2`), use "o3" instead of "o22" for simplicity:
+ - `if (o2 instanceof InputStream o3)` - original variable is `o2`, pattern
variable is `o3`
+ - `if (o1 instanceof Comparable o3)` - original variable is `o1`, pattern
variable is `o3` (not `o12`)
+
+3. **Conflict Resolution**: When there's a naming conflict (e.g., a lambda
parameter with the same name), use a different name:
+ - `if (value instanceof BeanMap<?> value2)` followed by
`value2.forEachValue(..., (pMeta2, key2, value3, thrown2) -> ...)` - lambda
parameter uses `value3` to avoid conflict with pattern variable `value2`
+
+**Examples:**
+```java
+// CORRECT - Standard pattern
+if (o instanceof BeanMap o2)
+ serializeBeanMap(out, o2, typeName);
+
+// CORRECT - Variable ending in "2"
+for (var o2 : o) {
+ if (o2 instanceof InputStream o3)
+ o3.close();
+}
+
+// CORRECT - Conflict resolution
+if (value instanceof BeanMap<?> value2) {
+ value2.forEachValue(x -> true, (pMeta2, key2, value3, thrown2) -> {
+ // value3 used to avoid conflict with value2
+ });
+}
+
+// WRONG - Not following convention
+if (o instanceof BeanMap bm) // Should be o2
+if (value instanceof Calendar cal) // Should be value2
+```
+
#### Final Fields and Memoization Pattern
When declaring class fields, always use `final` to ensure true immutability:
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index ad0a93eb1d..afb226f38e 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -738,19 +738,19 @@ public class Items extends OpenApiElement {
/* Resolve references in extra attributes */
private Object resolveRefs(Object o, OpenApi openApi, Deque<String>
refStack, int maxDepth) {
- if (o instanceof JsonMap om) {
- var ref2 = om.get("$ref");
+ if (o instanceof JsonMap o2) {
+ var ref2 = o2.get("$ref");
if (ref2 instanceof CharSequence) {
var sref = ref2.toString();
if (refStack.contains(sref) || refStack.size()
>= maxDepth)
return o;
refStack.addLast(sref);
- var o2 = openApi.findRef(sref, Object.class);
- o2 = resolveRefs(o2, openApi, refStack,
maxDepth);
+ var o3 = openApi.findRef(sref, Object.class);
+ o3 = resolveRefs(o3, openApi, refStack,
maxDepth);
refStack.removeLast();
- return o2;
+ return o3;
}
- for (var e : om.entrySet())
+ for (var e : o2.entrySet())
e.setValue(resolveRefs(e.getValue(), openApi,
refStack, maxDepth));
}
if (o instanceof JsonList o2)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
index 4de6c1ffd5..d80994e9cb 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
@@ -860,9 +860,9 @@ public class AnnotationInfo<T extends Annotation> {
if (value instanceof Enum<?> e) {
return e.getDeclaringClass().getSimpleName() + "." +
e.name();
}
- if (value instanceof Annotation ann) {
+ if (value instanceof Annotation value2) {
// For nested annotations, use simple format
- return "@" +
ClassInfo.of(ann.annotationType()).getNameSimple() + "(...)";
+ return "@" +
ClassInfo.of(value2.annotationType()).getNameSimple() + "(...)";
}
return String.valueOf(value);
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
index 99c94ab3d0..9baa4057ca 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
@@ -1015,48 +1015,48 @@ public class AnnotationProvider {
if (element2.getPackage() != null)
l.addAll(element2.getPackage().getAnnotations());
}
- } else if (element instanceof MethodInfo element3) {
+ } else if (element instanceof MethodInfo element2) {
if (t.contains(SELF)) {
- l.addAll(runtimeCache.get(element3.inner()));
- l.addAll(element3.getDeclaredAnnotations());
+ l.addAll(runtimeCache.get(element2.inner()));
+ l.addAll(element2.getDeclaredAnnotations());
}
if (t.contains(MATCHING_METHODS)) {
- for (var m :
element3.getMatchingMethods().stream().skip(1).toList()) {
+ for (var m :
element2.getMatchingMethods().stream().skip(1).toList()) {
l.addAll(runtimeCache.get(m.inner()));
l.addAll(m.getDeclaredAnnotations());
}
}
if (t.contains(DECLARING_CLASS)) {
- l.addAll(find(element3.getDeclaringClass(),
a(PARENTS)));
+ l.addAll(find(element2.getDeclaringClass(),
a(PARENTS)));
}
if (t.contains(RETURN_TYPE)) {
-
l.addAll(find(element3.getReturnType().unwrap(Value.class, Optional.class),
a(PARENTS)));
+
l.addAll(find(element2.getReturnType().unwrap(Value.class, Optional.class),
a(PARENTS)));
}
if (t.contains(PACKAGE)) {
- if (element3.getDeclaringClass().getPackage()
!= null)
-
l.addAll(element3.getDeclaringClass().getPackage().getAnnotations());
+ if (element2.getDeclaringClass().getPackage()
!= null)
+
l.addAll(element2.getDeclaringClass().getPackage().getAnnotations());
}
- } else if (element instanceof FieldInfo element4) {
+ } else if (element instanceof FieldInfo element2) {
if (t.contains(SELF)) {
- l.addAll(runtimeCache.get(element4.inner()));
- l.addAll(element4.getAnnotations());
+ l.addAll(runtimeCache.get(element2.inner()));
+ l.addAll(element2.getAnnotations());
}
- } else if (element instanceof ConstructorInfo element5) {
+ } else if (element instanceof ConstructorInfo element2) {
if (t.contains(SELF)) {
- l.addAll(runtimeCache.get(element5.inner()));
- l.addAll(element5.getDeclaredAnnotations());
+ l.addAll(runtimeCache.get(element2.inner()));
+ l.addAll(element2.getDeclaredAnnotations());
}
- } else if (element instanceof ParameterInfo element6) {
+ } else if (element instanceof ParameterInfo element2) {
if (t.contains(SELF)) {
- l.addAll(element6.getAnnotations());
+ l.addAll(element2.getAnnotations());
}
if (t.contains(MATCHING_PARAMETERS)) {
- for (var p :
element6.getMatchingParameters().stream().skip(1).toList()) {
+ for (var p :
element2.getMatchingParameters().stream().skip(1).toList()) {
l.addAll(p.getAnnotations());
}
}
if (t.contains(PARAMETER_TYPE)) {
-
l.addAll(find(element6.getParameterType().unwrap(Value.class, Optional.class),
a(PARENTS, PACKAGE)));
+
l.addAll(find(element2.getParameterType().unwrap(Value.class, Optional.class),
a(PARENTS, PACKAGE)));
}
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
index 07a70a4b40..b90f1092b3 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
@@ -856,10 +856,10 @@ public abstract class ExecutableInfo extends
AccessibleInfo {
// Add synthetic, bridge, varargs, and default flags (not
actual modifiers but useful to show)
if (isSynthetic())
sb.append("synthetic ");
- if (this instanceof MethodInfo mi) {
- if (mi.isBridge())
+ if (this instanceof MethodInfo this2) {
+ if (this2.isBridge())
sb.append("bridge ");
- if (mi.isDefault())
+ if (this2.isDefault())
sb.append("default ");
}
if (isVarArgs())
@@ -896,8 +896,8 @@ public abstract class ExecutableInfo extends AccessibleInfo
{
}
// Return type (skip for constructors)
- if (this instanceof MethodInfo mi)
- mi.getReturnType().appendNameFormatted(sb, FULL, true,
'$', BRACKETS).append(" ");
+ if (this instanceof MethodInfo this2)
+ this2.getReturnType().appendNameFormatted(sb, FULL,
true, '$', BRACKETS).append(" ");
// Full name - use generic parameter types if we have type
parameters
if (hasTypeParams) {
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
index 5adb04d94d..8f15252f18 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
@@ -655,7 +655,7 @@ public class MethodInfo extends ExecutableInfo implements
Comparable<MethodInfo>
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
public Object invokeLenient(Object pojo, Object...args) throws
ExecutableException {
- return safe((ThrowingSupplier<Object>)() -> inner.invoke(pojo,
ClassUtils.getMatchingArgs(inner.getParameterTypes(), args)), e -> exex(e
instanceof InvocationTargetException ?
((InvocationTargetException)e).getTargetException() : e));
+ return safe((ThrowingSupplier<Object>)() -> inner.invoke(pojo,
ClassUtils.getMatchingArgs(inner.getParameterTypes(), args)), e -> exex(e
instanceof InvocationTargetException e2 ? e2.getTargetException() : e));
}
@Override
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 c3c2fe00cd..e4d8ef3a2e 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
@@ -892,9 +892,9 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
// If wrapped in Optional, unwrap it to
get the nested type
if (rawType instanceof Class<?>
rawClass && rawClass == Optional.class) {
var typeArgs =
pt2.getActualTypeArguments();
- if (typeArgs.length > 0 &&
typeArgs[0] instanceof ParameterizedType nestedPt) {
+ if (typeArgs.length > 0 &&
typeArgs[0] instanceof ParameterizedType typeArgs2) {
// Optional<List<T>> ->
List<T>
- parameterizedType =
nestedPt;
+ parameterizedType =
typeArgs2;
} else {
// Optional<SomeClass>
- not a collection, elementType remains null
parameterizedType =
null;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
index ccc26de52b..26d6a0399c 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
@@ -246,8 +246,8 @@ public class Utils {
return 1;
}
- if (eq(o1.getClass(), o2.getClass()) && o1 instanceof
Comparable o1a)
- return o1a.compareTo(o2);
+ if (eq(o1.getClass(), o2.getClass()) && o1 instanceof
Comparable o3)
+ return o3.compareTo(o2);
return 0;
}
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 509a78336c..fddfafa297 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
@@ -1187,8 +1187,8 @@ public class Config extends Context implements
ConfigEventListener {
if (serializer == null)
serializer = this.serializer;
var c = value.getClass();
- if (value instanceof CharSequence cs)
- return nlIfMl(cs);
+ if (value instanceof CharSequence value2)
+ return nlIfMl(value2);
if (isSimpleType(c))
return value.toString();
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 065ff330b7..f7915ee7bc 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -374,14 +374,14 @@ public class RdfSerializerSession extends
WriterSerializerSession {
n = m.createTypedLiteral(o);
} else if (sType.isMap() || (nn(wType) && wType.isMap())) {
- if (o instanceof BeanMap bm) {
+ if (o instanceof BeanMap o2) {
var uri = (Object)null;
- var rbm = getRdfBeanMeta(bm.getMeta());
+ var rbm = getRdfBeanMeta(o2.getMeta());
if (rbm.hasBeanUri())
- uri = rbm.getBeanUriProperty().get(bm,
null);
+ uri = rbm.getBeanUriProperty().get(o2,
null);
var uri2 = getUri(uri, null);
n = m.createResource(uri2);
- serializeBeanMap(bm, (Resource)n, typeName);
+ serializeBeanMap(o2, (Resource)n, typeName);
} else {
var m2 = (Map)o;
n = m.createResource();
@@ -391,7 +391,7 @@ public class RdfSerializerSession extends
WriterSerializerSession {
} else if (sType.isBean()) {
var bm = toBeanMap(o);
var uri = (Object)null;
- RdfBeanMeta rbm = getRdfBeanMeta(bm.getMeta());
+ RdfBeanMeta rbm = getRdfBeanMeta(o2.getMeta());
if (rbm.hasBeanUri())
uri = rbm.getBeanUriProperty().get(bm, null);
String uri2 = getUri(uri, null);
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 238407cd2a..4fd525d2b6 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
@@ -4430,8 +4430,8 @@ public class BeanContext extends Context {
}
// Handle ClassInfo by extracting the underlying Type
- if (o instanceof ClassInfo ci) {
- return resolveClassMeta(ci.innerType(), typeVars);
+ if (o instanceof ClassInfo o2) {
+ return resolveClassMeta(o2.innerType(), typeVars);
}
var c = TypeVariables.resolve(o, typeVars);
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 8b5e7fcf65..b256dc2db8 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
@@ -652,7 +652,7 @@ public class HtmlParserSession extends XmlParserSession {
}
}
if (nn(m) && nn(c)) {
- var m2 = (m instanceof JsonMap ?
(JsonMap)m : new JsonMap(m).session(this));
+ var m2 = (m instanceof JsonMap o3 ? o3
: new JsonMap(m).session(this));
m2.put(getBeanTypePropertyName(type.getElementType()), c);
l.add((E)cast(m2, pMeta, elementType));
} else {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 4e1141cc18..1738d5f011 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -926,8 +926,8 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
} else if (sType.isMap() || (nn(wType) &&
wType.isMap())) {
out.nlIf(! isRoot, xIndent + 1);
- if (o instanceof BeanMap)
- serializeBeanMap(out, (BeanMap)o,
eType, pMeta);
+ if (o instanceof BeanMap o2)
+ serializeBeanMap(out, o2, eType, pMeta);
else
serializeMap(out, (Map)o, sType,
eType.getKeyType(), eType.getValueType(), typeName, pMeta);
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 a04d977769..04fc35575d 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
@@ -368,22 +368,22 @@ public class HttpPartSchema {
apply(a2);
else if (a instanceof FormData a2)
apply(a2);
- else if (a instanceof Query a3)
- apply(a3);
- else if (a instanceof Path a4)
- apply(a4);
- else if (a instanceof PathRemainder a5)
- apply(a5);
- else if (a instanceof Response a6)
- apply(a6);
- else if (a instanceof StatusCode a7)
- apply(a7);
- else if (a instanceof HasQuery a8)
- apply(a8);
- else if (a instanceof HasFormData a9)
- apply(a9);
- else if (a instanceof Schema a10)
- apply(a10);
+ else if (a instanceof Query a2)
+ apply(a2);
+ else if (a instanceof Path a2)
+ apply(a2);
+ else if (a instanceof PathRemainder a2)
+ apply(a2);
+ else if (a instanceof Response a2)
+ apply(a2);
+ else if (a instanceof StatusCode a2)
+ apply(a2);
+ else if (a instanceof HasQuery a2)
+ apply(a2);
+ else if (a instanceof HasFormData a2)
+ apply(a2);
+ else if (a instanceof Schema a2)
+ apply(a2);
else if
(cn(a.annotationType()).startsWith("jakarta.validation.constraints."))
applyJakartaValidation(a);
else
@@ -4126,8 +4126,8 @@ public class HttpPartSchema {
protected FluentMap<String,Object> properties() {
// @formatter:off
Predicate<Object> ne = x -> ne(s(x));
- Predicate<Object> nf = x -> x instanceof Boolean && (Boolean)x;
- Predicate<Object> nm1 = x -> x instanceof Number &&
((Number)x).intValue() != -1;
+ Predicate<Object> nf = x -> x instanceof Boolean x2 && x2;
+ Predicate<Object> nm1 = x -> x instanceof Number x2 &&
x2.intValue() != -1;
Predicate<Object> nn = Utils::nn;
return mapb_so().sorted().buildFluent()
.ai(ne, "name", name)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
index 90b5bdfe9e..d6cfc78512 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
@@ -46,8 +46,9 @@ public class SchemaValidationException extends ParseException
{
@Override /* Overridden from ParseException */
public SchemaValidationException getRootCause() {
ParseException t = this;
- while (! (t.getCause() == null || ! (t.getCause() instanceof
SchemaValidationException)))
- t = (SchemaValidationException)t.getCause();
+ while (t.getCause() instanceof SchemaValidationException t2) {
+ t = t2;
+ }
return (SchemaValidationException)t;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 5eeeb78a09..d408753cc3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -408,8 +408,8 @@ public class JsonSerializerSession extends
WriterSerializerSession {
} else if (sType.isUri() || (nn(pMeta) && pMeta.isUri())) {
out.uriValue(o);
} else if (sType.isMap()) {
- if (o instanceof BeanMap)
- serializeBeanMap(out, (BeanMap)o, typeName);
+ if (o instanceof BeanMap o2)
+ serializeBeanMap(out, o2, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 143ed58185..421ebd6118 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -263,8 +263,8 @@ public class MsgPackSerializerSession extends
OutputStreamSerializerSession {
else if (sType.isUri() || (nn(pMeta) && pMeta.isUri()))
out.appendString(resolveUri(o.toString()));
else if (sType.isMap()) {
- if (o instanceof BeanMap)
- serializeBeanMap(out, (BeanMap)o, typeName);
+ if (o instanceof BeanMap o2)
+ serializeBeanMap(out, o2, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
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 cbc3eaadca..ddb6d0c5dc 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
@@ -338,12 +338,12 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
out = toSpacedHex(toType(value,
CM_ByteArray));
} else if (f == DATE) {
try {
- if (value instanceof Calendar)
- out =
TemporalCalendarSwap.IsoDate.DEFAULT.swap(this, (Calendar)value);
- else if (value instanceof Date)
- out =
TemporalDateSwap.IsoDate.DEFAULT.swap(this, (Date)value);
- else if (value instanceof
Temporal)
- out =
TemporalSwap.IsoDate.DEFAULT.swap(this, (Temporal)value);
+ if (value instanceof Calendar
value2)
+ out =
TemporalCalendarSwap.IsoDate.DEFAULT.swap(this, value2);
+ else if (value instanceof Date
value2)
+ out =
TemporalDateSwap.IsoDate.DEFAULT.swap(this, value2);
+ else if (value instanceof
Temporal value2)
+ out =
TemporalSwap.IsoDate.DEFAULT.swap(this, value2);
else
out = value.toString();
} catch (Exception e) {
@@ -351,12 +351,12 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
}
} else if (f == DATE_TIME) {
try {
- if (value instanceof Calendar)
- out =
TemporalCalendarSwap.IsoInstant.DEFAULT.swap(this, (Calendar)value);
- else if (value instanceof Date)
- out =
TemporalDateSwap.IsoInstant.DEFAULT.swap(this, (Date)value);
- else if (value instanceof
Temporal)
- out =
TemporalSwap.IsoInstant.DEFAULT.swap(this, (Temporal)value);
+ if (value instanceof Calendar
value2)
+ out =
TemporalCalendarSwap.IsoInstant.DEFAULT.swap(this, value2);
+ else if (value instanceof Date
value2)
+ out =
TemporalDateSwap.IsoInstant.DEFAULT.swap(this, value2);
+ else if (value instanceof
Temporal value2)
+ out =
TemporalSwap.IsoInstant.DEFAULT.swap(this, value2);
else
out = value.toString();
} catch (Exception e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 25501f27b1..8287139e70 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -227,8 +227,8 @@ public class ParserSet {
*/
public boolean canApply(AnnotationWorkList work) {
for (var o : entries)
- if (o instanceof Parser.Builder)
- if (((Parser.Builder)o).canApply(work))
+ if (o instanceof Parser.Builder o2)
+ if (o2.canApply(work))
return true;
return false;
}
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 dbe32092b6..d465d16827 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
@@ -266,15 +266,15 @@ public class SerializerSession extends
BeanTraverseSession {
* @param causedBy The exception to cast or wrap.
*/
protected static <T extends Throwable> void handleThrown(T causedBy) {
- if (causedBy instanceof Error)
- throw (Error)causedBy;
- if (causedBy instanceof RuntimeException)
- throw (RuntimeException)causedBy;
+ if (causedBy instanceof Error causedBy2)
+ throw causedBy2;
+ if (causedBy instanceof RuntimeException causedBy2)
+ throw causedBy2;
if (causedBy instanceof StackOverflowError)
throw new SerializeException(
"Stack overflow occurred. This can occur when
trying to serialize models containing loops. It's recommended you use the
BeanTraverseContext.BEANTRAVERSE_detectRecursions setting to help locate the
loop.");
- if (causedBy instanceof SerializeException)
- throw (SerializeException)causedBy;
+ if (causedBy instanceof SerializeException causedBy2)
+ throw causedBy2;
throw new SerializeException(causedBy);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index da82058e25..2e49697809 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -223,8 +223,8 @@ public class SerializerSet {
*/
public boolean canApply(AnnotationWorkList work) {
for (var o : entries)
- if (o instanceof Serializer.Builder)
- if
(((Serializer.Builder)o).canApply(work))
+ if (o instanceof Serializer.Builder o2)
+ if (o2.canApply(work))
return true;
return false;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index c8d8920195..845487173c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -452,8 +452,8 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
else if (sType.isUri() || (nn(pMeta) && pMeta.isUri()))
out.appendUri(o);
else if (sType.isMap()) {
- if (o instanceof BeanMap)
- serializeBeanMap(out, (BeanMap)o, typeName);
+ if (o instanceof BeanMap o2)
+ serializeBeanMap(out, o2, typeName);
else
serializeMap(out, (Map)o, eType);
} else if (sType.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 65f3a76e70..5cf0ca197c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -404,11 +404,11 @@ public class XmlSerializerSession extends
WriterSerializerSession {
if (pMeta.isUri()) {
out.attrUri(ns, key, value);
} else if (n.equals(attrsProperty)) {
- if (value instanceof BeanMap<?>
bm2) {
- bm2.forEachValue(x ->
true, (pMeta2, key2, value2, thrown2) -> {
+ if (value instanceof BeanMap<?>
value2) {
+ value2.forEachValue(x
-> true, (pMeta2, key2, value3, thrown2) -> {
if (nn(thrown2))
onBeanGetterException(pMeta, thrown2);
- out.attr(ns,
key2, value2);
+ out.attr(ns,
key2, value3);
});
} else /* Map */ {
var m2 = (Map)value;
@@ -951,8 +951,8 @@ public class XmlSerializerSession extends
WriterSerializerSession {
} else if (sType.isNumber() || sType.isBoolean()) {
out.append(o);
} else if (sType.isMap() || (nn(wType) &&
wType.isMap())) {
- if (o instanceof BeanMap)
- rc = serializeBeanMap(out, (BeanMap)o,
elementNamespace, isCollapsed, isMixedOrText);
+ if (o instanceof BeanMap o2)
+ rc = serializeBeanMap(out, o2,
elementNamespace, isCollapsed, isMixedOrText);
else
rc = serializeMap(out, (Map)o, sType,
eType.getKeyType(), eType.getValueType(), isMixedOrText);
} else if (sType.isBean()) {
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 6ca5810986..225f5216b6 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
@@ -409,22 +409,22 @@ public class Microservice implements ConfigEventListener {
public Builder manifest(Object value) throws IOException {
if (value == null)
this.manifest = null;
- else if (value instanceof ManifestFile manifestFile)
- this.manifest = manifestFile;
- else if (value instanceof Manifest manifest)
- this.manifest = new ManifestFile(manifest);
- else if (value instanceof Reader reader)
- this.manifest = new ManifestFile(reader);
- else if (value instanceof InputStream inputStream)
- this.manifest = new ManifestFile(inputStream);
- else if (value instanceof File file)
- this.manifest = new ManifestFile(file);
- else if (value instanceof Path path)
- this.manifest = new ManifestFile(path);
- else if (value instanceof String string)
- this.manifest = new
ManifestFile(resolveFile(string));
- else if (value instanceof Class clazz)
- this.manifest = new ManifestFile(clazz);
+ else if (value instanceof ManifestFile value2)
+ this.manifest = value2;
+ else if (value instanceof Manifest value2)
+ this.manifest = new ManifestFile(value2);
+ else if (value instanceof Reader value2)
+ this.manifest = new ManifestFile(value2);
+ else if (value instanceof InputStream value2)
+ this.manifest = new ManifestFile(value2);
+ else if (value instanceof File value2)
+ this.manifest = new ManifestFile(value2);
+ else if (value instanceof Path value2)
+ this.manifest = new ManifestFile(value2);
+ else if (value instanceof String value2)
+ this.manifest = new
ManifestFile(resolveFile(value2));
+ else if (value instanceof Class value2)
+ this.manifest = new ManifestFile(value2);
else
throw rex("Invalid type passed to
Builder.manifest(Object). Type=[{0}]", cn(value));
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index a16d2e4cd2..4776ad73b9 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -208,14 +208,14 @@ public class JettyMicroservice extends Microservice {
public Builder jettyXml(Object jettyXml, boolean resolveVars)
throws IOException {
if (jettyXml instanceof String jettyXml2)
this.jettyXml = read(resolveFile(jettyXml2));
- else if (jettyXml instanceof File jettyXml3)
- this.jettyXml = read(jettyXml3);
- else if (jettyXml instanceof Path jettyXml4)
- this.jettyXml = read(jettyXml4);
- else if (jettyXml instanceof InputStream jettyXml5)
- this.jettyXml = read(jettyXml5);
- else if (jettyXml instanceof Reader jettyXml6)
- this.jettyXml = read(jettyXml6);
+ else if (jettyXml instanceof File jettyXml2)
+ this.jettyXml = read(jettyXml2);
+ else if (jettyXml instanceof Path jettyXml2)
+ this.jettyXml = read(jettyXml2);
+ else if (jettyXml instanceof InputStream jettyXml2)
+ this.jettyXml = read(jettyXml2);
+ else if (jettyXml instanceof Reader jettyXml2)
+ this.jettyXml = read(jettyXml2);
else
throw rex("Invalid object type passed to
jettyXml(Object): {0}", cn(jettyXml));
this.jettyXmlResolveVars = resolveVars;
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 589422d830..1f7beabef2 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
@@ -3013,10 +3013,10 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
throw new
ConfigException("Invalid object of type ''{0}'' passed to interceptors().",
ci.getName());
if (o instanceof HttpRequestInterceptor
o2)
addInterceptorLast(o2);
- if (o instanceof
HttpResponseInterceptor o3)
- addInterceptorLast(o3);
- if (o instanceof RestCallInterceptor o4)
- l.add(o4);
+ if (o instanceof
HttpResponseInterceptor o2)
+ addInterceptorLast(o2);
+ if (o instanceof RestCallInterceptor o2)
+ l.add(o2);
}
}
if (interceptors == null)
@@ -6717,10 +6717,10 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
return req.content(new
UrlEncodedFormEntity(body2));
if (body instanceof HttpResource body2)
body2.getHeaders().forEach(req::header);
- if (body instanceof HttpEntity body3) {
- if (body3.getContentType() == null)
+ if (body instanceof HttpEntity body2) {
+ if (body2.getContentType() == null)
req.header(ContentType.APPLICATION_FORM_URLENCODED);
- return req.content(body3);
+ return req.content(body2);
}
if (body instanceof Reader || body instanceof
InputStream)
return
req.header(ContentType.APPLICATION_FORM_URLENCODED).content(body);
@@ -8097,10 +8097,10 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
try {
if (x instanceof URI x2)
return x2;
- if (x instanceof URL x3)
- return x3.toURI();
- if (x instanceof URIBuilder x4)
- return x4.build();
+ if (x instanceof URL x2)
+ return x2.toURI();
+ if (x instanceof URIBuilder x2)
+ return x2.build();
var s = x == null ? "" : x.toString();
if (nn(rootUrl) && !
absUrlPattern.matcher(s).matches()) {
if (s.isEmpty())
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 50e85e9dde..653d8f094a 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
@@ -1934,21 +1934,21 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
input2 = s.get();
HttpEntity entity = null;
- if (input2 instanceof PartList input22)
- entity = new
UrlEncodedFormEntity(input22.stream().map(SimpleFormData::new).filter(SimplePart::isValid).toList());
- else if (input2 instanceof HttpResource
input23) {
-
input23.getHeaders().forEach(request::addHeader);
+ if (input2 instanceof PartList input3)
+ entity = new
UrlEncodedFormEntity(input3.stream().map(SimpleFormData::new).filter(SimplePart::isValid).toList());
+ else if (input2 instanceof HttpResource input3)
{
+
input3.getHeaders().forEach(request::addHeader);
entity = (HttpEntity)input2;
} else if (input2 instanceof HttpEntity input3)
{
- if (input3 instanceof SerializedEntity
input32) {
- entity =
input32.copyWith(serializer, contentSchema);
+ if (input3 instanceof SerializedEntity
input4) {
+ entity =
input4.copyWith(serializer, contentSchema);
} else {
entity = input3;
}
- } else if (input2 instanceof Reader input24)
- entity = readerEntity(input24,
getRequestContentType(TEXT_PLAIN));
- else if (input2 instanceof InputStream input25)
- entity = streamEntity(input25, -1,
getRequestContentType(ContentType.APPLICATION_OCTET_STREAM));
+ } else if (input2 instanceof Reader input3)
+ 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 {
@@ -2511,8 +2511,8 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
} else if (isArray(value)) {
for (var i = 0; i < Array.getLength(value); i++)
l.add(HttpParts.cast(Array.get(value, i)));
- } else if (value instanceof Map value4) {
- toMap(value4).forEach((k, v) -> l.add(createPart(s(k),
v, FORMDATA, serializer, schema, skipIfEmpty)));
+ } else if (value instanceof Map value2) {
+ toMap(value2).forEach((k, v) -> l.add(createPart(s(k),
v, FORMDATA, serializer, schema, skipIfEmpty)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k, v) -> l.add(createPart(k,
v, FORMDATA, serializer, schema, skipIfEmpty)));
} else if (nn(value)) {
@@ -2589,8 +2589,8 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
} else if (isArray(value)) {
for (var i = 0; i < Array.getLength(value); i++)
l.add(HttpParts.cast(Array.get(value, i)));
- } else if (value instanceof Map value4) {
- toMap(value4).forEach((k, v) -> l.add(createPart(s(k),
v, PATH, serializer, schema, false)));
+ } else if (value instanceof Map value2) {
+ toMap(value2).forEach((k, v) -> l.add(createPart(s(k),
v, PATH, serializer, schema, false)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k, v) -> l.add(createPart(k,
v, PATH, serializer, schema, false)));
} else if (nn(value)) {
@@ -2622,8 +2622,8 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
} else if (isArray(value)) {
for (var i = 0; i < Array.getLength(value); i++)
l.add(HttpParts.cast(Array.get(value, i)));
- } else if (value instanceof Map value4) {
- toMap(value4).forEach((k, v) -> l.add(createPart(s(k),
v, QUERY, serializer, schema, skipIfEmpty)));
+ } else if (value instanceof Map value2) {
+ toMap(value2).forEach((k, v) -> l.add(createPart(s(k),
v, QUERY, serializer, schema, skipIfEmpty)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k, v) -> l.add(createPart(k,
v, QUERY, serializer, schema, skipIfEmpty)));
} else if (nn(value)) {
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index 552d11405a..5b747f1b2d 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -125,63 +125,63 @@ public class MockServletRequest implements
HttpServletRequest {
*/
public MockServletRequest applyOverrides(HttpRequest req) {
- if (req instanceof MockRestRequest mreq) {
- mreq.getAttributeMap().forEach(this::attribute);
-
mreq.getRequestDispatcherMap().forEach(this::requestDispatcher);
- if (nn(mreq.getCharacterEncoding()))
- characterEncoding(mreq.getCharacterEncoding());
- if (nn(mreq.getProtocol()))
- protocol(mreq.getProtocol());
- if (nn(mreq.getScheme()))
- scheme(mreq.getScheme());
- if (nn(mreq.getServerName()))
- serverName(mreq.getServerName());
- if (nn(mreq.getRemoteAddr()))
- remoteAddr(mreq.getRemoteAddr());
- if (nn(mreq.getRemoteHost()))
- remoteHost(mreq.getRemoteHost());
- if (nn(mreq.getLocalName()))
- localName(mreq.getLocalName());
- if (nn(mreq.getLocalAddr()))
- localAddr(mreq.getLocalAddr());
- if (nn(mreq.getPathInfo()))
- pathInfo(mreq.getPathInfo());
- if (nn(mreq.getPathTranslated()))
- pathTranslated(mreq.getPathTranslated());
- if (nn(mreq.getContextPath()))
- contextPath(mreq.getContextPath());
- if (nn(mreq.getQueryString()))
- queryString(mreq.getQueryString());
- if (nn(mreq.getRemoteUser()))
- remoteUser(mreq.getRemoteUser());
- if (nn(mreq.getRequestedSessionId()))
-
requestedSessionId(mreq.getRequestedSessionId());
- if (nn(mreq.getRequestURI()))
- requestURI(mreq.getRequestURI());
- if (nn(mreq.getServletPath()))
- servletPath(mreq.getServletPath());
- if (nn(mreq.getAuthType()))
- authType(mreq.getAuthType());
- if (nn(mreq.getServerPort()))
- serverPort(mreq.getServerPort());
- if (nn(mreq.getRemotePort()))
- remotePort(mreq.getRemotePort());
- if (nn(mreq.getLocalPort()))
- localPort(mreq.getLocalPort());
- if (nn(mreq.getLocale()))
- locale(mreq.getLocale());
- if (nn(mreq.getServletContext()))
- servletContext(mreq.getServletContext());
- if (nn(mreq.getDispatcherType()))
- dispatcherType(mreq.getDispatcherType());
- if (nn(mreq.getCookies()))
- cookies(mreq.getCookies());
- if (nn(mreq.getUserPrincipal()))
- userPrincipal(mreq.getUserPrincipal());
- if (nn(mreq.getHttpSession()))
- httpSession(mreq.getHttpSession());
- if (nn(mreq.getRoles()))
- roles(mreq.getRoles());
+ if (req instanceof MockRestRequest req2) {
+ req2.getAttributeMap().forEach(this::attribute);
+
req2.getRequestDispatcherMap().forEach(this::requestDispatcher);
+ if (nn(req2.getCharacterEncoding()))
+ characterEncoding(req2.getCharacterEncoding());
+ if (nn(req2.getProtocol()))
+ protocol(req2.getProtocol());
+ if (nn(req2.getScheme()))
+ scheme(req2.getScheme());
+ if (nn(req2.getServerName()))
+ serverName(req2.getServerName());
+ if (nn(req2.getRemoteAddr()))
+ remoteAddr(req2.getRemoteAddr());
+ if (nn(req2.getRemoteHost()))
+ remoteHost(req2.getRemoteHost());
+ if (nn(req2.getLocalName()))
+ localName(req2.getLocalName());
+ if (nn(req2.getLocalAddr()))
+ localAddr(req2.getLocalAddr());
+ if (nn(req2.getPathInfo()))
+ pathInfo(req2.getPathInfo());
+ if (nn(req2.getPathTranslated()))
+ pathTranslated(req2.getPathTranslated());
+ if (nn(req2.getContextPath()))
+ contextPath(req2.getContextPath());
+ if (nn(req2.getQueryString()))
+ queryString(req2.getQueryString());
+ if (nn(req2.getRemoteUser()))
+ remoteUser(req2.getRemoteUser());
+ if (nn(req2.getRequestedSessionId()))
+
requestedSessionId(req2.getRequestedSessionId());
+ if (nn(req2.getRequestURI()))
+ requestURI(req2.getRequestURI());
+ if (nn(req2.getServletPath()))
+ servletPath(req2.getServletPath());
+ if (nn(req2.getAuthType()))
+ authType(req2.getAuthType());
+ if (nn(req2.getServerPort()))
+ serverPort(req2.getServerPort());
+ if (nn(req2.getRemotePort()))
+ remotePort(req2.getRemotePort());
+ if (nn(req2.getLocalPort()))
+ localPort(req2.getLocalPort());
+ if (nn(req2.getLocale()))
+ locale(req2.getLocale());
+ if (nn(req2.getServletContext()))
+ servletContext(req2.getServletContext());
+ if (nn(req2.getDispatcherType()))
+ dispatcherType(req2.getDispatcherType());
+ if (nn(req2.getCookies()))
+ cookies(req2.getCookies());
+ if (nn(req2.getUserPrincipal()))
+ userPrincipal(req2.getUserPrincipal());
+ if (nn(req2.getHttpSession()))
+ httpSession(req2.getHttpSession());
+ if (nn(req2.getRoles()))
+ roles(req2.getRoles());
}
return this;
@@ -248,14 +248,14 @@ public class MockServletRequest implements
HttpServletRequest {
*/
public MockServletRequest content(Object value) {
try {
- if (value instanceof byte[] byteArray)
- this.content = byteArray;
- else if (value instanceof Reader reader)
- this.content = readBytes(reader);
- else if (value instanceof InputStream inputstream)
- this.content = readBytes(inputstream);
- else if (value instanceof CharSequence charsequence)
- this.content =
charsequence.toString().getBytes();
+ if (value instanceof byte[] value2)
+ this.content = value2;
+ else if (value instanceof Reader value2)
+ this.content = readBytes(value2);
+ else if (value instanceof InputStream value2)
+ this.content = readBytes(value2);
+ else if (value instanceof CharSequence value2)
+ this.content = value2.toString().getBytes();
else if (nn(value))
this.content = value.toString().getBytes();
} catch (IOException e) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChildren.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChildren.java
index eb5a60cf1a..ed7a1bddfe 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChildren.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChildren.java
@@ -133,8 +133,8 @@ public class RestChildren {
public void destroy() {
for (var r : children.values()) {
r.destroy();
- if (r.getResource() instanceof Servlet)
- ((Servlet)r.getResource()).destroy();
+ if (r.getResource() instanceof Servlet r2)
+ r2.destroy();
}
}
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 1149ce061f..5559d2ed8f 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
@@ -5913,8 +5913,8 @@ public class RestContext extends Context {
if (t instanceof InvocationTargetException t2)
t = t2.getTargetException();
- if (t instanceof ExecutableException t3)
- t = t3.getTargetException();
+ if (t instanceof ExecutableException t2)
+ t = t2.getTargetException();
if (t instanceof BasicHttpException t2)
return t2;
@@ -6041,7 +6041,7 @@ public class RestContext extends Context {
if (r.value().length > 0)
code = r.value()[0];
- var e2 = (e instanceof BasicHttpException e3 ? e3 : new
BasicHttpException(code, e));
+ var e2 = (e instanceof BasicHttpException e22 ? e22 : new
BasicHttpException(code, e));
var req = session.getRequest();
var res = session.getResponse();
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 734ea20715..773b5a73d5 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
@@ -205,8 +205,8 @@ public class RestResponse extends
HttpServletResponseWrapper {
// Do nothing.
} else if (header instanceof BasicUriHeader header2) {
addHeader(header2.getName(),
resolveUris(header2.getValue()));
- } else if (header instanceof SerializedHeader header3) {
- var x =
header3.copyWith(request.getPartSerializerSession(), null);
+ } else if (header instanceof SerializedHeader header2) {
+ var x =
header2.copyWith(request.getPartSerializerSession(), null);
addHeader(x.getName(), resolveUris(x.getValue()));
} else {
addHeader(header.getName(), header.getValue());
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 a0cf9f6d20..9de727a8d7 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
@@ -1035,10 +1035,10 @@ public class BasicSwaggerProviderSession {
for (var val : om) {
if (val instanceof JsonMap val2) {
val = resolve(val2);
- } else if (val instanceof JsonList val3) {
- val = resolve(val3);
- } else if (val instanceof String val4) {
- val = resolve(val4);
+ } else if (val instanceof JsonList val2) {
+ val = resolve(val2);
+ } else if (val instanceof String val2) {
+ val = resolve(val2);
}
ol2.add(val);
}
@@ -1057,10 +1057,10 @@ public class BasicSwaggerProviderSession {
var val = e.getValue();
if (val instanceof JsonMap val2) {
val = resolve(val2);
- } else if (val instanceof JsonList val3) {
- val = resolve(val3);
- } else if (val instanceof String val4) {
- val = resolve(val4);
+ } else if (val instanceof JsonList val2) {
+ val = resolve(val2);
+ } else if (val instanceof String val2) {
+ val = resolve(val2);
}
om2.put(e.getKey(), val);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
index 56e43fdb7a..f93458c38a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
@@ -248,9 +248,9 @@ class PropertyExtractor_Test extends TestBase {
@Override
public Object extract(BeanConverter converter,
Object o, String key) {
- if ("recursive".equals(key) && o
instanceof String str) {
+ if ("recursive".equals(key) && o
instanceof String o2) {
// Use the converter recursively
- return "RECURSIVE[" +
converter.stringify(str.length()) + "]";
+ return "RECURSIVE[" +
converter.stringify(o2.length()) + "]";
}
return "NON_RECURSIVE:" + key;
}
