update jooq codegen to 26.02.17-RC01 (#1656)

- this time using Oracle 19C to generate the codegen
- This contains some bug fixes for fragile exception handling that has
changed between ojdbc8 and ojdbc11
- replaced the hand-copied codegen jars with a shaded version of the
previous codegen jar used explicitly for the water supply accounting
UDT's

Author: adamkorynta

cwms-data-api/build.gradle

@@ -7,6 +7,7 @@ plugins {
     id 'war'
     id 'com.github.node-gradle.node' version '7.1.0'
     id "org.openapi.generator" version "7.15.0"
+    id 'com.gradleup.shadow' version '8.3.10'
 }
 
 configurations {
@@ -16,6 +17,7 @@ configurations {
     baseLibs
     tomcatLibs
     testImplementation.extendsFrom(tomcatLibs)
+    jooqCodegenShadow
 }
 
 configurations.implementation {
@@ -43,7 +45,24 @@ dependencies {
         exclude group: "log4j", module: "log4j"
         exclude group: "org.slf4j", module: "slf4j-log4j12"
         exclude group: "org.jooq.pro-java-8", module: "jooq"
+        exclude group: "org.jooq.pro-java-11", module: "jooq"
     }
+    //Adding a shaded version of the previous schemas codegen
+    //Due to the way jOOQ generates UDT's, any changes to members of the UDT
+    //means it is not backwards compatible (the bind indexes get messed up)
+    //We could also use this mechanism to shade a 'latest' version of the schema codegen
+    //to allow for work not yet merged into a schema release/rc
+    jooqCodegenShadow(libs.cwms.db.jooq.codegen.shadow) {
+        exclude group: "com.oracle", module: "*"
+        exclude group: "com.oracle.database.jdbc", module: "*"
+        exclude group: "org.jooq.pro", module: "*"
+        exclude group: "org.jooq", module: "jooq"
+        exclude group: "log4j", module: "log4j"
+        exclude group: "org.slf4j", module: "slf4j-log4j12"
+        exclude group: "org.jooq.pro-java-8", module: "jooq"
+        exclude group: "org.jooq.pro-java-11", module: "jooq"
+    }
+    implementation(files("$buildDir/libs/${project.name}-${project.version}-codegen-shadow.jar"))
 
     implementation(libs.slf4j)
 
@@ -71,6 +90,7 @@ dependencies {
     implementation(libs.cwms.ratings.io.xml)
     implementation(libs.cwms.ratings.io.jdbc) {
         exclude group: "mil.army.usace.hec", module: "cwms-db-jooq-codegen"
+        exclude group: "org.jooq.pro-java-11", module: "jooq"
     }
 
     implementation(libs.jooq) {
@@ -381,4 +401,14 @@ if (JavaVersion.current() >= JavaVersion.VERSION_11) {
     node {
         nodeProjectDir = file("$rootDir/cda-client/")
     }
-}
+}
+
+tasks.register('shadeCodegen', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
+    archiveClassifier.set('codegen-shadow')
+    configurations = [project.configurations.jooqCodegenShadow]
+    //See comment above on why shading is needed. Using 'codegen_shadow' as a
+    //suitably obnoxious package name so that imports don't get confused.
+    //We can also shade a 'codegen_latest' in the future if needed.
+    relocate 'usace.cwms.db.jooq.codegen', 'usace.cwms.db.jooq.codegen_shadow'
+}
+tasks.compileJava.dependsOn(tasks.shadeCodegen)

cwms-data-api/src/main/java/cwms/cda/data/dao/AuthDao.java

@@ -25,8 +25,10 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -492,8 +494,15 @@ public ApiKey apiKeyForUser(DataApiPrincipal p, String keyName) {
     private static ApiKey rs2ApiKey(ResultSet rs) throws SQLException {
         String userId = rs.getString("userid");
         String keyName = rs.getString("key_name");
-        ZonedDateTime created = rs.getObject("created",ZonedDateTime.class);
-        ZonedDateTime expires = rs.getObject("expires",ZonedDateTime.class);
+
+        ZonedDateTime created = Optional.ofNullable(rs.getObject("created", Timestamp.class))
+            .map(Timestamp::toInstant)
+            .map(i -> i.atZone(ZoneOffset.UTC))
+            .orElse(null);
+        ZonedDateTime expires = Optional.ofNullable(rs.getObject("expires", Timestamp.class))
+            .map(Timestamp::toInstant)
+            .map(i -> i.atZone(ZoneOffset.UTC))
+            .orElse(null);
         return new ApiKey(userId,keyName,null,created,expires);
     }
 

cwms-data-api/src/main/java/cwms/cda/data/dao/JooqDao.java

@@ -89,14 +89,14 @@ public abstract class JooqDao<T> extends Dao<T> {
     private static final Pattern INVALID_OFFICE_ID = Pattern.compile(
             "INVALID_OFFICE_ID: \"([^\"]+)\" is not a valid CWMS office id");
     private static final Pattern INVALID_UNIT = Pattern.compile(
-            "(.+\\R+){6}ORA-20102: The unit: \\S+"
-                    + " is not a recognized CWMS Database unit for the .+(.+\\R+){10}");
+            "ORA-20102: The unit: \\S+"
+                    + " is not a recognized CWMS Database unit for the");
     private static final Pattern CONVERSION_ERROR = Pattern.compile(
             "^ORA-20998: ERROR: Cannot convert ((parameter .+ from specified units: .+$)"
                     + "|(from unit .+ to unit .+$))");
     private static final Pattern FIELD_LENGTH_EXCEEDED = Pattern.compile(
-            "^ORA-12899: value too large for column \".+\"\\.\".+\"\\.\"(.+)\" "
-                    + "\\(actual: (\\d+), maximum: (\\d+)\\)\\R*$");
+            "ORA-12899: value too large for column \".+\"\\.\".+\"\\.\"(.+)\" "
+                    + "\\(actual: (\\d+), maximum: (\\d+)\\)");
 
     public enum DeleteMethod {
         DELETE_ALL(DeleteRule.DELETE_ALL),
@@ -389,7 +389,7 @@ public static boolean isInvalidOffice(RuntimeException input) {
 
     public static boolean isValueTooLargeException(RuntimeException input) {
         return getSqlException(input.getCause()).map(sqlException -> hasCodeOrMessage(sqlException,
-                        Arrays.asList(6502, 12899, 20041),
+                        Arrays.asList(6502, 12899, 20041, 17072),
                         Arrays.asList("value too large for column", "character string buffer too small",
                                 "Error while writing value at JDBC bind index:")))
                 .orElse(false);
@@ -597,7 +597,7 @@ public static boolean isInvalidUnits(RuntimeException input) {
             SQLException sqlException = optional.get();
             String message = sqlException.getLocalizedMessage();
 
-            if (INVALID_UNIT.matcher(message).matches()) {
+            if (INVALID_UNIT.matcher(message).find()) {
                 retVal = true;
             }
 
@@ -677,7 +677,7 @@ private static FieldLengthExceededException buildFieldLengthExceededException(Ru
 
         if (localizedMessage != null) {
             Matcher matcher = FIELD_LENGTH_EXCEEDED.matcher(localizedMessage);
-            if (matcher.matches()) {
+            if (matcher.find()) {
                 String parameter = matcher.group(1);
                 int actualLength = Integer.parseInt(matcher.group(2));
                 int maxLength = Integer.parseInt(matcher.group(3));

cwms-data-api/src/main/java/cwms/cda/data/dao/rss/MessageUtil.java

@@ -104,11 +104,11 @@ static Optional<String> extractPayload(Object userData) {
         }
         try {
             Struct struct = (Struct) userData;
-            String oracleType = struct.getSQLTypeName();
-            if (oracleType.endsWith("JMS_TEXT_MESSAGE")) {
+            String oracleType = struct.getSQLTypeName().replace("\"", "");
+            if (oracleType.contains("JMS_TEXT_MESSAGE")) {
                 return Optional.ofNullable(extractTextMessage(userData));
             }
-            if (oracleType.endsWith("JMS_MAP_MESSAGE")) {
+            if (oracleType.contains("JMS_MAP_MESSAGE")) {
                 Map<?, ?> map = extractMapMessage(userData);
                 return Optional.ofNullable(MAPPER.writeValueAsString(map));   // JACKSON HERE
             }

cwms-data-api/src/main/java/cwms/cda/data/dao/watersupply/WaterSupplyAccountingDao.java

@@ -86,7 +86,8 @@ private static boolean isBindException(DataAccessException e) {
             SQLException se = (SQLException)cause;
             String sqlMessage = se.getMessage();
             Throwable sqlCause = se.getCause();
-            isBind = sqlCause instanceof IllegalArgumentException && sqlMessage.contains("Error while writing value");
+            isBind = (sqlCause instanceof IllegalArgumentException || sqlCause instanceof ArrayIndexOutOfBoundsException)
+                && sqlMessage.contains("Error while writing value");
         }
         return isBind;
     }
@@ -103,13 +104,12 @@ private static void storeViaCodegen(Connection c, WaterSupplyAccounting accounti
     }
 
     private static void storeViaManual(Connection c, WaterSupplyAccounting accounting, boolean overrideProtection, String volumeUnitId, String storeRule) {
-        cwms.cda.data.dao.watersupply.handgen.records.WAT_USR_CONTRACT_ACCT_TAB_T accountingTab = WaterSupplyUtils.toManualWaterUserContractAcctTs(accounting);
-        WATER_USER_CONTRACT_REF_T contractRefT = WaterSupplyUtils
-                .toContractRef(accounting.getWaterUser(), accounting.getContractName());
-        LOC_REF_TIME_WINDOW_TAB_T pumpTimeWindowTab = WaterSupplyUtils.toTimeWindowTabT(accounting);
+        var accountingTab = WaterSupplyUtilsShadow.toManualWaterUserContractAcctTs(accounting);
+        var contractRefT = WaterSupplyUtilsShadow .toContractRef(accounting.getWaterUser(), accounting.getContractName());
+        var pumpTimeWindowTab = WaterSupplyUtilsShadow.toTimeWindowTabT(accounting);
         String timeZoneId = "UTC";
         String overrideProt = formatBool(overrideProtection);
-        cwms.cda.data.dao.watersupply.handgen.CWMS_WATER_SUPPLY_PACKAGE.call_STORE_ACCOUNTING_SET(DSL.using(c).configuration(), accountingTab,
+        usace.cwms.db.jooq.codegen_shadow.packages.CWMS_WATER_SUPPLY_PACKAGE.call_STORE_ACCOUNTING_SET(DSL.using(c).configuration(), accountingTab,
                 contractRefT, pumpTimeWindowTab, timeZoneId, volumeUnitId, storeRule, overrideProt);
     }
 
@@ -118,7 +118,6 @@ public List<WaterSupplyAccounting> retrieveAccounting(String contractName, Water
             boolean startInclusive, boolean endInclusive, boolean ascendingFlag, int rowLimit) {
 
         String transferType = null;
-        WATER_USER_CONTRACT_REF_T contractRefT = WaterSupplyUtils.toContractRef(waterUser, contractName);
         Timestamp startTimestamp = Timestamp.from(startTime);
         Timestamp endTimestamp = Timestamp.from(endTime);
         String timeZoneId = "UTC";
@@ -130,23 +129,25 @@ public List<WaterSupplyAccounting> retrieveAccounting(String contractName, Water
         return connectionResult(dsl, c -> {
             setOffice(c, projectLocation.getOfficeId());
             try {
+                var contractRefT = WaterSupplyUtils.toContractRef(waterUser, contractName);
                 return retrieveFromCodegen(units, c, contractRefT, startTimestamp, endTimestamp, timeZoneId, startInclusiveFlag, endInclusiveFlag, ascendingFlagStr, rowLimitBigInt, transferType);
             } catch (DataAccessException e){
                 if(isInvalidColumn(e)){
-                   return retrieveViaManual(units, c, contractRefT, startTimestamp, endTimestamp, timeZoneId, startInclusiveFlag, endInclusiveFlag, ascendingFlagStr, rowLimitBigInt, transferType);
+                    var contractRefT = WaterSupplyUtilsShadow.toContractRef(waterUser, contractName);
+                    return retrieveViaManual(units, c, contractRefT, startTimestamp, endTimestamp, timeZoneId, startInclusiveFlag, endInclusiveFlag, ascendingFlagStr, rowLimitBigInt, transferType);
                 }
                 throw e;
             }
         });
     }
 
-    private @NonNull List<WaterSupplyAccounting> retrieveViaManual(String units, Connection c, WATER_USER_CONTRACT_REF_T contractRefT, Timestamp startTimestamp, Timestamp endTimestamp, String timeZoneId, String startInclusiveFlag, String endInclusiveFlag, String ascendingFlagStr, BigInteger rowLimitBigInt, String transferType) {
-        cwms.cda.data.dao.watersupply.handgen.records.WAT_USR_CONTRACT_ACCT_TAB_T watUsrContractAcctObjTs
-                = cwms.cda.data.dao.watersupply.handgen.CWMS_WATER_SUPPLY_PACKAGE.call_RETRIEVE_ACCOUNTING_SET(DSL.using(c).configuration(),
+    private @NonNull List<WaterSupplyAccounting> retrieveViaManual(String units, Connection c, usace.cwms.db.jooq.codegen_shadow.udt.records.WATER_USER_CONTRACT_REF_T contractRefT, Timestamp startTimestamp, Timestamp endTimestamp, String timeZoneId, String startInclusiveFlag, String endInclusiveFlag, String ascendingFlagStr, BigInteger rowLimitBigInt, String transferType) {
+        usace.cwms.db.jooq.codegen_shadow.udt.records.WAT_USR_CONTRACT_ACCT_TAB_T watUsrContractAcctObjTs
+                = usace.cwms.db.jooq.codegen_shadow.packages.CWMS_WATER_SUPPLY_PACKAGE.call_RETRIEVE_ACCOUNTING_SET(DSL.using(c).configuration(),
                 contractRefT, units, startTimestamp, endTimestamp, timeZoneId, startInclusiveFlag,
                 endInclusiveFlag, ascendingFlagStr, rowLimitBigInt, transferType);
         if (!watUsrContractAcctObjTs.isEmpty()) {
-            return WaterSupplyUtils.toWaterSupplyAccountingList(c, watUsrContractAcctObjTs);
+            return WaterSupplyUtilsShadow.toWaterSupplyAccountingList(c, watUsrContractAcctObjTs, units);
         } else {
             return new ArrayList<>();
         }
@@ -171,7 +172,7 @@ private boolean isInvalidColumn(DataAccessException e) {
                 contractRefT, units, startTimestamp, endTimestamp, timeZoneId, startInclusiveFlag,
                 endInclusiveFlag, ascendingFlagStr, rowLimitBigInt, transferType);
         if (!watUsrContractAcctObjTs.isEmpty()) {
-            return WaterSupplyUtils.toWaterSupplyAccountingList(c, watUsrContractAcctObjTs, units);
+            return WaterSupplyUtils.toWaterSupplyAccountingList(c, watUsrContractAcctObjTs);
         } else {
             return new ArrayList<>();
         }