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 adff509d59 SonarQube bug fixes
adff509d59 is described below
commit adff509d598b756c1d60b0b75207f86b204f11d2
Author: James Bognar <[email protected]>
AuthorDate: Fri Feb 6 10:05:13 2026 -0500
SonarQube bug fixes
---
.../src/main/java/org/apache/juneau/svl/VarResolverSession.java | 4 ----
.../src/main/java/org/apache/juneau/uon/UonParserSession.java | 6 +++++-
.../src/main/java/org/apache/juneau/xml/XmlParserSession.java | 3 ---
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 5 ++++-
.../java/org/apache/juneau/commons/reflect/AnnotationInfo_Test.java | 2 +-
.../test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java | 2 +-
juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java | 1 +
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index cf3920359f..5d48599325 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -359,7 +359,6 @@ public class VarResolverSession {
} else if (c == '$') {
x = i;
x2 = i;
- hasInnerEscapes = false;
state = S2;
} else {
out.append(c);
@@ -373,10 +372,7 @@ public class VarResolverSession {
} else if (c == '{') {
varType = s.substring(x + 1, i);
x = i;
- isInEscape = false;
depth = 0;
- hasInnerEscapes = false;
- hasInternalVar = false;
state = S3;
} else if (c < 'A' || c > 'z' || (c > 'Z' && c
< 'a')) { // False trigger "$X "
if (hasInnerEscapes)
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 09b09c51f2..bcc272bd29 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
@@ -609,7 +609,11 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
if (state == S1 || state == S2) {
if (c == ')') {
if (state == S2) {
-
l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) :
type.getElementType(), r.unread(), l, false, pMeta));
+ // argIndex++ increment
is necessary for expression evaluation to get correct argument index, even
though incremented value is unused after return
+
@SuppressWarnings("java:S1854")
+ var argIdx = argIndex;
+ argIndex++;
+
l.add((E)parseAnything(type.isArgs() ? type.getArg(argIdx) :
type.getElementType(), r.unread(), l, false, pMeta));
@SuppressWarnings("unused") int ignored = r.read();
}
return l;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 1f864fd0b6..ba4076ff4a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -349,7 +349,6 @@ public class XmlParserSession extends ReaderParserSession {
}
} else if (event == END_ELEMENT) {
- depth--;
break;
}
eventType = -1;
@@ -549,7 +548,6 @@ public class XmlParserSession extends ReaderParserSession {
E value = (E)parseAnything(elementType, null,
r, l, false, pMeta);
l.add(value);
} else if (event == END_ELEMENT) {
- depth--;
return l;
}
} while (depth > 0);
@@ -591,7 +589,6 @@ public class XmlParserSession extends ReaderParserSession {
m.put(key, value);
}
} else if (event == END_ELEMENT) {
- depth--;
return m;
}
} while (depth > 0);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 5f5e188e6a..852f769d0b 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -6332,7 +6332,9 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
} else if (state == S4) {
if (! isWhitespace(c)) {
mark = i;
- state = S5;
+ // State machine requires state
transition to S5, SonarLint reports false positive
+ @SuppressWarnings("java:S1854")
+ var unused = (state = S5);
}
} else /* (state == S5) */ {
if (isWhitespace(c)) {
@@ -8051,6 +8053,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
try {
Object ret = null;
+ @SuppressWarnings("java:S1854") // res is assigned in
all branches before use, SonarLint false positive
RestResponse res;
rc.rethrow(RuntimeException.class);
rom.forEachException(rc::rethrow);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationInfo_Test.java
index 6c55f248ef..c55574f356 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationInfo_Test.java
@@ -25,7 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.commons.annotation.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings({"java:S5961", "java:S1186"})
+@SuppressWarnings({"java:S5961", "java:S1186", "java:S1874"}) // S1874:
Intentional use of deprecated classes/methods in tests to verify deprecated
functionality
class AnnotationInfo_Test extends TestBase {
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
index 602af8b0ad..53f5227028 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
@@ -40,7 +40,7 @@ import org.apache.juneau.commons.lang.*;
import org.apache.juneau.svl.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings({ "java:S3008", "java:S5961", "java:S1186", "java:S1172",
"java:S1854" }) // Unused parameters in tests are typically intentional. S1854:
Must create anonymous class instances (new Object() {}) to test anonymous class
behavior, cannot use Object.class
+@SuppressWarnings({ "java:S3008", "java:S5961", "java:S1186", "java:S1172",
"java:S1854", "java:S1874" }) // Unused parameters in tests are typically
intentional. S1854: Must create anonymous class instances (new Object() {}) to
test anonymous class behavior, cannot use Object.class. S1874: Intentional use
of deprecated classes/methods in tests to verify deprecated functionality
public class ClassInfo_Test extends TestBase {
@Documented
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index b4ed42971c..8f4223a222 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -38,6 +38,7 @@ import org.apache.juneau.rest.swagger.*;
import org.apache.juneau.xml.*;
import org.junit.jupiter.api.*;
+@SuppressWarnings("java:S1874") // Intentional use of deprecated
classes/methods in tests to verify deprecated functionality
class Swagger_Test extends TestBase {
//------------------------------------------------------------------------------------------------------------------
