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 db7f65125d SonarQube bug fixes
db7f65125d is described below
commit db7f65125d73093cc784fa03a424625d87ad234c
Author: James Bognar <[email protected]>
AuthorDate: Thu Feb 5 10:25:50 2026 -0500
SonarQube bug fixes
---
.../juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../src/main/java/org/apache/juneau/csv/CsvSerializerSession.java | 7 +++++--
.../src/main/java/org/apache/juneau/serializer/Serializer.java | 2 +-
.../src/main/java/org/apache/juneau/rest/client/RestRequest.java | 5 ++++-
.../src/main/java/org/apache/juneau/rest/client/RestResponse.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/BasicHeader.java | 2 +-
.../java/org/apache/juneau/http/response/BasicHttpException.java | 7 +++++--
.../main/java/org/apache/juneau/rest/mock/MockServletRequest.java | 5 ++++-
.../java/org/apache/juneau/rest/debug/BasicDebugEnablement.java | 8 ++++----
.../java/org/apache/juneau/rest/httppart/RequestHttpPart.java | 2 +-
.../main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java | 5 ++++-
.../java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 4 ++--
.../main/java/org/apache/juneau/rest/vars/LocalizationVar.java | 5 +++--
13 files changed, 36 insertions(+), 20 deletions(-)
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 3920110771..85ca6f0773 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
@@ -964,7 +964,7 @@ public class BeanMeta<T> {
if (l.size() > 1)
throw bex(ci, "Multiple instances of '@Beanc' found.");
if (l.size() == 1) {
- var con = first(l).get().accessible();
+ var con = first(l).orElseThrow(() -> bex(ci, "No
constructor found.")).accessible();
var args = ap.find(Beanc.class, con).stream().map(x ->
x.inner().properties()).filter(StringUtils::isNotBlank).map(x ->
split(x)).findFirst().orElse(liste());
if (! con.hasNumParameters(args.size())) {
if (ne(args))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index f00a075b6b..35c543e60a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -241,7 +241,10 @@ public class CsvSerializerSession extends
WriterSerializerSession {
// TODO - Doesn't support DynaBeans.
if (ne(l)) {
- var entryType =
getClassMetaForObject(first(l).get());
+ var firstOpt = first(l);
+ if (!firstOpt.isPresent())
+ return;
+ var entryType =
getClassMetaForObject(firstOpt.get());
if (entryType.isBean()) {
var bm = entryType.getBeanMeta();
var addComma = Flag.create();
@@ -269,7 +272,7 @@ public class CsvSerializerSession extends
WriterSerializerSession {
});
} else if (entryType.isMap()) {
var addComma = Flag.create();
- var first = (Map)first(l).get();
+ var first = (Map)firstOpt.get();
first.keySet().forEach(x -> {
addComma.ifSet(() ->
w.w(',')).set();
w.writeEntry(x);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 428a126706..4aa8f1fe0d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -1369,7 +1369,7 @@ public class Serializer extends BeanTraverseContext {
*
* @return The media type. Never <jk>null</jk>.
*/
- public final MediaType getPrimaryMediaType() { return
first(acceptMediaTypes).get(); }
+ public final MediaType getPrimaryMediaType() { return
first(acceptMediaTypes).orElseThrow(() -> new IllegalStateException("No accept
media types available")); }
/**
* Optional method that returns the response <c>Content-Type</c> for
this serializer if it is different from
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 c98958a4da..fbeea51dc1 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
@@ -1989,7 +1989,10 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
var thrown =
response.getHeader("Thrown").asHeader(Thrown.class);
if (thrown.isPresent() && nn(rethrow)) {
- var thrownPart = thrown.asParts().get().get(0);
+ var partsOpt = thrown.asParts();
+ if (!partsOpt.isPresent() ||
partsOpt.get().isEmpty())
+ return response;
+ var thrownPart = partsOpt.get().get(0);
var className = thrownPart.getClassName();
var message = thrownPart.getMessage();
for (var t : rethrow) {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index b8ac16fb52..7632359927 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -513,7 +513,7 @@ public class RestResponse implements HttpResponse,
AutoCloseable {
var ct = getContentType();
String s = null;
if (ct.isPresent())
- s = getContentType().get().getParameter("charset");
+ s = ct.get().getParameter("charset");
return e(s) ? "utf-8" : s;
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index 949e1a468b..7cbab93702 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -205,7 +205,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
* @return The value if present.
*/
public String get() {
- return asString().get();
+ return asString().orElseThrow(() -> new
NoSuchElementException("Header value is not present"));
}
@Override
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
index ae2ee2d931..8ccd478ebd 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
@@ -85,8 +85,11 @@ public class BasicHttpException extends
BasicRuntimeException implements HttpRes
public BasicHttpException(HttpResponse response) {
super((Throwable)null);
var h = response.getLastHeader("Thrown");
- if (nn(h))
-
setMessage(thrown(h.getValue()).asParts().get().get(0).getMessage());
+ if (nn(h)) {
+ var partsOpt = thrown(h.getValue()).asParts();
+ if (partsOpt.isPresent() && !partsOpt.get().isEmpty())
+ setMessage(partsOpt.get().get(0).getMessage());
+ }
setHeaders(response.getAllHeaders());
setContent(response.getEntity());
setStatusCode(response.getStatusLine().getStatusCode());
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 9c7f6012a6..9c10c05db1 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
@@ -332,7 +332,10 @@ public class MockServletRequest implements
HttpServletRequest {
@Override /* Overridden from HttpServletRequest */
public long getDateHeader(String name) {
var s = getHeader(name);
- return s == null ? 0 :
date(s).asZonedDateTime().get().toInstant().toEpochMilli();
+ if (s == null)
+ return 0;
+ var zonedDateTimeOpt = date(s).asZonedDateTime();
+ return zonedDateTimeOpt.isPresent() ?
zonedDateTimeOpt.get().toInstant().toEpochMilli() : 0;
}
@Override /* Overridden from HttpServletRequest */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
index 0585133738..e89875cf24 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
@@ -63,10 +63,10 @@ public class BasicDebugEnablement extends DebugEnablement {
protected Builder init(BasicBeanStore beanStore) {
var b = super.init(beanStore);
- var defaultSettings =
beanStore.getBean(DefaultSettingsMap.class).get();
- var builder =
beanStore.getBean(RestContext.Builder.class).get();
- var resource = beanStore.getBean(ResourceSupplier.class).get();
- var varResolver = beanStore.getBean(VarResolver.class).get();
+ var defaultSettings =
beanStore.getBean(DefaultSettingsMap.class).orElseThrow(() -> new
IllegalStateException("DefaultSettingsMap not found"));
+ var builder =
beanStore.getBean(RestContext.Builder.class).orElseThrow(() -> new
IllegalStateException("RestContext.Builder not found"));
+ var resource =
beanStore.getBean(ResourceSupplier.class).orElseThrow(() -> new
IllegalStateException("ResourceSupplier not found"));
+ var varResolver =
beanStore.getBean(VarResolver.class).orElseThrow(() -> new
IllegalStateException("VarResolver not found"));
var ap = AP;
// Default debug enablement if not overridden at class/method
level.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
index 7a612951ea..263451155e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
@@ -446,7 +446,7 @@ public class RequestHttpPart {
* @return The value if present.
*/
public String get() {
- return asString().get();
+ return asString().orElseThrow(() -> new
NoSuchElementException("Value is not present"));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
index ac891c4739..6377d40e7e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
@@ -132,7 +132,10 @@ public class RrpcRestOpSession extends RestOpSession {
Method m = rmm.getJavaMethod();
try {
// Parse the args and invoke the method.
- Parser p =
req.getContent().getParserMatch().get().getParser();
+ var parserMatchOpt =
req.getContent().getParserMatch();
+ if (!parserMatchOpt.isPresent())
+ throw new BadRequest("No parser
match found for request content");
+ Parser p =
parserMatchOpt.get().getParser();
Object[] args = null;
if (m.getGenericParameterTypes().length
== 0)
args = new Object[0];
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
index e2fea387c2..330d05c72b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
@@ -75,8 +75,8 @@ public class BasicStaticFiles implements StaticFiles {
.type(BasicStaticFiles.class)
.dir("static")
.dir("htdocs")
-
.cp(beanStore.getBean(ResourceSupplier.class).get().getResourceClass(),
"htdocs", true)
-
.cp(beanStore.getBean(ResourceSupplier.class).get().getResourceClass(),
"/htdocs", true)
+
.cp(beanStore.getBean(ResourceSupplier.class).orElseThrow(() -> new
IllegalStateException("ResourceSupplier not found")).getResourceClass(),
"htdocs", true)
+
.cp(beanStore.getBean(ResourceSupplier.class).orElseThrow(() -> new
IllegalStateException("ResourceSupplier not found")).getResourceClass(),
"/htdocs", true)
.caching(1_000_000)
.exclude("(?i).*\\.(class|properties)")
.headers(cacheControl("max-age=86400, public"))
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
index fb50efe87e..fb052fd2ae 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
@@ -67,8 +67,9 @@ public class LocalizationVar extends MultipartVar {
var key = args[0];
String[] a = (args.length > 1) ?
Arrays.copyOfRange(args, 1, args.length) : new String[0];
Messages messages = null;
- if (session.getBean(RestRequest.class).isPresent())
- messages =
session.getBean(RestRequest.class).get().getMessages();
+ var restRequestOpt = session.getBean(RestRequest.class);
+ if (restRequestOpt.isPresent())
+ messages = restRequestOpt.get().getMessages();
if (messages == null)
messages =
session.getBean(Messages.class).orElseThrow(InternalServerError::new);
return messages.getString(key, (Object[])a);
