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 6a63b48cba SonarQube bug fixes
6a63b48cba is described below
commit 6a63b48cba2afe2e5f6fb0f2085f28c1c95d7c0f
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 18 12:01:42 2026 -0500
SonarQube bug fixes
---
.../main/java/org/apache/juneau/commons/reflect/ClassInfo.java | 5 ++---
.../main/java/org/apache/juneau/commons/utils/StringUtils.java | 7 +------
.../src/main/java/org/apache/juneau/httppart/HttpPartSchema.java | 4 +---
.../main/java/org/apache/juneau/msgpack/MsgPackInputStream.java | 3 +--
.../main/java/org/apache/juneau/serializer/SerializerSession.java | 8 ++------
5 files changed, 7 insertions(+), 20 deletions(-)
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 023863d1d6..f2a2a04a20 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
@@ -2793,9 +2793,8 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
var ta = innerType2.getActualTypeArguments();
if (ta.length > 0)
return ta[0];
- } else if (innerType instanceof Class<?> innerType3) /* Class
that extends Optional<T> */ {
- if (innerType3 != parameterizedType &&
parameterizedType.isAssignableFrom(innerType3))
- return
ClassInfo.of(innerType3).getParameterType(0, parameterizedType);
+ } else if (innerType instanceof Class<?> innerType3 &&
innerType3 != parameterizedType &&
parameterizedType.isAssignableFrom(innerType3)) /* Class that extends
Optional<T> */ {
+ return ClassInfo.of(innerType3).getParameterType(0,
parameterizedType);
}
return null;
}
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 e5e50cc7ff..6693fc74ca 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
@@ -4439,12 +4439,7 @@ public class StringUtils {
result.append('T');
}
break;
- case 'F':
- case 'J':
- case 'L':
- case 'M':
- case 'N':
- case 'R':
+ case 'F', 'J', 'L', 'M', 'N', 'R':
result.append(c);
break;
case 'G':
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 22e4596445..e25b5f244f 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
@@ -4413,9 +4413,7 @@ public class HttpPartSchema {
}
break;
}
- case BOOLEAN:
- case FILE:
- case NO_TYPE:
+ case BOOLEAN, FILE, NO_TYPE:
break;
default:
break;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
index e13ce930b1..5524460b11 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
@@ -142,8 +142,7 @@ public class MsgPackInputStream extends ParserInputStream {
throw ioex("Unexpected end of file found at position
{0}", pos2);
currentDataType = TYPES[i];
switch (currentDataType) {
- case NULL:
- case FLOAT: {
+ case NULL, FLOAT: {
length = 4;
break;
}
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 370664bbd9..a366a3c3cb 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
@@ -376,12 +376,8 @@ public class SerializerSession extends BeanTraverseSession
{
return true;
}
- if (isTrimEmptyMaps()) {
- if (cm.isMap() || (cm.isObject() &&
info(value).isAssignableTo(Map.class))) {
- if (((Map<?,?>)value).isEmpty())
- return true;
- }
- }
+ if (isTrimEmptyMaps() && (cm.isMap() || (cm.isObject() &&
info(value).isAssignableTo(Map.class))) && ((Map<?,?>)value).isEmpty())
+ return true;
try {
if ((! isKeepNullProperties()) &&
(willRecurse(attrName, value, cm) || willExceedDepth()))
