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 344fec2870 SonarQube bug fixes
344fec2870 is described below
commit 344fec28702a6f45457c79a43d7d69dff6d6c697
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 20:38:08 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/microservice/resources/LogEntryFormatter.java | 2 +-
.../java/org/apache/juneau/microservice/resources/LogParser.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestContext.java | 6 +++---
.../src/main/java/org/apache/juneau/rest/RestOpContext.java | 8 ++++----
.../src/main/java/org/apache/juneau/rest/RestResponse.java | 4 ++--
.../src/main/java/org/apache/juneau/rest/arg/FormDataArg.java | 2 +-
.../src/main/java/org/apache/juneau/rest/arg/HeaderArg.java | 2 +-
.../src/main/java/org/apache/juneau/rest/arg/QueryArg.java | 2 +-
.../java/org/apache/juneau/rest/httppart/RequestFormParams.java | 2 +-
.../src/main/java/org/apache/juneau/rest/stats/ThrownStore.java | 2 +-
.../apache/juneau/rest/swagger/BasicSwaggerProviderSession.java | 4 ++--
.../src/main/java/org/apache/juneau/rest/util/RestUtils.java | 2 +-
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 200972f740..3e8c00f336 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -206,7 +206,7 @@ public class LogEntryFormatter extends Formatter {
public String format(LogRecord r) {
String msg = formatMessage(r);
Throwable t = r.getThrown();
- var hash = (String)null;
+ String hash = null;
int c = 0;
if (nn(hashes) && nn(t)) {
hash = hashCode(t);
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
index 1f77b320c8..511f415ed1 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
@@ -184,7 +184,7 @@ public class LogParser implements
Iterable<LogParser.Entry>, Iterator<LogParser.
Entry prev = next;
try {
next = null;
- var line = (String)null;
+ String line = null;
while (next == null && nn(line = br.readLine())) {
var e = new Entry(line);
if (e.isRecord) {
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 7bab79a099..eacd44d846 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
@@ -4501,7 +4501,7 @@ public class RestContext extends Context {
// Initialize our child resources.
for (var o : children) {
- var path = (String)null;
+ String path = null;
Supplier<?> so;
if (o instanceof RestChild o2) {
@@ -4510,7 +4510,7 @@ public class RestContext extends Context {
so = () -> o3;
}
- var cb = (Builder)null;
+ RestContext.Builder cb = null;
if (o instanceof Class<?> oc) {
// Don't allow specifying yourself as a
child. Causes an infinite loop.
@@ -6057,7 +6057,7 @@ public class RestContext extends Context {
var statusCode = e2.getStatusLine().getStatusCode();
res.setStatus(statusCode);
- var w = (PrintWriter)null;
+ PrintWriter w = null;
try {
w = res.getWriter();
} catch (@SuppressWarnings("unused")
IllegalStateException x) {
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 95f3fc678f..d164b83d98 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
@@ -1984,8 +1984,8 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (v.get().isEmpty()) {
var mi = MethodInfo.of(restMethod);
- var p = (String)null;
- var httpMethod = (String)null;
+ String p = null;
+ String httpMethod = null;
if (mi.hasAnnotation(RestGet.class))
httpMethod = "get";
else if (mi.hasAnnotation(RestPut.class))
@@ -2033,7 +2033,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
protected void processParameterAnnotations() {
for (var aa : restMethod.getParameterAnnotations()) {
- var def = (String)null;
+ String def = null;
for (var a : aa) {
if (a instanceof Schema a2) {
def =
joinnlFirstNonEmptyArray(a2.default_(), a2.df());
@@ -2539,7 +2539,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
}
private UrlPathMatch matchPattern(RestSession call) {
- var pm = (UrlPathMatch)null;
+ UrlPathMatch pm = null;
for (var pp : pathMatchers)
if (pm == null)
pm = pp.match(call.getUrlPath());
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 d449e8b0a7..f6acaf6c3f 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
@@ -152,7 +152,7 @@ public class RestResponse extends
HttpServletResponseWrapper {
// Find acceptable charset
var h = request.getHeaderParam("accept-charset").orElse(null);
- var charset = (Charset)null;
+ Charset charset = null;
if (h == null)
charset = opContext.getDefaultCharset();
else
@@ -375,7 +375,7 @@ public class RestResponse extends
HttpServletResponseWrapper {
*/
public FinishableServletOutputStream getNegotiatedOutputStream() throws
NotAcceptable, IOException {
if (os == null) {
- var encoder = (Encoder)null;
+ Encoder encoder = null;
var encoders = request.getOpContext().getEncoders();
var ae =
request.getHeaderParam("Accept-Encoding").orElse(null);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
index b09ae9f827..927ca79be1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
@@ -92,7 +92,7 @@ public class FormDataArg implements RestOpArg {
return null;
// Find matching @FormData from class-level formDataParams array
- var classLevelFormData = (FormData)null;
+ FormData classLevelFormData = null;
for (var f : restAnnotation.formDataParams()) {
var fName = firstNonEmpty(f.name(), f.value());
if (eq(paramName, fName)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
index 505885e235..d2fe5c7393 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
@@ -133,7 +133,7 @@ public class HeaderArg implements RestOpArg {
return null;
// Find matching @Header from class-level headerParams array
- var classLevelHeader = (Header)null;
+ Header classLevelHeader = null;
for (var h : restAnnotation.headerParams()) {
var hName = firstNonEmpty(h.name(), h.value());
if (paramName.equals(hName)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
index f3a71e5d49..0a54b78af0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
@@ -92,7 +92,7 @@ public class QueryArg implements RestOpArg {
return null;
// Find matching @Query from class-level queryParams array
- var classLevelQuery = (Query)null;
+ Query classLevelQuery = null;
for (var q : restAnnotation.queryParams()) {
var qName = firstNonEmpty(q.name(), q.value());
if (paramName.equals(qName)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index 17d37e07fe..9e09ee5158 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -136,7 +136,7 @@ public class RequestFormParams extends
ArrayList<RequestFormParam> {
this.vs = req.getVarResolverSession();
Map<String,String[]> m = null;
- var c = (Collection<Part>)null;
+ Collection<Part> c = null;
RequestContent content = req.getContent();
if (content.isLoaded() || !
req.getHeader(ContentType.class).orElse(ContentType.NULL).equalsIgnoreCase("multipart/form-data"))
{
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
index 516cebd567..a4d7ce64b0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
@@ -161,7 +161,7 @@ public class ThrownStore {
this.statsImplClass = firstNonNull(builder.statsImplClass,
parent.isPresent() ? parent.get().statsImplClass : null, null);
- var s = (Set<String>)null;
+ Set<String> s = null;
if (nn(builder.ignoreClasses))
s =
builder.ignoreClasses.stream().map(Class::getName).collect(toSet());
if (s == null && parent.isPresent())
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 ec3ecb8993..6f83a7b492 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
@@ -612,7 +612,7 @@ public class BasicSwaggerProviderSession {
if (isEmpty(sex))
return;
- var example = (Object)null;
+ Object example = null;
if (isProbablyJson(sex)) {
example = jp.parse(sex, type);
} else {
@@ -1045,7 +1045,7 @@ public class BasicSwaggerProviderSession {
}
private JsonMap resolve(JsonMap om) throws ParseException {
- var om2 = (JsonMap)null;
+ JsonMap om2 = null;
if (om.containsKey("_value")) {
om = om.modifiable();
om2 = parseMap(om.remove("_value"));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index 075378cbdb..dbeea13d70 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -235,7 +235,7 @@ public class RestUtils {
r.read();
var state = S1;
- var currAttr = (String)null;
+ String currAttr = null;
while (c != -1) {
c = r.read();
if (state == S1) {
