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 9064a3d925 SonarQube bug fixes
9064a3d925 is described below
commit 9064a3d925bbf4c1198f2af2b0af0a20380eb66b
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 17:36:34 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/commons/collections/Maps.java | 2 +-
.../org/apache/juneau/html/HtmlParserSession.java | 3 +-
.../apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../apache/juneau/objecttools/ObjectSearcher.java | 4 +--
.../apache/juneau/objecttools/ObjectSorter.java | 2 +-
.../juneau/objecttools/TimeMatcherFactory.java | 2 +-
.../org/apache/juneau/svl/VarResolverSession.java | 2 +-
.../org/apache/juneau/xml/XmlParserSession.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 4 +--
.../org/apache/juneau/rest/client/RestClient.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 32 +++++++++++-----------
.../rest/processor/ResponseBeanProcessor.java | 4 +--
.../java/org/apache/juneau/ParserReader_Test.java | 3 +-
.../a/rttests/RoundTripLargeObjects_Test.java | 3 +-
.../apache/juneau/a/rttests/RoundTrip_Tester.java | 2 +-
.../juneau/rest/annotation/Swagger_Path_Test.java | 2 +-
.../test/java/org/apache/juneau/xml/Xml_Test.java | 3 +-
17 files changed, 35 insertions(+), 39 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
index 693818ead4..e920c65406 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
@@ -308,7 +308,7 @@ public class Maps<K,V> {
if (sparse && e(map))
return null;
- Map<K,V> map2 = null;
+ Map<K,V> map2;
if (ordered) {
map2 = new LinkedHashMap<>();
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 27e82a3192..1e98b3c371 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
@@ -571,8 +571,9 @@ public class HtmlParserSession extends XmlParserSession {
private <E> Collection<E> parseTableIntoCollection(XmlReader r,
Collection<E> l, ClassMeta<E> type, BeanPropertyMeta pMeta)
throws IOException, ParseException, ExecutableException,
XMLStreamException {
- HtmlTag tag = nextTag(r, TR);
+ nextTag(r, TR);
List<String> keys = list();
+ HtmlTag tag;
while (true) {
tag = nextTag(r, TH, xTR);
if (tag == xTR)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index be3a2e0535..da9ce3e8c1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -812,7 +812,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
ClassMeta<?> aType = null; // The actual type
ClassMeta<?> wType = null; // The wrapped type (delegate)
- ClassMeta<?> sType = object(); // The serialized type
+ ClassMeta<?> sType; // The serialized type
var addJsonTags = isAddJsonTags();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index 39594b6716..ae785903dc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -168,7 +168,7 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
Map m = cm.isMap() ? (Map)o : bs.toBeanMap(o);
for (var e : entryMatchers.entrySet()) {
String key = e.getKey();
- Object val = null;
+ Object val;
if (m instanceof BeanMap m2) {
val = m2.getRaw(key);
} else {
@@ -244,7 +244,7 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
if (search.isEmpty() || type == null || !
type.isCollectionOrArray())
return input;
- List<Object> l = null;
+ List<Object> l;
var rowMatcher = new RowMatcher(session, search);
if (type.isCollection()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
index e14d2a49a3..619fb95b2a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
@@ -123,7 +123,7 @@ public class ObjectSorter implements ObjectTool<SortArgs> {
if (! type.isCollectionOrArray())
return input;
- ArrayList<SortEntry> l = null;
+ ArrayList<SortEntry> l;
if (type.isArray()) {
var size = Array.getLength(input);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
index d8f073d432..ec506e31bc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
@@ -306,7 +306,7 @@ public class TimeMatcherFactory extends MatcherFactory {
if (ranges.length == 0)
return true;
- ZonedDateTime zdt = null;
+ ZonedDateTime zdt;
if (cm.isCalendar()) {
var c = (Calendar)o;
zdt =
c.toInstant().atZone(c.getTimeZone().toZoneId());
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 e53172a200..22513d5c94 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
@@ -332,7 +332,7 @@ public class VarResolverSession {
var hasInternalVar = false;
var hasInnerEscapes = false;
String varType = null;
- String varVal = null;
+ String varVal;
var x = 0;
var x2 = 0;
var depth = 0;
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 caab5a1810..b31c30d062 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
@@ -920,7 +920,7 @@ public class XmlParserSession extends ReaderParserSession {
if (depth <= 0)
break;
}
- et = r.next();
+ r.next();
}
var s = sb2.toString();
returnStringBuilder(sb2);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 7c1ace68e6..f154bb4977 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -597,8 +597,6 @@ public class XmlSerializerSession extends
WriterSerializerSession {
if (nn(ns)) {
if (nn(ns.uri))
addNamespace(ns);
- else
- ns = null;
}
}
@@ -763,7 +761,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
int i = isMixedOrText ? 0 : indent; // Current indentation
ClassMeta<?> aType = null; // The actual type
ClassMeta<?> wType = null; // The wrapped type (delegate)
- ClassMeta<?> sType = object(); // The serialized type
+ ClassMeta<?> sType; // The serialized type
aType = push2(keyName, o, eType);
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 534e082c01..cf30958f1c 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
@@ -7989,7 +7989,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
try {
Object ret = null;
- RestResponse res = null;
+ RestResponse res;
rc.rethrow(RuntimeException.class);
rom.forEachException(rc::rethrow);
if (ror.getReturnValue() == RemoteReturn.NONE) {
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 1cd8dc8b09..4e997d75bf 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
@@ -4511,29 +4511,29 @@ public class RestContext extends Context {
for (var o : children) {
String path = null;
Supplier<?> so;
+ RestContext.Builder cb = null;
if (o instanceof RestChild o2) {
path = o2.path;
var o3 = o2.resource;
so = () -> o3;
- }
-
- RestContext.Builder cb = null;
-
- if (o instanceof Class<?> oc) {
- // Don't allow specifying yourself as a
child. Causes an infinite loop.
- if (oc == resourceClass)
- continue;
- cb = RestContext.create(oc,
restContext, inner);
- if (beanStore.getBean(oc).isPresent()) {
- so = () ->
beanStore.getBean(oc).get(); // If we resolved via injection, always get it
this way.
+ cb = RestContext.create(o3.getClass(),
restContext, inner);
+ } else {
+ if (o instanceof Class<?> oc) {
+ // Don't allow specifying
yourself as a child. Causes an infinite loop.
+ if (oc == resourceClass)
+ continue;
+ cb = RestContext.create(oc,
restContext, inner);
+ if
(beanStore.getBean(oc).isPresent()) {
+ so = () ->
beanStore.getBean(oc).get(); // If we resolved via injection, always get it
this way.
+ } else {
+ Object o2 =
BeanCreator.of(oc, beanStore).builder(RestContext.Builder.class, cb).run();
+ so = () -> o2;
+ }
} else {
- Object o2 = BeanCreator.of(oc,
beanStore).builder(RestContext.Builder.class, cb).run();
- so = () -> o2;
+ cb =
RestContext.create(o.getClass(), restContext, inner);
+ so = () -> o;
}
- } else {
- cb = RestContext.create(o.getClass(),
restContext, inner);
- so = () -> o;
}
if (nn(path))
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
index 58b4674564..9b1a2db3b2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
@@ -74,7 +74,7 @@ public class ResponseBeanProcessor implements
ResponseProcessor {
var ps = hm.getSchema();
if ("*".equals(n)) {
for (var o2 : iterate(o)) {
- Header h = null;
+ Header h;
if (o2 instanceof Map.Entry
o22) {
var x = o22;
var k = s(x.getKey());
@@ -89,7 +89,7 @@ public class ResponseBeanProcessor implements
ResponseProcessor {
res.addHeader(h);
}
} else {
- Header h = null;
+ Header h;
if (o instanceof Header o2)
h = o2;
else if (o instanceof NameValuePair o3)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
index e00a132fd8..6627315576 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ParserReader_Test.java
@@ -61,14 +61,13 @@ class ParserReader_Test extends TestBase {
//====================================================================================================
@Test void a02_marking() throws Exception {
var t =
"a123456789b123456789c123456789d123456789e123456789f123456789g123456789h123456789i123456789j123456789";
- var r = (Object)null;
// Min buff size is 20.
var pr = createParserReader(t);
read(pr, 5);
pr.mark();
read(pr, 10);
- r = pr.getMarked();
+ Object r = pr.getMarked();
assertEquals("56789b1234", r);
r = read(pr);
assertEquals("56789c123456789d123456789e123456789f123456789g123456789h123456789i123456789j123456789",
r);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
index d4a5b34e1e..6cc6990ea5 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
@@ -108,10 +108,9 @@ class RoundTripLargeObjects_Test extends TestBase {
var s = t.getSerializer();
var p = t.getParser();
System.err.println("\n---Speed test on " + t.label + "---"); //
NOT DEBUG
- var r = (Object)"";
// Initialization run.
- r = s.serialize(a);
+ Object r = s.serialize(a);
System.err.println(f("Serialized size: {0,number} ", (r
instanceof String ? r.toString().length() : ((byte[])r).length))); // NOT DEBUG
p.parse(r, A.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
index 2d024ee660..d71387b257 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
@@ -144,7 +144,7 @@ public class RoundTrip_Tester {
public <T> Object serialize(T object, Serializer s) throws Exception {
- var out = (Object)null;
+ Object out;
if (s.isWriterSerializer())
out = ((WriterSerializer)s).serialize(object);
else {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
index 0be1b77acf..822e1d5d61 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
@@ -217,7 +217,7 @@ class Swagger_Path_Test extends TestBase {
x = s.getParameterInfo("/c/{P}","post","path","P");
assertBean(x, "description,type", "b,string");
- x = s.getParameterInfo("/d/{P}","delete","path","P");
+ s.getParameterInfo("/d/{P}","delete","path","P");
x = s.getParameterInfo("/e/{P}","get","path","P");
assertList(x.getEnum(), "a", "b");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/Xml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/Xml_Test.java
index eba721d898..a4517fb16f 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/Xml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/Xml_Test.java
@@ -344,8 +344,7 @@ class Xml_Test extends TestBase {
var s = XmlSerializer.create().sq();
var p = XmlParser.DEFAULT;
var t = new M();
- var r = no(String.class);
- r = s.build().serialize(t);
+ String r = s.build().serialize(t);
assertEquals("<object f1='1' f2='2' f3='3'/>", r);
s.enableNamespaces().addNamespaceUrisToRoot().keepNullProperties();
t.f1 = 4; t.f2 = 5; t.f3 = 6;
