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 ec444d1d20 SonarQube bug fixes
ec444d1d20 is described below
commit ec444d1d202d1a86779cbe2b3e202b7912081076
Author: James Bognar <[email protected]>
AuthorDate: Thu Feb 5 16:44:04 2026 -0500
SonarQube bug fixes
---
.../org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java | 2 +-
.../juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/html/HtmlParserSession.java | 2 ++
.../main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java | 2 +-
.../src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java | 2 +-
.../java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java | 2 +-
.../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java | 3 ++-
.../juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java | 4 ++--
.../src/main/java/org/apache/juneau/http/BasicStatusLine.java | 2 +-
.../java/org/apache/juneau/http/header/BasicMediaRangesHeader.java | 1 +
.../main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java | 1 +
.../src/main/java/org/apache/juneau/rest/RestSession.java | 2 +-
12 files changed, 15 insertions(+), 10 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
index 146e751213..e5dbf42aaf 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
@@ -99,7 +99,7 @@ public class SimpleReadWriteLock extends
ReentrantReadWriteLock {
* <li class='note'>This instance is thread-safe and can be shared
across threads.
* </ul>
*/
- public static SimpleReadWriteLock NO_OP = new SimpleReadWriteLock() {
+ public static final SimpleReadWriteLock NO_OP = new
SimpleReadWriteLock() {
private static final long serialVersionUID = 1L;
@Override
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 9241c88e33..d43c207c58 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
@@ -229,7 +229,7 @@ public class BeanSession extends ContextSession {
}
}
- private static Logger LOG = Logger.getLogger(cn(BeanSession.class));
+ private static final Logger LOG =
Logger.getLogger(cn(BeanSession.class));
/**
* Creates a builder of this object.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 98a1307edf..40d2b33ca4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -520,6 +520,7 @@ public class HtmlParserSession extends XmlParserSession {
* Precondition: Must be pointing at event following <ul> event.
* Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.
*/
+ @SuppressWarnings("java:S1213") // Method name matches private method
in parent class by design
private <E> Collection<E> parseIntoCollection(XmlReader r,
Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws IOException,
ParseException, ExecutableException, XMLStreamException {
int argIndex = 0;
while (true) {
@@ -539,6 +540,7 @@ public class HtmlParserSession extends XmlParserSession {
* Precondition: Must be pointing at <table> event.
* Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.
*/
+ @SuppressWarnings("java:S1213") // Method name matches private method
in parent class by design
private <K,V> Map<K,V> parseIntoMap(XmlReader r, Map<K,V> m,
ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta)
throws IOException, ParseException, ExecutableException,
XMLStreamException {
while (true) {
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 60679f8ced..4e40590a74 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
@@ -111,7 +111,7 @@ public class ResponseBeanMeta {
/**
* Represents a non-existent meta object.
*/
- public static ResponseBeanMeta NULL = new ResponseBeanMeta(new
Builder(AnnotationWorkList.create()));
+ public static final ResponseBeanMeta NULL = new ResponseBeanMeta(new
Builder(AnnotationWorkList.create()));
/**
* Create metadata from specified method return.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
index e4211650f7..cf56b75539 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
@@ -43,7 +43,7 @@ public class MsgPackOutputStream extends OutputStream {
private final OutputStream os;
- final long L2X31 = ((long)(1 << 30)) * 2;
+ private static final long L2X31 = ((long)(1 << 30)) * 2;
/**
* Constructor.
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 780fae6728..943075a7cb 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
@@ -291,7 +291,7 @@ public class UrlEncodingParserSession extends
UonParserSession {
return (T)o;
}
- @SuppressWarnings({ "java:S3776", "java:S6541" })
+ @SuppressWarnings({ "java:S3776", "java:S6541", "java:S1213" }) //
Method name matches private method in parent class by design
private <T> BeanMap<T> parseIntoBeanMap(UonReader r, BeanMap<T> m)
throws IOException, ParseException, ExecutableException {
int c = r.peekSkipWs();
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 0032a8b644..a87cb2718c 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
@@ -277,7 +277,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
return out;
}
- @SuppressWarnings("java:S3776")
+ @SuppressWarnings({ "java:S3776", "java:S1213" }) // Method name
matches private method in parent class by design
private SerializerWriter serializeBeanMap(UonWriter out, BeanMap<?> m,
String typeName) throws SerializeException {
var addAmp = Flag.create();
@@ -339,6 +339,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
return out;
}
+ @SuppressWarnings("java:S1213") // Method name matches private method
in parent class by design
private SerializerWriter serializeMap(UonWriter out, Map m,
ClassMeta<?> type) throws SerializeException {
var keyType = type.getKeyType();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index 6e5a9a8c1a..2cf7f1b012 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -48,7 +48,7 @@ public class XmlUtils {
private XmlUtils() {}
// @formatter:off
- private static AsciiMap REPLACE_TEXT = new AsciiMap()
+ private static final AsciiMap REPLACE_TEXT = new AsciiMap()
.append('&', "&")
.append('<', "<")
.append('>', ">")
@@ -56,7 +56,7 @@ public class XmlUtils {
.append((char)0x0A, "
")
.append((char)0x0D, "
");
- private static AsciiMap REPLACE_ATTR_VAL = new AsciiMap()
+ private static final AsciiMap REPLACE_ATTR_VAL = new AsciiMap()
.append('&', "&")
.append('<', "<")
.append('>', ">")
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
index b97983e15d..183f5a5889 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
@@ -54,7 +54,7 @@ public class BasicStatusLine implements StatusLine {
return new
BasicStatusLine().setStatusCode(statusCode).setReasonPhrase(reasonPhrase);
}
- private ProtocolVersion DEFAULT_PROTOCOL_VERSION = new
ProtocolVersion("HTTP", 1, 1);
+ private static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = new
ProtocolVersion("HTTP", 1, 1);
private ProtocolVersion protocolVersion = DEFAULT_PROTOCOL_VERSION;
private int statusCode;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
index 85acd62e59..e2c3897488 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
@@ -216,6 +216,7 @@ public class BasicMediaRangesHeader extends
BasicStringHeader {
return value == null ? null : MediaRanges.of(value);
}
+ @SuppressWarnings("java:S1213") // Method name matches private method
in parent class by design
private MediaRanges value() {
if (nn(supplier))
return supplier.get();
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
index 39e3fe8cee..a3d46901e8 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
@@ -315,6 +315,7 @@ public class BasicMediaTypeHeader extends BasicStringHeader
{
return MediaType.of(value);
}
+ @SuppressWarnings("java:S1213") // Method name matches private method
in parent class by design
private MediaType value() {
if (nn(supplier))
return supplier.get();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
index 917a572512..fe363aee7c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
@@ -316,7 +316,7 @@ public class RestSession extends ContextSession {
*/
public Throwable getException() { return
(Throwable)req.getAttribute("Exception"); }
- private static AsciiSet VALID_METHOD_CHARS =
AsciiSet.create().ranges("A-Z", "a-z" ,"0-9").chars("_-").build();
+ private static final AsciiSet VALID_METHOD_CHARS =
AsciiSet.create().ranges("A-Z", "a-z" ,"0-9").chars("_-").build();
/**
* Returns the HTTP method name.
