From c147667936577c9a6b4289a712e2dddb19b3f651 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sat, 3 Jan 2026 08:32:42 -0800 Subject: [PATCH 1/3] Require Java 25 --- src/org/labkey/serverapi/reader/DataLoader.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/org/labkey/serverapi/reader/DataLoader.java b/src/org/labkey/serverapi/reader/DataLoader.java index a44278a553..05e6ffa357 100644 --- a/src/org/labkey/serverapi/reader/DataLoader.java +++ b/src/org/labkey/serverapi/reader/DataLoader.java @@ -483,13 +483,6 @@ public void close() throws IOException { _closed = true; } - - @Override - protected void finalize() throws Throwable - { - super.finalize(); - // assert _closed; TODO: Uncomment to force all callers to close iterator. - } } } From a3933079b1ce9755423bb81b9fecac24eb377b15 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 5 Jan 2026 09:57:42 -0800 Subject: [PATCH 2/3] Update AspectJ for Java 25 support --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4a89932458..58aba6a506 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ apacheCommonsCsvVersion=1.14.1 -aspectjVersion=1.9.24 +aspectjVersion=1.9.25.1 assertjVersion=3.27.6 From 3545d8174121593c072c4edd5a5cad1c18bbf3bf Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 5 Jan 2026 10:58:06 -0800 Subject: [PATCH 3/3] Switch to MutableInt --- .../labkey/test/tests/component/EditableGridTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/labkey/test/tests/component/EditableGridTest.java b/src/org/labkey/test/tests/component/EditableGridTest.java index fbb48ae773..7b1e360513 100644 --- a/src/org/labkey/test/tests/component/EditableGridTest.java +++ b/src/org/labkey/test/tests/component/EditableGridTest.java @@ -1,6 +1,7 @@ package org.labkey.test.tests.component; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.mutable.MutableInt; import org.json.JSONObject; import org.junit.BeforeClass; import org.junit.Ignore; @@ -314,8 +315,8 @@ public void testDragFillSingleRow() // Get the various row heights before adding a value to the multiLine field. WebElement gridRow = Locator.tag("tr").findElements(testGrid).get(1); int rowHeightBefore = gridRow.getSize().height; - var totalHeightBefore = new Object(){int size = 0; }; - Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightBefore.size = totalHeightBefore.size + gr.getSize().height); + var totalHeightBefore = new MutableInt(0); + Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightBefore.add(gr.getSize().height)); WebElement topLeft = testGrid.setCellValue(0, FILL_STRING, stringValue); testGrid.setCellValue(0, FILL_INT, intValue); @@ -351,12 +352,12 @@ public void testDragFillSingleRow() testGrid.getColumnData(FILL_DATE)); // Check that pasting increased the size of all the rows. - var totalHeightAfter = new Object(){int size = 0; }; - Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightAfter.size = totalHeightAfter.size + gr.getSize().height); + var totalHeightAfter = new MutableInt(0); + Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightAfter.add(gr.getSize().height)); checker().withScreenshot() .verifyTrue("The total height of all the rows should have increases after the paste.", - totalHeightBefore.size + (3 * rowHeightBefore) >= totalHeightAfter.size); + totalHeightBefore.intValue() + (3 * rowHeightBefore) >= totalHeightAfter.intValue()); } @Test