Tooling updates

.github/workflows/cd.yml

@@ -23,7 +23,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    uses: HSLdevcom/jore4-tools/.github/workflows/shared-build-and-publish-docker-image.yml@shared-build-and-publish-docker-image-v6
+    uses: HSLdevcom/jore4-tools/.github/workflows/shared-build-and-publish-docker-image.yml@main
     with:
       docker_image_name: jore4-timetables-api
       build_arm64_image: true

.github/workflows/check-renovatebot-config.yml

@@ -9,7 +9,7 @@ permissions:
 jobs:
   validate:
     name: Validate renovatebot config
-    uses: HSLdevcom/jore4-tools/.github/workflows/shared-check-renovatebot-config.yml@shared-check-renovatebot-config-v2
+    uses: HSLdevcom/jore4-tools/.github/workflows/shared-check-renovatebot-config.yml@main
     with:
       config_file_path: .github/renovate.json5
       checkout_submodules: recursive

.github/workflows/codeql.yml

@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   analyze:
-    uses: HSLdevcom/jore4-tools/.github/workflows/shared-codeql.yml@shared-ghas-workflows-v1
+    uses: HSLdevcom/jore4-tools/.github/workflows/shared-codeql.yml@main
     with:
       languages: '["actions", "java-kotlin"]'
       java_build_command: "cp profiles/dev/config.properties profiles/dev/config.runner.properties && mvn clean install -DskipTests"

.github/workflows/dependency-scan.yml

@@ -9,4 +9,4 @@ permissions:
 
 jobs:
   dependency-scan:
-    uses: HSLdevcom/jore4-tools/.github/workflows/shared-dependency-scan.yml@shared-ghas-workflows-v2
+    uses: HSLdevcom/jore4-tools/.github/workflows/shared-dependency-scan.yml@main

.github/workflows/test-docker-compose.yml

@@ -26,7 +26,7 @@ jobs:
         run: ./development.sh start
 
       - name: Verify that dockerized timetables API is up and running
-        uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
+        uses: HSLdevcom/jore4-tools/github-actions/healthcheck@main
         with:
           command:
             "curl --fail http://localhost:3009/actuator/health --output

docker/.env

@@ -1,4 +0,0 @@
-# Locking Hasura image so that we can develop against a static GraphQL API.
-# Link to available jore4-hasura images in Docker Hub:
-#   https://hub.docker.com/r/hsldevcom/jore4-hasura/tags?page=1&ordering=last_updated
-HASURA_DOCKER_IMAGE=hsldevcom/jore4-hasura:hsl-main--20250114-953bdacbf8968095b08b66d7536d4a30824dd716

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/DefaultCatalog.kt

@@ -33,7 +33,7 @@ open class DefaultCatalog : CatalogImpl("") {
         /**
          * The reference instance of <code>DEFAULT_CATALOG</code>
          */
-        public val DEFAULT_CATALOG: DefaultCatalog = DefaultCatalog()
+        val DEFAULT_CATALOG: DefaultCatalog = DefaultCatalog()
     }
 
     /**

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/internal_service_calendar/InternalServiceCalendar.kt

@@ -15,7 +15,7 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class InternalServiceCalendar : SchemaImpl("internal_service_calendar", DefaultCatalog.DEFAULT_CATALOG) {
-    public companion object {
+    companion object {
 
         /**
          * The reference instance of <code>internal_service_calendar</code>

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/internal_service_calendar/routines/GetSubstituteOperatingPeriodBeginDate.kt

@@ -45,7 +45,9 @@ open class GetSubstituteOperatingPeriodBeginDate : AbstractRoutine<LocalDate>("g
      * Set the <code>substitute_operating_period_uuid</code> parameter IN value
      * to the routine
      */
-    fun setSubstituteOperatingPeriodUuid(value: UUID?): Unit = setValue(GetSubstituteOperatingPeriodBeginDate.SUBSTITUTE_OPERATING_PERIOD_UUID, value)
+    fun setSubstituteOperatingPeriodUuid(value: UUID?): Unit {
+        setValue(GetSubstituteOperatingPeriodBeginDate.SUBSTITUTE_OPERATING_PERIOD_UUID, value)
+    }
 
     /**
      * Set the <code>substitute_operating_period_uuid</code> parameter to the

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/internal_service_calendar/routines/GetSubstituteOperatingPeriodEndDate.kt

@@ -45,7 +45,9 @@ open class GetSubstituteOperatingPeriodEndDate : AbstractRoutine<LocalDate>("get
      * Set the <code>substitute_operating_period_uuid</code> parameter IN value
      * to the routine
      */
-    fun setSubstituteOperatingPeriodUuid(value: UUID?): Unit = setValue(GetSubstituteOperatingPeriodEndDate.SUBSTITUTE_OPERATING_PERIOD_UUID, value)
+    fun setSubstituteOperatingPeriodUuid(value: UUID?): Unit {
+        setValue(GetSubstituteOperatingPeriodEndDate.SUBSTITUTE_OPERATING_PERIOD_UUID, value)
+    }
 
     /**
      * Set the <code>substitute_operating_period_uuid</code> parameter to the

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/journey_pattern/JourneyPattern.kt

@@ -19,7 +19,7 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class JourneyPattern : SchemaImpl("journey_pattern", DefaultCatalog.DEFAULT_CATALOG) {
-    public companion object {
+    companion object {
 
         /**
          * The reference instance of <code>journey_pattern</code>

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/journey_pattern/tables/JourneyPatternRef.kt

@@ -167,7 +167,7 @@ open class JourneyPatternRef(
      * Create an aliased <code>journey_pattern.journey_pattern_ref</code> table
      * reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, JOURNEY_PATTERN_REF)
 
     /**
      * Create a <code>journey_pattern.journey_pattern_ref</code> table reference
@@ -188,22 +188,7 @@ open class JourneyPatternRef(
     }
     override fun getSchema(): Schema? = if (aliased()) null else JourneyPattern.JOURNEY_PATTERN
     override fun getPrimaryKey(): UniqueKey<JourneyPatternRefRecord> = JOURNEY_PATTERN_REF_PKEY
-    override fun getReferences(): List<ForeignKey<JourneyPatternRefRecord, *>> = listOf(JOURNEY_PATTERN_REF__JOURNEY_PATTERN_REF_TYPE_OF_LINE_FKEY, JOURNEY_PATTERN_REF__JOURNEY_PATTERN_REF_ROUTE_DIRECTION_FKEY)
-
-    private lateinit var _typeOfLine: TypeOfLinePath
-
-    /**
-     * Get the implicit join path to the <code>route.type_of_line</code> table.
-     */
-    fun typeOfLine(): TypeOfLinePath {
-        if (!this::_typeOfLine.isInitialized)
-            _typeOfLine = TypeOfLinePath(this, JOURNEY_PATTERN_REF__JOURNEY_PATTERN_REF_TYPE_OF_LINE_FKEY, null)
-
-        return _typeOfLine;
-    }
-
-    val typeOfLine: TypeOfLinePath
-        get(): TypeOfLinePath = typeOfLine()
+    override fun getReferences(): List<ForeignKey<JourneyPatternRefRecord, *>> = listOf(JOURNEY_PATTERN_REF__JOURNEY_PATTERN_REF_ROUTE_DIRECTION_FKEY, JOURNEY_PATTERN_REF__JOURNEY_PATTERN_REF_TYPE_OF_LINE_FKEY)
 
     private lateinit var _direction: DirectionPath
 
@@ -220,6 +205,21 @@ open class JourneyPatternRef(
     val direction: DirectionPath
         get(): DirectionPath = direction()
 
+    private lateinit var _typeOfLine: TypeOfLinePath
+
+    /**
+     * Get the implicit join path to the <code>route.type_of_line</code> table.
+     */
+    fun typeOfLine(): TypeOfLinePath {
+        if (!this::_typeOfLine.isInitialized)
+            _typeOfLine = TypeOfLinePath(this, JOURNEY_PATTERN_REF__JOURNEY_PATTERN_REF_TYPE_OF_LINE_FKEY, null)
+
+        return _typeOfLine;
+    }
+
+    val typeOfLine: TypeOfLinePath
+        get(): TypeOfLinePath = typeOfLine()
+
     private lateinit var _scheduledStopPointInJourneyPatternRef: ScheduledStopPointInJourneyPatternRefPath
 
     /**

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/PassingTimes.kt

@@ -26,7 +26,7 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class PassingTimes : SchemaImpl("passing_times", DefaultCatalog.DEFAULT_CATALOG) {
-    public companion object {
+    companion object {
 
         /**
          * The reference instance of <code>passing_times</code>
@@ -35,8 +35,7 @@ open class PassingTimes : SchemaImpl("passing_times", DefaultCatalog.DEFAULT_CAT
     }
 
     /**
-     * The table
-     * <code>passing_times.get_passing_time_order_validity_data</code>.
+     * filter_vehicle_journey_ids uuid[], filter_journey_pattern_ref_ids uuid[]
      */
     val GET_PASSING_TIME_ORDER_VALIDITY_DATA: GetPassingTimeOrderValidityData get() = GetPassingTimeOrderValidityData.GET_PASSING_TIME_ORDER_VALIDITY_DATA
 

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/tables/GetPassingTimeOrderValidityData.kt

@@ -25,7 +25,7 @@ import org.jooq.impl.TableImpl
 
 
 /**
- * This class is generated by jOOQ.
+ * filter_vehicle_journey_ids uuid[], filter_journey_pattern_ref_ids uuid[]
  */
 @Suppress("UNCHECKED_CAST")
 open class GetPassingTimeOrderValidityData(
@@ -44,7 +44,7 @@ open class GetPassingTimeOrderValidityData(
     parentPath,
     aliased,
     parameters,
-    DSL.comment(""),
+    DSL.comment("filter_vehicle_journey_ids uuid[], filter_journey_pattern_ref_ids uuid[]"),
     TableOptions.function(),
     where,
 ) {
@@ -110,7 +110,7 @@ open class GetPassingTimeOrderValidityData(
      * <code>passing_times.get_passing_time_order_validity_data</code> table
      * reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, GET_PASSING_TIME_ORDER_VALIDITY_DATA)
 
     /**
      * Create a <code>passing_times.get_passing_time_order_validity_data</code>

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/tables/TimetabledPassingTime.kt

@@ -136,7 +136,7 @@ open class TimetabledPassingTime(
      * Create an aliased <code>passing_times.timetabled_passing_time</code>
      * table reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, TIMETABLED_PASSING_TIME)
 
     /**
      * Create a <code>passing_times.timetabled_passing_time</code> table
@@ -158,23 +158,7 @@ open class TimetabledPassingTime(
     }
     override fun getSchema(): Schema? = if (aliased()) null else PassingTimes.PASSING_TIMES
     override fun getPrimaryKey(): UniqueKey<TimetabledPassingTimeRecord> = TIMETABLED_PASSING_TIME_PKEY
-    override fun getReferences(): List<ForeignKey<TimetabledPassingTimeRecord, *>> = listOf(TIMETABLED_PASSING_TIME__TIMETABLED_PASSING_TIME_VEHICLE_JOURNEY_ID_FKEY, TIMETABLED_PASSING_TIME__TIMETABLED_PASSING_TIME_SCHEDULED_STOP_POINT_IN_JOURNEY_PA_FKEY)
-
-    private lateinit var _vehicleJourney: VehicleJourneyPath
-
-    /**
-     * Get the implicit join path to the
-     * <code>vehicle_journey.vehicle_journey</code> table.
-     */
-    fun vehicleJourney(): VehicleJourneyPath {
-        if (!this::_vehicleJourney.isInitialized)
-            _vehicleJourney = VehicleJourneyPath(this, TIMETABLED_PASSING_TIME__TIMETABLED_PASSING_TIME_VEHICLE_JOURNEY_ID_FKEY, null)
-
-        return _vehicleJourney;
-    }
-
-    val vehicleJourney: VehicleJourneyPath
-        get(): VehicleJourneyPath = vehicleJourney()
+    override fun getReferences(): List<ForeignKey<TimetabledPassingTimeRecord, *>> = listOf(TIMETABLED_PASSING_TIME__TIMETABLED_PASSING_TIME_SCHEDULED_STOP_POINT_IN_JOURNEY_PA_FKEY, TIMETABLED_PASSING_TIME__TIMETABLED_PASSING_TIME_VEHICLE_JOURNEY_ID_FKEY)
 
     private lateinit var _scheduledStopPointInJourneyPatternRef: ScheduledStopPointInJourneyPatternRefPath
 
@@ -192,6 +176,22 @@ open class TimetabledPassingTime(
 
     val scheduledStopPointInJourneyPatternRef: ScheduledStopPointInJourneyPatternRefPath
         get(): ScheduledStopPointInJourneyPatternRefPath = scheduledStopPointInJourneyPatternRef()
+
+    private lateinit var _vehicleJourney: VehicleJourneyPath
+
+    /**
+     * Get the implicit join path to the
+     * <code>vehicle_journey.vehicle_journey</code> table.
+     */
+    fun vehicleJourney(): VehicleJourneyPath {
+        if (!this::_vehicleJourney.isInitialized)
+            _vehicleJourney = VehicleJourneyPath(this, TIMETABLED_PASSING_TIME__TIMETABLED_PASSING_TIME_VEHICLE_JOURNEY_ID_FKEY, null)
+
+        return _vehicleJourney;
+    }
+
+    val vehicleJourney: VehicleJourneyPath
+        get(): VehicleJourneyPath = vehicleJourney()
     override fun `as`(alias: String): TimetabledPassingTime = TimetabledPassingTime(DSL.name(alias), this)
     override fun `as`(alias: Name): TimetabledPassingTime = TimetabledPassingTime(alias, this)
     override fun `as`(alias: Table<*>): TimetabledPassingTime = TimetabledPassingTime(alias.qualifiedName, this)

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/tables/pojos/GetPassingTimeOrderValidityData.kt

@@ -9,7 +9,7 @@ import java.util.UUID
 
 
 /**
- * This class is generated by jOOQ.
+ * filter_vehicle_journey_ids uuid[], filter_journey_pattern_ref_ids uuid[]
  */
 @Suppress("UNCHECKED_CAST")
 data class GetPassingTimeOrderValidityData(

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/tables/records/GetPassingTimeOrderValidityDataRecord.kt

@@ -12,7 +12,7 @@ import org.jooq.impl.TableRecordImpl
 
 
 /**
- * This class is generated by jOOQ.
+ * filter_vehicle_journey_ids uuid[], filter_journey_pattern_ref_ids uuid[]
  */
 @Suppress("UNCHECKED_CAST")
 open class GetPassingTimeOrderValidityDataRecord private constructor() : TableRecordImpl<GetPassingTimeOrderValidityDataRecord>(GetPassingTimeOrderValidityData.GET_PASSING_TIME_ORDER_VALIDITY_DATA) {

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/tables/references/Tables.kt

@@ -17,7 +17,7 @@ import org.jooq.Result
 
 
 /**
- * The table <code>passing_times.get_passing_time_order_validity_data</code>.
+ * filter_vehicle_journey_ids uuid[], filter_journey_pattern_ref_ids uuid[]
  */
 val GET_PASSING_TIME_ORDER_VALIDITY_DATA: GetPassingTimeOrderValidityData = GetPassingTimeOrderValidityData.GET_PASSING_TIME_ORDER_VALIDITY_DATA
 

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/return_value/ReturnValue.kt

@@ -20,7 +20,7 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class ReturnValue : SchemaImpl("return_value", DefaultCatalog.DEFAULT_CATALOG) {
-    public companion object {
+    companion object {
 
         /**
          * The reference instance of <code>return_value</code>

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/return_value/tables/TimetableVersion.kt

@@ -144,7 +144,7 @@ open class TimetableVersion(
      * Create an aliased <code>return_value.timetable_version</code> table
      * reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, TIMETABLE_VERSION)
 
     /**
      * Create a <code>return_value.timetable_version</code> table reference

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/return_value/tables/VehicleSchedule.kt

@@ -130,7 +130,7 @@ open class VehicleSchedule(
      * Create an aliased <code>return_value.vehicle_schedule</code> table
      * reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, VEHICLE_SCHEDULE)
 
     /**
      * Create a <code>return_value.vehicle_schedule</code> table reference

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/route/Route.kt

@@ -20,7 +20,7 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class Route : SchemaImpl("route", DefaultCatalog.DEFAULT_CATALOG) {
-    public companion object {
+    companion object {
 
         /**
          * The reference instance of <code>route</code>

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/route/tables/Direction.kt

@@ -9,7 +9,6 @@ import fi.hsl.jore.jore4.jooq.journey_pattern.tables.JourneyPatternRef.JourneyPa
 import fi.hsl.jore.jore4.jooq.route.Route
 import fi.hsl.jore.jore4.jooq.route.keys.DIRECTION_PKEY
 import fi.hsl.jore.jore4.jooq.route.keys.DIRECTION__DIRECTION_THE_OPPOSITE_OF_DIRECTION_FKEY
-import fi.hsl.jore.jore4.jooq.route.tables.Direction.DirectionPath
 import fi.hsl.jore.jore4.jooq.route.tables.records.DirectionRecord
 
 import kotlin.collections.Collection
@@ -99,7 +98,7 @@ open class Direction(
     /**
      * Create an aliased <code>route.direction</code> table reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, DIRECTION)
 
     /**
      * Create a <code>route.direction</code> table reference

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/route/tables/TypeOfLine.kt

@@ -92,7 +92,7 @@ open class TypeOfLine(
     /**
      * Create an aliased <code>route.type_of_line</code> table reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, TYPE_OF_LINE)
 
     /**
      * Create a <code>route.type_of_line</code> table reference

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/service_calendar/ServiceCalendar.kt

@@ -29,7 +29,7 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class ServiceCalendar : SchemaImpl("service_calendar", DefaultCatalog.DEFAULT_CATALOG) {
-    public companion object {
+    companion object {
 
         /**
          * The reference instance of <code>service_calendar</code>
@@ -50,7 +50,7 @@ open class ServiceCalendar : SchemaImpl("service_calendar", DefaultCatalog.DEFAU
     val DAY_TYPE_ACTIVE_ON_DAY_OF_WEEK: DayTypeActiveOnDayOfWeek get() = DayTypeActiveOnDayOfWeek.DAY_TYPE_ACTIVE_ON_DAY_OF_WEEK
 
     /**
-     * The table <code>service_calendar.get_active_day_types_for_date</code>.
+     * observation_date date
      */
     val GET_ACTIVE_DAY_TYPES_FOR_DATE: GetActiveDayTypesForDate get() = GetActiveDayTypesForDate.GET_ACTIVE_DAY_TYPES_FOR_DATE
 

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/service_calendar/tables/DayType.kt

@@ -110,7 +110,7 @@ open class DayType(
     /**
      * Create an aliased <code>service_calendar.day_type</code> table reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, DAY_TYPE)
 
     /**
      * Create a <code>service_calendar.day_type</code> table reference

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/service_calendar/tables/DayTypeActiveOnDayOfWeek.kt

@@ -106,7 +106,7 @@ open class DayTypeActiveOnDayOfWeek(
      * <code>service_calendar.day_type_active_on_day_of_week</code> table
      * reference
      */
-    constructor(alias: Name): this(alias, null)
+    constructor(alias: Name): this(alias, DAY_TYPE_ACTIVE_ON_DAY_OF_WEEK)
 
     /**
      * Create a <code>service_calendar.day_type_active_on_day_of_week</code>