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 9c98096a0d SonarQube bug fixes
9c98096a0d is described below
commit 9c98096a0d2fcecfa2c80fd14254236f88dce44e
Author: James Bognar <[email protected]>
AuthorDate: Thu Feb 5 15:35:42 2026 -0500
SonarQube bug fixes
---
.../juneau/commons/collections/FilteredSet.java | 6 ++--
.../org/apache/juneau/commons/io/LocalDir.java | 5 ++-
.../juneau/commons/reflect/AnnotationInfo.java | 14 +++------
.../juneau/commons/reflect/AnnotationProvider.java | 12 +++-----
.../apache/juneau/commons/reflect/ClassInfo.java | 10 +++---
.../apache/juneau/commons/reflect/FieldInfo.java | 10 +++---
.../juneau/commons/reflect/ParameterInfo.java | 12 +++-----
.../apache/juneau/commons/reflect/Visibility.java | 15 ++++-----
.../juneau/commons/time/GranularZonedDateTime.java | 18 +++++------
.../apache/juneau/commons/utils/StringUtils.java | 22 ++++++-------
.../apache/juneau/config/internal/ConfigMap.java | 6 ++--
.../main/java/org/apache/juneau/BeanContext.java | 32 ++++++++-----------
.../src/main/java/org/apache/juneau/BeanMeta.java | 12 +++-----
.../main/java/org/apache/juneau/BeanSession.java | 5 ++-
.../apache/juneau/html/HtmlSerializerSession.java | 6 ++--
.../juneau/httppart/bean/ResponseBeanMeta.java | 6 ++--
.../org/apache/juneau/json/JsonParserSession.java | 5 ++-
.../java/org/apache/juneau/json/JsonWriter.java | 6 ++--
.../org/apache/juneau/parser/ParserSession.java | 5 ++-
.../java/org/apache/juneau/parser/ParserSet.java | 7 ++---
.../juneau/serializer/SerializerSession.java | 12 +++-----
.../apache/juneau/serializer/SerializerSet.java | 7 ++---
.../org/apache/juneau/uon/UonParserSession.java | 26 ++++++----------
.../urlencoding/UrlEncodingParserSession.java | 6 ++--
.../urlencoding/UrlEncodingSerializerSession.java | 12 +++-----
.../java/org/apache/juneau/xml/XmlBeanMeta.java | 6 ++--
.../apache/juneau/xml/XmlSerializerSession.java | 20 +++++-------
.../apache/juneau/rest/client/ResponseContent.java | 11 +++----
.../juneau/http/header/SerializedHeader.java | 6 ++--
.../apache/juneau/http/part/SerializedPart.java | 6 ++--
.../apache/juneau/rest/mock/MockPathResolver.java | 14 ++++-----
.../java/org/apache/juneau/rest/RestContext.java | 5 ++-
.../java/org/apache/juneau/rest/RestOpContext.java | 36 +++++++++-------------
.../java/org/apache/juneau/rest/RestOpInvoker.java | 5 ++-
.../apache/juneau/rest/vars/RequestSwaggerVar.java | 6 ++--
35 files changed, 151 insertions(+), 241 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredSet.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredSet.java
index e5b8e5cbac..dd0a44df3e 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredSet.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredSet.java
@@ -328,10 +328,8 @@ public class FilteredSet<E> extends AbstractSet<E> {
public boolean addAll(Collection<? extends E> c) {
boolean modified = false;
for (var e : c) {
- if (filter.test(e)) {
- if (set.add(e))
- modified = true;
- }
+ if (filter.test(e) && set.add(e))
+ modified = true;
}
return modified;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
index 5d35b3c106..9f582951e0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
@@ -102,9 +102,8 @@ public class LocalDir {
if (url == null)
return false;
var uri = url.toURI();
- if (uri.toString().startsWith("file:"))
- if (Files.isDirectory(Paths.get(uri)))
- return false;
+ if (uri.toString().startsWith("file:") &&
Files.isDirectory(Paths.get(uri)))
+ return false;
return true;
});
}
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 7c1f881c43..1f85c66c00 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
@@ -727,10 +727,8 @@ public class AnnotationInfo<T extends Annotation> {
var val = x.invoke(a);
var d = x.inner().getDefaultValue();
// Add values only if they're different from the
default.
- if (neq(val, d)) {
- if (! (isArray(val) && length(val) == 0 &&
isArray(d) && length(d) == 0))
- return val;
- }
+ if (neq(val, d) && ! (isArray(val) && length(val) == 0
&& isArray(d) && length(d) == 0))
+ return val;
return null;
}, e -> lm(e)).ifPresent(v -> ja.a(x.getName(), v)));
return filteredBeanPropertyMap()
@@ -815,11 +813,9 @@ public class AnnotationInfo<T extends Annotation> {
var val = m.invoke(a);
var d = m.inner().getDefaultValue();
// Add values only if they're different from the default
- if (neq(val, d)) {
- if (! (isArray(val) && length(val) == 0 &&
isArray(d) && length(d) == 0)) {
- var valueStr =
formatAnnotationValue(val);
- values.add(m.getName() + "=" +
valueStr);
- }
+ if (neq(val, d) && ! (isArray(val) && length(val) == 0
&& isArray(d) && length(d) == 0)) {
+ var valueStr = formatAnnotationValue(val);
+ values.add(m.getName() + "=" + valueStr);
}
return null;
}, e -> null));
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 386fa52f68..b75cb15839 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
@@ -1020,10 +1020,8 @@ public class AnnotationProvider {
l.addAll(p.getDeclaredAnnotations());
}
}
- if (t.contains(PACKAGE)) {
- if (element2.getPackage() != null)
-
l.addAll(element2.getPackage().getAnnotations());
- }
+ if (t.contains(PACKAGE) && element2.getPackage() !=
null)
+
l.addAll(element2.getPackage().getAnnotations());
} else if (element instanceof MethodInfo element2) {
if (t.contains(SELF)) {
l.addAll(runtimeCache.get(element2.inner()));
@@ -1041,10 +1039,8 @@ public class AnnotationProvider {
if (t.contains(RETURN_TYPE)) {
l.addAll(find(element2.getReturnType().unwrap(Value.class, Optional.class),
a(PARENTS)));
}
- if (t.contains(PACKAGE)) {
- if (element2.getDeclaringClass().getPackage()
!= null)
-
l.addAll(element2.getDeclaringClass().getPackage().getAnnotations());
- }
+ if (t.contains(PACKAGE) &&
element2.getDeclaringClass().getPackage() != null)
+
l.addAll(element2.getDeclaringClass().getPackage().getAnnotations());
} else if (element instanceof FieldInfo element2) {
if (t.contains(SELF)) {
l.addAll(runtimeCache.get(element2.inner()));
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 cd344ad1e7..0b22e83d12 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
@@ -1424,12 +1424,10 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
// needs to be resolved further up the
enclosing class chain.
var key = entry.getKey();
var value = entry.getValue();
- if (key instanceof TypeVariable<?>
key2) {
- if
(key2.getName().equals(actualType3.getName()) &&
isInnerClass(key2.getGenericDeclaration(),
actualType3.getGenericDeclaration())) {
- if (value instanceof
Class<?> value2)
- return value2;
- actualType3 =
(TypeVariable<?>)entry.getValue();
- }
+ if (key instanceof TypeVariable<?> key2
&& key2.getName().equals(actualType3.getName()) &&
isInnerClass(key2.getGenericDeclaration(),
actualType3.getGenericDeclaration())) {
+ if (value instanceof Class<?>
value2)
+ return value2;
+ actualType3 =
(TypeVariable<?>)entry.getValue();
}
}
}
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 38720ae2f1..8f21c1cfcf 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
@@ -619,12 +619,10 @@ public class FieldInfo extends AccessibleInfo implements
Comparable<FieldInfo>,
elementType =
elementClass;
}
}
- } 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) {
- elementType =
valueClass;
- }
+ } else if (eq(inner2, Map.class) &&
parameterizedType instanceof ParameterizedType pt2) {
+ var typeArgs =
pt2.getActualTypeArguments();
+ if (typeArgs.length >= 2 && typeArgs[0]
== String.class && typeArgs[1] instanceof Class<?> valueClass) {
+ elementType = 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 3347780a5d..7ee024f883 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
@@ -921,14 +921,12 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
elementType =
elementClass;
}
}
- } else if (eq(inner2, Map.class)) {
+ } else if (eq(inner2, Map.class) &&
parameterizedType instanceof ParameterizedType pt2) {
// Handle Map<String,T> - extract value
type (second type argument)
- if (parameterizedType instanceof
ParameterizedType pt2) {
- var typeArgs =
pt2.getActualTypeArguments();
- // Verify key type is String
and get value type
- if (typeArgs.length >= 2 &&
typeArgs[0] == String.class && typeArgs[1] instanceof Class<?> valueClass) {
- elementType =
valueClass;
- }
+ var typeArgs =
pt2.getActualTypeArguments();
+ // Verify key type is String and get
value type
+ if (typeArgs.length >= 2 && typeArgs[0]
== String.class && typeArgs[1] instanceof Class<?> valueClass) {
+ elementType = valueClass;
}
}
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
index 0b48793bb1..60a56aa410 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
@@ -127,9 +127,8 @@ public enum Visibility {
*/
public <T> Constructor<T> transform(Constructor<T> x) {
assertArgNotNull(ARG_x, x);
- if (isVisible(x))
- if (! setAccessible(x))
- return null; // HTT
+ if (isVisible(x) && ! setAccessible(x))
+ return null; // HTT
return x;
}
@@ -147,9 +146,8 @@ public enum Visibility {
*/
public Field transform(Field x) {
assertArgNotNull(ARG_x, x);
- if (isVisible(x))
- if (! setAccessible(x))
- return null; // HTT
+ if (isVisible(x) && ! setAccessible(x))
+ return null; // HTT
return x;
}
@@ -167,9 +165,8 @@ public enum Visibility {
*/
public Method transform(Method x) {
assertArgNotNull(ARG_x, x);
- if (isVisible(x))
- if (! setAccessible(x))
- return null; // HTT
+ if (isVisible(x) && ! setAccessible(x))
+ return null; // HTT
return x;
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
index a7f830c566..f973d512a6 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
@@ -661,16 +661,14 @@ public class GranularZonedDateTime {
}
// Build ZoneId if we have offset information
- if (zoneId == null) {
- if (ohour >= 0) {
- if (ominute >= 0) {
- // If negative offset, both hours and
minutes must be negative
- var offset =
ZoneOffset.ofHoursMinutes(nego ? -ohour : ohour, nego ? -ominute : ominute);
- zoneId = offset;
- } else {
- var offset = ZoneOffset.ofHours(nego ?
-ohour : ohour);
- zoneId = offset;
- }
+ if (zoneId == null && ohour >= 0) {
+ if (ominute >= 0) {
+ // If negative offset, both hours and minutes
must be negative
+ var offset = ZoneOffset.ofHoursMinutes(nego ?
-ohour : ohour, nego ? -ominute : ominute);
+ zoneId = offset;
+ } else {
+ var offset = ZoneOffset.ofHours(nego ? -ohour :
ohour);
+ zoneId = offset;
}
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
index 2301474194..7948e159c4 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
@@ -7450,12 +7450,10 @@ public class StringUtils {
for (var i = 0; i < s.length(); i++) {
var c = s.charAt(i);
- if (c == '\\') {
- if (i + 1 != s.length()) {
- var c2 = s.charAt(i + 1);
- if (escaped.contains(c2)) {
- i++;
- }
+ if (c == '\\' && i + 1 != s.length()) {
+ var c2 = s.charAt(i + 1);
+ if (escaped.contains(c2)) {
+ i++;
}
}
sb.append(s.charAt(i));
@@ -7661,13 +7659,11 @@ public class StringUtils {
} else {
do {
caw.write(c);
- if (c >= 0xD800 && c <= 0xDBFF)
{
- if ((i + 1) <
s.length()) {
- int d =
s.charAt(i + 1);
- if (d >= 0xDC00
&& d <= 0xDFFF) {
-
caw.write(d);
- i++;
- }
+ if (c >= 0xD800 && c <= 0xDBFF
&& (i + 1) < s.length()) {
+ int d = s.charAt(i + 1);
+ if (d >= 0xDC00 && d <=
0xDFFF) {
+ caw.write(d);
+ i++;
}
}
i++;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index f3d49a1194..ff4b0b1465 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -707,10 +707,8 @@ public class ConfigMap implements ConfigStoreListener {
} else if (ce.getType() == REMOVE_ENTRY) {
if (nn(cs))
cs.entries.remove(ce.getKey());
- } else if (ce.getType() == REMOVE_SECTION) {
- if (nn(cs))
- entries.remove(section);
- }
+ } else if (ce.getType() == REMOVE_SECTION && nn(cs))
+ entries.remove(section);
if (addToChangeList)
changes.add(ce);
}
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 86e644e3a8..abce2cac51 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
@@ -3616,10 +3616,8 @@ public class BeanContext extends Context {
private static boolean isCacheable(Class<?> c) {
var n = c.getName();
var x = n.charAt(n.length() - 1); // All generated classes
appear to end with digits.
- if (x >= '0' && x <= '9') {
- if (n.indexOf("$$") != -1 || n.startsWith("sun") ||
n.startsWith("com.sun") || n.indexOf("$Proxy") != -1)
- return false;
- }
+ if ((x >= '0' && x <= '9') && (n.indexOf("$$") != -1 ||
n.startsWith("sun") || n.startsWith("com.sun") || n.indexOf("$Proxy") != -1))
+ return false;
return true;
}
@@ -4447,18 +4445,16 @@ public class BeanContext extends Context {
} while (nn(c));
}
- if (o instanceof ParameterizedType o2) {
- if (! o2.getRawType().equals(Enum.class)) {
- var l = new LinkedList<ClassMeta<?>>();
- for (var pt2 : o2.getActualTypeArguments()) {
- if (pt2 instanceof WildcardType || pt2
instanceof TypeVariable)
- return null;
- l.add(resolveClassMeta(pt2, null));
- }
- if (l.isEmpty())
+ if (o instanceof ParameterizedType o2 && !
o2.getRawType().equals(Enum.class)) {
+ var l = new LinkedList<ClassMeta<?>>();
+ for (var pt2 : o2.getActualTypeArguments()) {
+ if (pt2 instanceof WildcardType || pt2
instanceof TypeVariable)
return null;
- return l.toArray(new ClassMeta[l.size()]);
+ l.add(resolveClassMeta(pt2, null));
}
+ if (l.isEmpty())
+ return null;
+ return l.toArray(new ClassMeta[l.size()]);
}
return null;
@@ -4515,11 +4511,9 @@ public class BeanContext extends Context {
}
}
- if (rawType.isArray()) {
- if (o instanceof GenericArrayType o2) {
- var elementType =
resolveClassMeta(o2.getGenericComponentType(), typeVars);
- return new ClassMeta(rawType, null, null,
elementType);
- }
+ if (rawType.isArray() && o instanceof GenericArrayType o2) {
+ var elementType =
resolveClassMeta(o2.getGenericComponentType(), typeVars);
+ return new ClassMeta(rawType, null, null, elementType);
}
return rawType;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index d43389cf2f..19af5cca2b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -1156,14 +1156,12 @@ public class BeanMeta<T> {
methodType = SETTER;
}
} else if (params.size() == 2) {
- if ("*".equals(bpName) &&
params.get(0).getParameterType().is(String.class)) {
- if (n.startsWith("set") &&
(rt.isAssignableFrom(ci) || rt.is(Void.TYPE))) {
- methodType = SETTER;
- } else {
- methodType = GETTER;
- }
- n = bpName;
+ if ("*".equals(bpName) &&
params.get(0).getParameterType().is(String.class) && n.startsWith("set") &&
(rt.isAssignableFrom(ci) || rt.is(Void.TYPE))) {
+ methodType = SETTER;
+ } else {
+ methodType = GETTER;
}
+ n = bpName;
}
n = pn.getPropertyName(n);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 2eba0e3bd4..9241c88e33 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -1176,9 +1176,8 @@ public class BeanSession extends ContextSession {
// If no conversion needed, then just return the value.
// Don't include maps or collections, because child
elements may need conversion.
- if (tc.isInstance(value))
- if (! ((to.isMap() && !
to.getValueType().is(Object.class)) || ((to.isCollection() || to.isOptional())
&& ! to.getElementType().isObject())))
- return (T)value;
+ if (tc.isInstance(value) && ! ((to.isMap() && !
to.getValueType().is(Object.class)) || ((to.isCollection() || to.isOptional())
&& ! to.getElementType().isObject())))
+ return (T)value;
ObjectSwap swap = to.getSwap(this);
if (nn(swap)) {
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 fb12952d48..47c22f0115 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
@@ -392,10 +392,8 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
// Must be a bean or BeanMap.
for (var o : c) {
o = swap(swap, o);
- if (! canIgnoreValue(cm1, null, o)) {
- if (! cm1.isInstance(o))
- return null;
- }
+ if (! canIgnoreValue(cm1, null, o) && !
cm1.isInstance(o))
+ return null;
}
BeanMap<?> bm = toBeanMap(o1);
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 5fd063b931..60679f8ced 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
@@ -73,10 +73,8 @@ public class ResponseBeanMeta {
}
Builder apply(StatusCode a) {
- if (nn(a)) {
- if (a.value().length > 0)
- code = a.value()[0];
- }
+ if (nn(a) && a.value().length > 0)
+ code = a.value()[0];
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index ccc523e28b..24caf88a8d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -752,9 +752,8 @@ public class JsonParserSession extends ReaderParserSession {
// "/* */" style comments
if (c == '*') {
while (c != -1)
- if ((c = r.read()) == '*')
- if ((c = r.read()) == '/')
- return;
+ if ((c = r.read()) == '*' && (c = r.read()) ==
'/')
+ return;
// "//" style comments
} else if (c == '/') {
while (c != -1) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
index c9fd6e7dae..8ff8ffe6cc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
@@ -190,10 +190,8 @@ public class JsonWriter extends SerializerWriter {
}
// Reserved words and blanks must be quoted.
- if (! doConvert) {
- if (s.isEmpty() || reservedWords.contains(s))
- doConvert = true;
- }
+ if (! doConvert && (s.isEmpty() ||
reservedWords.contains(s)))
+ doConvert = true;
}
// If no conversion necessary, just print the attribute as-is.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index a4bc032490..e492e3aada 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -1075,9 +1075,8 @@ public class ParserSession extends BeanSession {
protected final <T> void onUnknownProperty(String propertyName,
BeanMap<T> beanMap, Object value) throws ParseException {
if
(propertyName.equals(getBeanTypePropertyName(beanMap.getClassMeta())))
return;
- if (! isIgnoreUnknownBeanProperties())
- if (nn(value) || ! isIgnoreUnknownNullBeanProperties())
- throw new ParseException(this, "Unknown
property ''{0}'' encountered while trying to parse into class ''{1}''",
propertyName, beanMap.getClassMeta());
+ if (! isIgnoreUnknownBeanProperties() && (nn(value) || !
isIgnoreUnknownNullBeanProperties()))
+ throw new ParseException(this, "Unknown property
''{0}'' encountered while trying to parse into class ''{1}''", propertyName,
beanMap.getClassMeta());
if (nn(listener))
listener.onUnknownBeanProperty(this, propertyName,
beanMap.getClassMeta().inner(), beanMap.getBean());
}
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 8287139e70..514498f840 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
@@ -226,10 +226,9 @@ public class ParserSet {
* @return <jk>true</jk> if at least one of the specified
annotations can be applied to at least one parser builder in this group.
*/
public boolean canApply(AnnotationWorkList work) {
- for (var o : entries)
- if (o instanceof Parser.Builder o2)
- if (o2.canApply(work))
- return true;
+ for (var o : entries)
+ if (o instanceof Parser.Builder o2 && 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 34b1819d8c..370664bbd9 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
@@ -370,14 +370,10 @@ public class SerializerSession extends
BeanTraverseSession {
cm = object();
if (isTrimEmptyCollections()) {
- if (cm.isArray() || (cm.isObject() && isArray(value))) {
- if (((Object[])value).length == 0)
- return true;
- }
- if (cm.isCollection() || (cm.isObject() &&
info(value).isAssignableTo(Collection.class))) {
- if (((Collection<?>)value).isEmpty())
- return true;
- }
+ if ((cm.isArray() || (cm.isObject() && isArray(value)))
&& ((Object[])value).length == 0)
+ return true;
+ if ((cm.isCollection() || (cm.isObject() &&
info(value).isAssignableTo(Collection.class))) &&
((Collection<?>)value).isEmpty())
+ return true;
}
if (isTrimEmptyMaps()) {
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 d47113b11a..07fc637e0a 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
@@ -222,10 +222,9 @@ public class SerializerSet {
* @return <jk>true</jk> if at least one of the specified
annotations can be applied to at least one serializer builder in this group.
*/
public boolean canApply(AnnotationWorkList work) {
- for (var o : entries)
- if (o instanceof Serializer.Builder o2)
- if (o2.canApply(work))
- return true;
+ for (var o : entries)
+ if (o instanceof Serializer.Builder o2 &&
o2.canApply(work))
+ return true;
return false;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index b9ccb1d472..62c01476bc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -777,10 +777,8 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
boolean isInEscape = false;
while (c != -1) {
c = r.read();
- if (! isInEscape) {
- if (c == '\'')
- return trim(r.getMarked(0, -1));
- }
+ if (! isInEscape && c == '\'')
+ return trim(r.getMarked(0, -1));
if (c == EQ)
r.replace('=');
isInEscape = isInEscape(c, r, isInEscape);
@@ -904,13 +902,11 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
} else {
while (c != -1) {
c = r.read();
- if (! isInEscape) {
- if (c == '=' || c == -1 ||
Character.isWhitespace(c)) {
- if (c != -1)
- r.unread();
- var s = r.getMarked();
- return ("null".equals(s) ? null
: trim(s));
- }
+ if (! isInEscape && (c == '=' || c == -1 ||
Character.isWhitespace(c))) {
+ if (c != -1)
+ r.unread();
+ var s = r.getMarked();
+ return ("null".equals(s) ? null :
trim(s));
}
isInEscape = isInEscape(c, r, isInEscape);
}
@@ -944,13 +940,11 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
var endChars = (isUrlParamValue ? endCharsParam :
endCharsNormal);
while (c != -1) {
c = r.read();
- if (! isInEscape) {
+ if (! isInEscape && endChars.contains(c)) {
// If this is a URL parameter value, we're
looking for: &
// If not, we're looking for: &,)
- if (endChars.contains(c)) {
- r.unread();
- c = -1;
- }
+ r.unread();
+ c = -1;
}
if (c == -1)
s = r.getMarked();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index bbe40a68c2..780fae6728 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -206,10 +206,8 @@ public class UrlEncodingParserSession extends
UonParserSession {
*/
public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {
var cm = pMeta.getClassMeta().getSerializedClassMeta(this);
- if (cm.isCollectionOrArray()) {
- if (isExpandedParams() ||
getUrlEncodingClassMeta(pMeta.getBeanMeta().getClassMeta()).isExpandedParams())
- return true;
- }
+ if (cm.isCollectionOrArray() && (isExpandedParams() ||
getUrlEncodingClassMeta(pMeta.getBeanMeta().getClassMeta()).isExpandedParams()))
+ return true;
return false;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index 46b24bf188..0032a8b644 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -379,10 +379,8 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
*/
private boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {
var cm = pMeta.getClassMeta().getSerializedClassMeta(this);
- if (cm.isCollectionOrArray()) {
- if (isExpandedParams() ||
getUrlEncodingClassMeta(pMeta.getBeanMeta().getClassMeta()).isExpandedParams())
- return true;
- }
+ if (cm.isCollectionOrArray() && (isExpandedParams() ||
getUrlEncodingClassMeta(pMeta.getBeanMeta().getClassMeta()).isExpandedParams()))
+ return true;
return false;
}
@@ -393,10 +391,8 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
if (value == null || ! isExpandedParams())
return false;
var cm =
getClassMetaForObject(value).getSerializedClassMeta(this);
- if (cm.isCollectionOrArray()) {
- if (isExpandedParams())
- return true;
- }
+ if (cm.isCollectionOrArray() && isExpandedParams())
+ return true;
return false;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
index 6a5b5d86da..4e132fbf53 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
@@ -144,10 +144,8 @@ public class XmlBeanMeta extends ExtendedBeanMeta {
throw bex(c, "{0} and COLLAPSED properties
found on the same bean. These cannot be mixed.", contentFormat);
}
- if (! collapsedProperties.isEmpty()) {
- if (! Collections.disjoint(elements.keySet(),
collapsedProperties.keySet()))
- throw bex(c, "Child element name conflicts
found with another property.");
- }
+ if (! collapsedProperties.isEmpty() && !
Collections.disjoint(elements.keySet(), collapsedProperties.keySet()))
+ throw bex(c, "Child element name conflicts found with
another property.");
}
/**
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 6ee4a11636..d949ed67df 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
@@ -601,10 +601,8 @@ public class XmlSerializerSession extends
WriterSerializerSession {
if (nn(aType)) {
var ns = getXmlClassMeta(aType).getNamespace();
- if (nn(ns)) {
- if (nn(ns.uri))
- addNamespace(ns);
- }
+ if (nn(ns) && nn(ns.uri))
+ addNamespace(ns);
}
// Handle recursion
@@ -895,11 +893,9 @@ public class XmlSerializerSession extends
WriterSerializerSession {
boolean cr = nn(o) && (sType.isMapOrBean() ||
sType.isCollectionOrArray()) && ! isMixedOrText;
var en = elementName;
- if (en == null && ! isRaw) {
- if (isAddJsonTags()) {
- en = type.toString();
- type = null;
- }
+ if (en == null && ! isRaw && isAddJsonTags()) {
+ en = type.toString();
+ type = null;
}
boolean encodeEn = nn(elementName);
@@ -934,10 +930,8 @@ public class XmlSerializerSession extends
WriterSerializerSession {
} else {
out.i(i);
}
- if (o == null) {
- if ((sType.isBoolean() || sType.isNumber()) &&
! sType.isNullable())
- o = sType.getPrimitiveDefault();
- }
+ if (o == null && (sType.isBoolean() ||
sType.isNumber()) && ! sType.isNullable())
+ o = sType.getPrimitiveDefault();
if (nn(o) && ! (sType.isMapOrBean() || en == null))
out.w('>');
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index e64e1b9d56..a1613f4680 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -249,10 +249,8 @@ public class ResponseContent implements HttpEntity {
var mt = MediaType.of(ct);
- if (parser == null ||
(mt.toString().contains("text/plain") && ! parser.canHandle(ct))) {
- if (type.hasStringMutater())
- return
type.getStringMutater().mutate(asString());
- }
+ if ((parser == null ||
(mt.toString().contains("text/plain") && ! parser.canHandle(ct))) &&
type.hasStringMutater())
+ return
type.getStringMutater().mutate(asString());
if (nn(parser)) {
try (Closeable in = parser.isReaderParser() ?
asReader() : asInputStream()) {
@@ -754,9 +752,8 @@ public class ResponseContent implements HttpEntity {
var ct = getContentType().orElse(null);
// First look for "charset=" in Content-Type header of response.
- if (nn(ct))
- if (ct.contains("charset="))
- cs = ct.substring(ct.indexOf("charset=") +
8).trim();
+ if (nn(ct) && ct.contains("charset="))
+ cs = ct.substring(ct.indexOf("charset=") + 8).trim();
return asReader(cs == null ? UTF8 : Charset.forName(cs));
}
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 c17847faad..622ece40a4 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
@@ -226,10 +226,8 @@ public class SerializedHeader extends BasicHeader {
v = supplier.get();
HttpPartSchema schema2 = this.schema == null ?
HttpPartSchema.DEFAULT : this.schema;
var def = schema2.getDefault();
- if (v == null) {
- if ((def == null && ! schema2.isRequired()) ||
(def == null && schema2.isAllowEmptyValue()))
- return null;
- }
+ if (v == null && ((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, schema2, v);
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 dd7bbcdda2..fdf961be8a 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
@@ -158,10 +158,8 @@ public class SerializedPart extends BasicPart {
Object v = unwrap(value);
HttpPartSchema schema2 = this.schema == null ?
HttpPartSchema.DEFAULT : this.schema;
var def = schema2.getDefault();
- if (v == null) {
- if ((def == null && ! schema2.isRequired()) ||
(def == null && schema2.isAllowEmptyValue()))
- return null;
- }
+ if (v == null && ((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, schema2, v);
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
index 6038ded7d6..44f9d4a692 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
@@ -217,14 +217,12 @@ class MockPathResolver {
}
}
}
- } else if (state == S6) {
- if (c == '/') {
- spSegments--;
- if (spSegments == 0) {
- this.servletPath =
uri.substring(mark, i);
- mark = i;
- state = S7;
- }
+ } else if (state == S6 && c == '/') {
+ spSegments--;
+ if (spSegments == 0) {
+ this.servletPath = uri.substring(mark,
i);
+ mark = i;
+ state = S7;
}
}
}
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 b60c8461d7..9dbe698145 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
@@ -6073,9 +6073,8 @@ public class RestContext extends Context {
var ci = ClassInfo.of(e);
var r =
ci.getAnnotations(StatusCode.class).findFirst().map(AnnotationInfo::inner).orElse(null);
- if (nn(r))
- if (r.value().length > 0)
- code = r.value()[0];
+ if (nn(r) && r.value().length > 0)
+ code = r.value()[0];
var e2 = (e instanceof BasicHttpException e22 ? e22 : new
BasicHttpException(code, e));
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 07ceddf25a..11e614b868 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
@@ -2055,31 +2055,25 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
}
for (var a : aa) {
- if (a instanceof Header a2) {
- if (nn(def)) {
- try {
-
defaultRequestHeaders().set(basicHeader(firstNonEmpty(a2.name(), a2.value()),
parseIfJson(def)));
- } catch (ParseException
e) {
- throw new
ConfigException(e, "Malformed @Header annotation");
- }
+ if (a instanceof Header a2 && nn(def)) {
+ try {
+
defaultRequestHeaders().set(basicHeader(firstNonEmpty(a2.name(), a2.value()),
parseIfJson(def)));
+ } catch (ParseException e) {
+ throw new
ConfigException(e, "Malformed @Header annotation");
}
}
- if (a instanceof Query a2) {
- if (nn(def)) {
- try {
-
defaultRequestQueryData().setDefault(basicPart(firstNonEmpty(a2.name(),
a2.value()), parseIfJson(def)));
- } catch (ParseException
e) {
- throw new
ConfigException(e, "Malformed @Query annotation");
- }
+ if (a instanceof Query a2 && nn(def)) {
+ try {
+
defaultRequestQueryData().setDefault(basicPart(firstNonEmpty(a2.name(),
a2.value()), parseIfJson(def)));
+ } catch (ParseException e) {
+ throw new
ConfigException(e, "Malformed @Query annotation");
}
}
- if (a instanceof FormData a2) {
- if (nn(def)) {
- try {
-
defaultRequestFormData().setDefault(basicPart(firstNonEmpty(a2.name(),
a2.value()), parseIfJson(def)));
- } catch (ParseException
e) {
- throw new
ConfigException(e, "Malformed @FormData annotation");
- }
+ if (a instanceof FormData a2 &&
nn(def)) {
+ try {
+
defaultRequestFormData().setDefault(basicPart(firstNonEmpty(a2.name(),
a2.value()), parseIfJson(def)));
+ } catch (ParseException e) {
+ throw new
ConfigException(e, "Malformed @FormData annotation");
}
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
index b37964ff9c..7db661807e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
@@ -81,9 +81,8 @@ public class RestOpInvoker extends MethodInvoker {
session.debug(false);
}
- if (! inner().hasReturnType(Void.TYPE))
- if (nn(output) || ! res.getOutputStreamCalled())
- res.setContent(output);
+ if (! inner().hasReturnType(Void.TYPE) && (nn(output)
|| ! res.getOutputStreamCalled()))
+ res.setContent(output);
} catch (IllegalAccessException | IllegalArgumentException e) {
throw new InternalServerError(e, "Error occurred
invoking method ''{0}''.", inner().getNameFull());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
index fde02e9687..15e4827d0d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
@@ -125,10 +125,8 @@ public class RequestSwaggerVar extends
MultipartResolvingVar {
return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getTermsOfService()).orElse(null);
if ("title".equals(key))
return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getTitle()).orElse(null);
- } else if (c == 'v') {
- if ("version".equals(key))
- return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getVersion()).orElse(null);
- }
+ } else if (c == 'v' && "version".equals(key))
+ return swagger.map(Swagger::getInfo).map(x -> x
== null ? null : x.getVersion()).orElse(null);
return null;
} catch (Exception e) {
throw new InternalServerError(e);
