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
commit 871fd5b02947a8b038464d2d40c37d5e98f85b2a Author: James Bognar <[email protected]> AuthorDate: Tue Aug 18 13:33:59 2026 -0400 Clean up SonarQube/SonarLint findings in juneau-commons and the views-toolkit builders ObjectUtils_Coverage_Test: replace the java:S1854 suppression with an actual fail() on the line the cast is supposed to blow up on, so the test still fails loudly if abs() ever stops throwing. Continues the suppression correction already made to this file in 39858ad15b. PageDef/Render/RibbonAction/Tab/ViewDef: swap ad-hoc new ArrayList<>(Arrays.asList(...)) / new LinkedHashMap<>() for the shared l(...)/m() collection-literal helpers already used elsewhere in the module. No behavior change. --- .../apache/juneau/commons/utils/ObjectUtils_Coverage_Test.java | 6 +++--- .../main/java/org/apache/juneau/rest/server/views/PageDef.java | 2 +- .../src/main/java/org/apache/juneau/rest/server/views/Render.java | 2 +- .../java/org/apache/juneau/rest/server/views/RibbonAction.java | 8 ++++---- .../src/main/java/org/apache/juneau/rest/server/views/Tab.java | 2 +- .../main/java/org/apache/juneau/rest/server/views/ViewDef.java | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/ObjectUtils_Coverage_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/ObjectUtils_Coverage_Test.java index 17e24c8509..22e8190e9f 100644 --- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/ObjectUtils_Coverage_Test.java +++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/ObjectUtils_Coverage_Test.java @@ -178,10 +178,10 @@ class ObjectUtils_Coverage_Test extends TestBase { // own abs(). Pinning the CURRENT (buggy) behavior here rather than fixing it. var value = BigDecimal.valueOf(-5); assertThrows(ClassCastException.class, () -> { - @SuppressWarnings({ - "java:S1854" // Dead store: the checkcast to BigDecimal, inserted at this assignment, is what's under test. - }) + // The local is load-bearing: it is the assignment that carries the checkcast to BigDecimal, and that + // cast is what fails. Calling abs(value) without assigning it throws nothing at all. BigDecimal result = abs(value); + fail("Expected the narrowing cast to fail, but abs() produced: " + result); }); } diff --git a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/PageDef.java b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/PageDef.java index b923d7a255..9d9ce5ea3c 100644 --- a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/PageDef.java +++ b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/PageDef.java @@ -110,7 +110,7 @@ public class PageDef { * @return This object. */ public PageDef tabs(Tab...value) { - tabs = new ArrayList<>(Arrays.asList(value)); + tabs = l(value); return this; } diff --git a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Render.java b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Render.java index be36683ba6..546ebc4874 100644 --- a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Render.java +++ b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Render.java @@ -91,7 +91,7 @@ public class Render { */ public Render meta(String key, String value) { if (meta == null) - meta = new LinkedHashMap<>(); + meta = m(); meta.put(key, value); return this; } diff --git a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/RibbonAction.java b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/RibbonAction.java index 3ff18d7014..aa1894d049 100644 --- a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/RibbonAction.java +++ b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/RibbonAction.java @@ -207,7 +207,7 @@ public class RibbonAction { public static RibbonAction export(String...buttons) { var a = new RibbonAction(); a.type = "export"; - a.buttons = new ArrayList<>(Arrays.asList(buttons)); + a.buttons = l(buttons); return a; } @@ -218,7 +218,7 @@ public class RibbonAction { * @return This object. */ public RibbonAction optional(String...optional) { - this.optional = new ArrayList<>(Arrays.asList(optional)); + this.optional = l(optional); return this; } @@ -387,7 +387,7 @@ public class RibbonAction { * @return This object. */ public RibbonAction options(Opt...options) { - this.options = new ArrayList<>(Arrays.asList(options)); + this.options = l(options); return this; } @@ -417,7 +417,7 @@ public class RibbonAction { * @throws IllegalArgumentException If a column-scoped option references a column not present in {@code viewDef}. */ public static Map<String,String> toQueryParams(ViewDef viewDef) { - var out = new LinkedHashMap<String,String>(); + Map<String,String> out = m(); if (viewDef.ribbon != null) for (var a : viewDef.ribbon) { if ("option".equals(a.type)) diff --git a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Tab.java b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Tab.java index 2c68797f2c..3b83864577 100644 --- a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Tab.java +++ b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/Tab.java @@ -88,7 +88,7 @@ public class Tab { * @return This object. */ public Tab subtabs(Subtab...value) { - subtabs = new ArrayList<>(Arrays.asList(value)); + subtabs = l(value); return this; } diff --git a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/ViewDef.java b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/ViewDef.java index cb04fb2d35..08966b2aba 100644 --- a/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/ViewDef.java +++ b/juneau-rest/juneau-rest-server-views/src/main/java/org/apache/juneau/rest/server/views/ViewDef.java @@ -243,7 +243,7 @@ public class ViewDef { * @return This object. */ public ViewDef defaultOrder(String data, Dir dir) { - defaultOrder = new ArrayList<>(List.of(OrderEntry.of(data, dir))); + defaultOrder = l(OrderEntry.of(data, dir)); return this; } @@ -254,7 +254,7 @@ public class ViewDef { * @return This object. */ public ViewDef columns(Column...value) { - columns = new ArrayList<>(Arrays.asList(value)); + columns = l(value); return this; } @@ -265,7 +265,7 @@ public class ViewDef { * @return This object. */ public ViewDef ribbon(RibbonAction...value) { - ribbon = new ArrayList<>(Arrays.asList(value)); + ribbon = l(value); return this; } @@ -296,7 +296,7 @@ public class ViewDef { private ViewDef addRowClassRule(RowClassRule rule) { if (rowClassRules == null) - rowClassRules = new ArrayList<>(); + rowClassRules = l(); rowClassRules.add(rule); return this; }
