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 92f891b06e SonarQube bug fixes
92f891b06e is described below
commit 92f891b06e5359afd942b531d946ae411065d98e
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 18 13:09:34 2026 -0500
SonarQube bug fixes
---
.../java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java | 3 ++-
.../java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java | 3 ++-
.../main/java/org/apache/juneau/swap/AutoNumberSwap.java | 14 ++++++++++----
.../src/main/java/org/apache/juneau/rest/RestRequest.java | 2 +-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
index 95c76b96dc..553e20b2ef 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
@@ -130,7 +130,8 @@ public class OpenApiUI extends ObjectSwap<OpenApi,Div> {
if (nn(select))
select.child(option("model", "model"));
- div.child(div(m.remove("model"))._class("model
active").attr("data-name", "model"));
+ var modelContent = m.remove("model");
+ div.child(div(nn(modelContent) ? modelContent :
"")._class("model active").attr("data-name", "model"));
var select2 = select;
m.forEach((k, v) -> {
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
index 52dd7b2b10..97e23a0de1 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
@@ -132,7 +132,8 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
if (nn(select))
select.child(option("model", "model"));
- div.child(div(m.remove("model"))._class("model
active").attr("data-name", "model"));
+ var modelContent = m.remove("model");
+ div.child(div(nn(modelContent) ? modelContent :
"")._class("model active").attr("data-name", "model"));
var select2 = select;
m.forEach((k, v) -> {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index 3343c274d4..f8bf22f981 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -209,12 +209,18 @@ public class AutoNumberSwap<T> extends
ObjectSwap<T,Number> {
Class<?> unswapType2 = null;
if (nn(unswapMethod)) {
for (var pi : unswapMethod.getParameters())
- if (!
pi.getParameterType().is(BeanSession.class))
- unswapType2 =
pi.getParameterType().getWrapperIfPrimitive().inner();
+ if (!
pi.getParameterType().is(BeanSession.class)) {
+ var wrap =
pi.getParameterType().getWrapperIfPrimitive();
+ if (nn(wrap))
+ unswapType2 = wrap.inner();
+ }
} else if (nn(unswapConstructor)) {
for (var pi : unswapConstructor.getParameters())
- if (!
pi.getParameterType().is(BeanSession.class))
- unswapType2 =
pi.getParameterType().getWrapperIfPrimitive().inner();
+ if (!
pi.getParameterType().is(BeanSession.class)) {
+ var wrap =
pi.getParameterType().getWrapperIfPrimitive();
+ if (nn(wrap))
+ unswapType2 = wrap.inner();
+ }
}
this.unswapType = unswapType2;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 8dfc7b031c..1e7725b425 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -229,7 +229,7 @@ public class RestRequest extends HttpServletRequestWrapper {
if (context.isAllowContentParam()) {
var b =
queryParams.get("content").asString().orElse(null);
- if (nn(b)) {
+ if (b != null) {
headers.set("Content-Type",
UonSerializer.DEFAULT.getResponseContentType());
content.mediaType(MediaType.UON).parser(UonParser.DEFAULT).content(b.getBytes(UTF8));
}
