From 9573f44e569d87174941d49d0a00dc7662427a49 Mon Sep 17 00:00:00 2001 From: Adam Korynta Date: Fri, 8 May 2026 17:36:56 -0700 Subject: [PATCH 1/2] add compile and unit test checks for java 21 and 25 currently only running Java 11 integration tests due to target production environments --- .github/workflows/build.yml | 3 ++- .../cwms/cda/data/dao/TimeSeriesDaoImpl.java | 26 +++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0321d8317..272d785a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [11] + jdk: [11, 21, 25] # 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 @@ -48,6 +48,7 @@ jobs: id: thebuild run: ./gradlew clean build --info --init-script init.gradle - name: integration tests + if: matrix.jdk == 11 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 diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java index 2102f58eb..9a1a3024b 100644 --- a/cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java +++ b/cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java @@ -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; +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; @@ -342,7 +364,7 @@ protected TimeSeries getRequestedTimeSeries(String page, int pageSize, @NotNull // put all those columns together as "valid" CommonTableExpression> valid = + String>> valid = name("valid").fields("tscode", "tsid", "office_id", "loc_part", "units", "interval", "parm_part") .as( From 1d74814f7c747d3a204ce5f3cf4e3bbcbfd24f51 Mon Sep 17 00:00:00 2001 From: Adam Korynta Date: Fri, 8 May 2026 17:53:15 -0700 Subject: [PATCH 2/2] drop java 25 support given there is no gradle version that can run both java 11 and java 25 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 272d785a9..81cf949d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [11, 21, 25] + 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