Skip to content

add compile and unit test checks for java 21 and 25 #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adamkorynta wants to merge 2 commits into
base: develop
Choose a base branch
from
+26 −3
Draft

add compile and unit test checks for java 21 and 25 #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9573f44
add compile and unit test checks for java 21 and 25
adamkorynta May 9, 2026
1d74814
drop java 25 support given there is no gradle version that can run bo…
adamkorynta May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [11]
jdk: [11, 21]
# place holder for now and leaving commented but in place. General scheme target tests again the current release, the next release, the previous release, and latest development.
# at this time every possible instance of concern is on 25.07.01, once 26.02.17 is finalized it becomes release and 25.07.01 becomes previous.
# next-release will be comment out until such time as a RC gets made
Expand Down Expand Up @@ -48,6 +48,7 @@ jobs:
id: thebuild
run: ./gradlew clean build --info --init-script init.gradle
- name: integration tests
if: matrix.jdk == 11
Copy link
Copy Markdown
Collaborator

@krowvin krowvin May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If i'm reading correct this is saying only do an integration test for 11? Just making sure!

If we have other toggles like this it might be worth using an env in the github repo to have a "JAVA_VERSION" and we can toggle that going forward? Might be extra! Would be good to make an issue for this if someone agrees with the deb hard coding 11 in places gives?

Copy link
Copy Markdown
Collaborator Author

@adamkorynta adamkorynta May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right now there's some sort of caching issue that's causing the builds to fail so I didn't even try to get 21 or even 25 to run integration tests.

For 25 we would need to update gradle to v9 which drops support for Java 11..... So we could use the gradle toolchain mechanism, which would require downloading a whole separate JRE in the pipeline and referencing that. That could work with a repo level env variable.

run: ./gradlew integrationtest --info --init-script init.gradle -PCDA.oracle.database.image=${{matrix.schema.image}}
- name: Create matrix job badge
if: success() || failure() # always run even if the previous step fails
Expand Down
26 changes: 24 additions & 2 deletions cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,29 @@
import java.util.stream.Collectors;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jooq.*;
import org.jooq.CommonTableExpression;
import org.jooq.Condition;
import org.jooq.Cursor;
import org.jooq.DSLContext;
import org.jooq.Field;
import org.jooq.Record;
Copy link
Copy Markdown
Collaborator

@krowvin krowvin May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I assume this is also what was keeping java 25 from building?

Copy link
Copy Markdown
Collaborator Author

@adamkorynta adamkorynta May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah pretty simple fix, didn't test integration tests though so there might be more at runtime.

import org.jooq.Record1;
import org.jooq.Record10;
import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record7;
import org.jooq.Result;
import org.jooq.SQL;
import org.jooq.Select;
import org.jooq.SelectConditionStep;
import org.jooq.SelectHavingStep;
import org.jooq.SelectJoinStep;
import org.jooq.SelectOnConditionStep;
import org.jooq.SelectSeekStep2;
import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.TableLike;
import org.jooq.TableOnConditionStep;
import org.jooq.conf.ParamType;
import org.jooq.exception.DataAccessException;
import org.jooq.impl.DSL;
Expand Down Expand Up @@ -342,7 +364,7 @@ protected TimeSeries getRequestedTimeSeries(String page, int pageSize, @NotNull

// put all those columns together as "valid"
CommonTableExpression<Record7<BigDecimal, String, String, String, String, BigDecimal,
String>> valid =
String>> valid =
Copy link
Copy Markdown
Contributor

@MikeNeilson MikeNeilson May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably just use var at this point.

name("valid").fields("tscode", "tsid", "office_id", "loc_part", "units",
"interval", "parm_part")
.as(
Expand Down
Loading