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 f9fc259fca SonarQube bug fixes
f9fc259fca is described below
commit f9fc259fca81735ba5b5e629391d504cd12fd6bd
Author: James Bognar <[email protected]>
AuthorDate: Fri Feb 6 09:21:11 2026 -0500
SonarQube bug fixes
---
.../java/org/apache/juneau/commons/utils/CollectionUtils.java | 6 ++----
.../main/java/org/apache/juneau/commons/utils/FileUtils.java | 2 +-
.../main/java/org/apache/juneau/commons/utils/StringUtils.java | 2 +-
.../src/main/java/org/apache/juneau/BeanFilter.java | 3 +--
.../src/main/java/org/apache/juneau/collections/JsonList.java | 6 ++----
.../main/java/org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../main/java/org/apache/juneau/json/JsonParserSession.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonParserSession.java | 8 ++++----
.../apache/juneau/urlencoding/UrlEncodingParserSession.java | 10 ++++++----
.../juneau/microservice/resources/DirectoryResource.java | 2 +-
.../org/apache/juneau/microservice/resources/LogsResource.java | 2 +-
.../apache/juneau/microservice/jetty/JettyMicroservice.java | 3 ++-
.../main/java/org/apache/juneau/rest/logger/CallLogger.java | 6 ++----
.../juneau-rest-server/src/main/resources/htdocs/javadoc.css | 4 ++--
.../src/main/resources/htdocs/themes/devops.css | 2 +-
.../org/apache/juneau/rest/config/htdocs/themes/devops.css | 2 +-
scripts/check-fluent-setter-overrides.py | 1 +
17 files changed, 30 insertions(+), 33 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
index 73e3aa243b..7f9ef3939b 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
@@ -304,10 +304,8 @@ public class CollectionUtils {
if (newElements.length == 0)
return array;
var a =
(T[])Array.newInstance(array.getClass().getComponentType(), array.length +
newElements.length);
- for (var i = 0; i < array.length; i++)
- a[i] = array[i];
- for (var i = 0; i < newElements.length; i++)
- a[i + array.length] = newElements[i];
+ System.arraycopy(array, 0, a, 0, array.length);
+ System.arraycopy(newElements, 0, a, array.length,
newElements.length);
return a;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
index 53d769285e..e5889b1895 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
@@ -121,7 +121,7 @@ public class FileUtils {
try {
Files.delete(f.toPath());
return true;
- } catch (IOException e) {
+ } catch (@SuppressWarnings("unused") IOException e) {
return false;
}
}
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 b29145471b..e039501d5c 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
@@ -50,7 +50,7 @@ import org.apache.juneau.commons.reflect.*;
/**
* Reusable string utility methods.
*/
-@SuppressWarnings({"java:S115", "java:S1192"}) // S115: Constant names, S1192:
Duplicated string literals (HTML entities)
+@SuppressWarnings({"java:S115", "java:S1192", "java:S5843"}) // S115: Constant
names, S1192: Duplicated string literals (HTML entities), S5843: FP_REGEX
copied from JDK source for parsing consistency
public class StringUtils {
// Argument name constants for assertArgNotNull
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
index 61095122d5..36b1820045 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
@@ -216,8 +216,7 @@ public class BeanFilter {
public Builder dictionary(ClassInfo...values) {
if (dictionary == null)
dictionary = list();
- for (var ci : values)
- dictionary.add(ci);
+ Collections.addAll(dictionary, values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index b1f4176df1..d1d61b281e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -216,8 +216,7 @@ public class JsonList extends LinkedList<Object> {
*/
public static JsonList ofArrays(Object[]...values) {
var l = new JsonList();
- for (var v : values)
- l.add(v);
+ Collections.addAll(l, values);
return l;
}
@@ -229,8 +228,7 @@ public class JsonList extends LinkedList<Object> {
*/
public static JsonList ofCollections(Collection<?>...values) {
var l = new JsonList();
- for (var v : values)
- l.add(v);
+ Collections.addAll(l, values);
return l;
}
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 812a50fcfc..85a9892688 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
@@ -83,7 +83,7 @@ import org.apache.juneau.parser.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/OpenApiBasics";>OpenApi Basics</a>
* </ul>
*/
-@SuppressWarnings({ "java:S116", "java:S115" }) // Constants use
UPPER_snakeCase convention (e.g., PROP_additionalProperties)
+@SuppressWarnings({ "java:S116", "java:S115", "java:S5843" }) // Constants use
UPPER_snakeCase convention (e.g., PROP_additionalProperties). S5843: Complex
regex patterns needed for RFC compliance (IPv6, ISO 8601 duration, date-time
formats)
public class HttpPartSchema {
private static final AnnotationProvider AP =
AnnotationProvider.INSTANCE;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 24caf88a8d..6c7f8711be 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -735,7 +735,7 @@ public class JsonParserSession extends ReaderParserSession {
if (r.peek() == '+') {
if (isStrict())
throw new ParseException(this, "String
concatenation detected.");
- r.read();
+ @SuppressWarnings("unused") int ignored = r.read();
skipCommentsAndSpace(r);
s += parseString(r);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index 48b2cef4c2..09b09c51f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -428,7 +428,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
else
throw new ParseException(this, "Class ''{0}''
could not be instantiated. Reason: ''{1}''", cn(sType),
sType.getNotABeanReason());
} else if (c == 'n') {
- r.read();
+ @SuppressWarnings("unused") int ignored = r.read();
parseNull(r);
} else {
throw new ParseException(this, "Class ''{0}'' could not
be instantiated. Reason: ''{1}''", cn(sType), sType.getNotABeanReason());
@@ -595,7 +595,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
else
throw new ParseException(this, "Could not find
'(' marking beginning of collection.");
} else {
- r.read();
+ @SuppressWarnings("unused") int ignored = r.read();
}
if (isInParens) {
@@ -610,7 +610,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
if (c == ')') {
if (state == S2) {
l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) :
type.getElementType(), r.unread(), l, false, pMeta));
- r.read();
+
@SuppressWarnings("unused") int ignored = r.read();
}
return l;
} else if (Character.isWhitespace(c)) {
@@ -770,7 +770,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
*/
private String parsePString(UonReader r) throws IOException,
ParseException {
- r.read();
+ @SuppressWarnings("unused") int ignored = r.read();
r.mark();
int c = 0;
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 943075a7cb..1751c6bcda 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
@@ -230,8 +230,9 @@ public class UrlEncodingParserSession extends
UonParserSession {
return (T)opt(parseAnything(eType.getElementType(), r,
outer));
int c = r.peekSkipWs();
- if (c == '?')
- r.read();
+ if (c == '?') {
+ @SuppressWarnings("unused") int ignored = r.read();
+ }
Object o;
@@ -530,8 +531,9 @@ public class UrlEncodingParserSession extends
UonParserSession {
@Override /* Overridden from ReaderParserSession */
protected <K,V> Map<K,V> doParseIntoMap(ParserPipe pipe, Map<K,V> m,
Type keyType, Type valueType) throws Exception {
try (var r = getUonReader(pipe, true)) {
- if (r.peekSkipWs() == '?')
- r.read();
+ if (r.peekSkipWs() == '?') {
+ @SuppressWarnings("unused") int ignored =
r.read();
+ }
m = parseIntoMap2(r, m, getClassMeta(Map.class,
keyType, valueType), null);
return m;
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 56364ead23..c49340e09d 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -314,7 +314,7 @@ public class DirectoryResource extends BasicRestServlet {
}
try {
Files.delete(f.toPath());
- } catch (IOException e) {
+ } catch (@SuppressWarnings("unused") IOException e) {
throw new Forbidden("Could not delete file {0}",
f.getAbsolutePath());
}
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 85c5d77f24..7e86953ea6 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -318,7 +318,7 @@ public class LogsResource extends BasicRestServlet {
}
try {
Files.delete(f.toPath());
- } catch (IOException e) {
+ } catch (@SuppressWarnings("unused") IOException e) {
throw new Forbidden("Could not delete file {0}",
f.getAbsolutePath());
}
}
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 8333e560f0..877cdcb17c 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -392,6 +392,7 @@ public class JettyMicroservice extends Microservice {
}
private static final String KEY_SERVLET_CONTEXT_HANDLER =
"ServletContextHandler";
+ private static final Random RANDOM = new Random();
private static volatile JettyMicroservice INSTANCE;
@@ -440,7 +441,7 @@ public class JettyMicroservice extends Microservice {
for (var port : ports) {
// If port is 0, try a random port between ports[0] and
32767.
if (port == 0)
- port = new Random().nextInt(32767 - ports[0] +
1) + ports[0];
+ port = RANDOM.nextInt(32767 - ports[0] + 1) +
ports[0];
try (var ss = new ServerSocket(port)) {
return port;
} catch (@SuppressWarnings("unused") IOException e) {}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index 13bfd18f1d..57c6f88bda 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
@@ -155,8 +155,7 @@ public class CallLogger {
* @return This object.
*/
public Builder debugRules(CallLoggerRule...values) {
- for (var rule : values)
- debugRules.add(rule);
+ Collections.addAll(debugRules, values);
return this;
}
@@ -314,8 +313,7 @@ public class CallLogger {
* @return This object.
*/
public Builder normalRules(CallLoggerRule...values) {
- for (var rule : values)
- normalRules.add(rule);
+ Collections.addAll(normalRules, values);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
index 7ad5aaaaa9..6a4e0b51ad 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
@@ -202,7 +202,7 @@ ul.subNavList li{
.navBarCell1Rev {
background-image:
url('data:image/gif;base64,R0lGODlhAwAeANUAAAAAAP///9+VNfChOu+gOeKXNr58Kr18Krp6KbZ3KMyGLr9+K7t6Krh4KbZ3KdKKMM+IL8yGL8mELsiDLsWBLcWCLcKALLl4KtKLMd+UNdyRNNmPM9WNMvCgOuqcOOaZN+WYN+KWNtqQNPGhO+yeOuucOeeaOPOiPP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACgALAAAAAADAB4AAAZAwJNwMBoQOgSS0lPymJ4f0CdUCGUEGY12I9pwvpgHBkJWRBQTyaRCqVjei/jBcGAgGI1LI+FI5Pd9f3x+eoJ9QQA7');
background-color:#a88834;
- color:#FFFFFF;
+ color:#000000;
margin: auto 5px;
border:1px solid #c9aa44;
}
@@ -748,7 +748,7 @@ a.doclink {
ol.toc, .toc ol {
background: rgb(222, 227, 233);
font: italic 1em Georgia, Times, serif;
- color: rgb(76,107,135);
+ color: rgb(40, 60, 80);
margin: 0px;
padding: 0px;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
index 144953b125..c2888a5165 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
@@ -21,7 +21,7 @@ body {
background-color: #3B4B54;
margin: 0px;
font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
- color: #B3B3B3;
+ color: #E5E5E5;
height: 100%;
font-size: 14px;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
index 144953b125..c2888a5165 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
@@ -21,7 +21,7 @@ body {
background-color: #3B4B54;
margin: 0px;
font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
- color: #B3B3B3;
+ color: #E5E5E5;
height: 100%;
font-size: 14px;
}
diff --git a/scripts/check-fluent-setter-overrides.py
b/scripts/check-fluent-setter-overrides.py
index fac5664179..325a86b930 100755
--- a/scripts/check-fluent-setter-overrides.py
+++ b/scripts/check-fluent-setter-overrides.py
@@ -114,6 +114,7 @@ def extract_class_info(file_path):
package = extract_package(content)
# Find class declarations (public class X extends Y)
+ # NOSONAR: S5843 - Regex complexity acceptable for Java class
declaration parsing
class_pattern = re.compile(
r'^\s*public\s+(?:static\s+)?(?:abstract\s+)?class\s+(\w+)(?:\s+extends\s+([\w.<>,
]+?))?(?:\s+implements\s+[\w.<>, ]+?)?\s*\{',
re.MULTILINE
