Update dependencies.

renovate[bot] · jarkkoka · commit 4c481fbd03db · 2025-04-17T13:37:05.000+03:00
This is a modified commit from the one generated by Renovate Bot.

ktor-client should not be updated since it must remain compatible with
graphql-kotlin.
diff --git a/.github/workflows/check-renovatebot-config.yml b/.github/workflows/check-renovatebot-config.yml
@@ -12,6 +12,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate
-        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.1.0
+        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.1.1
         with:
           config_file_path: .github/renovate.json5
diff --git a/pom.xml b/pom.xml
@@ -25,19 +25,19 @@
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
 
         <!-- Maven build plugins and their dependencies -->
-        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
         <build-helper-plugin.version>3.6.0</build-helper-plugin.version>
         <build-properties-plugin.version>1.2.1</build-properties-plugin.version>
-        <surefire-plugin.version>3.3.1</surefire-plugin.version>
-        <ktlint-plugin.version>3.2.0</ktlint-plugin.version>
+        <surefire-plugin.version>3.5.3</surefire-plugin.version>
+        <ktlint-plugin.version>3.5.0</ktlint-plugin.version>
 
         <!-- Library versions -->
-        <kotlin-logging-jvm.version>7.0.0</kotlin-logging-jvm.version>
+        <kotlin-logging-jvm.version>7.0.7</kotlin-logging-jvm.version>
         <quicktheories.version>0.26</quicktheories.version>
-        <graphql-kotlin.version>7.1.4</graphql-kotlin.version>
+        <graphql-kotlin.version>8.6.0</graphql-kotlin.version>
         <ktor.version>2.3.12</ktor.version> <!-- must be in sync with graphql-kotlin.version -->
-        <mockk.version>1.13.12</mockk.version>
+        <mockk.version>1.14.0</mockk.version>
         <springmockk.version>4.0.2</springmockk.version>
 
         <!-- Other properties -->
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/HastusApplication.kt b/src/main/kotlin/fi/hsl/jore4/hastus/HastusApplication.kt
@@ -24,12 +24,13 @@ fun main(args: Array<String>) {
 class HastusApplication {
     @Bean
     @Primary
-    fun objectMapper(): ObjectMapper {
-        return ObjectMapper()
+    fun objectMapper(): ObjectMapper =
+        ObjectMapper()
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .registerModule(JavaTimeModule())
             .registerModule(
-                KotlinModule.Builder()
+                KotlinModule
+                    .Builder()
                     .withReflectionCacheSize(512)
                     .configure(KotlinFeature.NullToEmptyCollection, false)
                     .configure(KotlinFeature.NullToEmptyMap, false)
@@ -38,5 +39,4 @@ class HastusApplication {
                     .configure(KotlinFeature.StrictNullChecks, true)
                     .build()
             )
-    }
 }
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/api/HeaderUtils.kt b/src/main/kotlin/fi/hsl/jore4/hastus/api/HeaderUtils.kt
@@ -1,7 +1,6 @@
 package fi.hsl.jore4.hastus.api
 
 object HeaderUtils {
-    fun filterInHasuraHeaders(headers: Map<String, String>): Map<String, String> {
-        return headers.filter { it.key == "cookie" || it.key.startsWith("x-", true) }
-    }
+    fun filterInHasuraHeaders(headers: Map<String, String>): Map<String, String> =
+        headers.filter { it.key == "cookie" || it.key.startsWith("x-", true) }
 }
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/config/WebSecurityConfig.kt b/src/main/kotlin/fi/hsl/jore4/hastus/config/WebSecurityConfig.kt
@@ -13,8 +13,8 @@ import org.springframework.security.web.SecurityFilterChain
 class WebSecurityConfig {
     @Bean
     @Throws(Exception::class)
-    fun configure(httpSecurity: HttpSecurity): SecurityFilterChain {
-        return httpSecurity
+    fun configure(httpSecurity: HttpSecurity): SecurityFilterChain =
+        httpSecurity
             .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.NEVER) }
             .csrf { it.disable() }
             .cors {}
@@ -32,8 +32,7 @@ class WebSecurityConfig {
                         "/export/routes"
                     ).permitAll()
                     // other
-                    .anyRequest().denyAll()
-            }
-            .build()
-    }
+                    .anyRequest()
+                    .denyAll()
+            }.build()
 }
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/data/format/Coordinate.kt b/src/main/kotlin/fi/hsl/jore4/hastus/data/format/Coordinate.kt
@@ -1,3 +1,6 @@
 package fi.hsl.jore4.hastus.data.format
 
-data class Coordinate(val longitude: Double, val latitude: Double)
+data class Coordinate(
+    val longitude: Double,
+    val latitude: Double
+)
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/data/format/NumberWithAccuracy.kt b/src/main/kotlin/fi/hsl/jore4/hastus/data/format/NumberWithAccuracy.kt
@@ -7,15 +7,18 @@ package fi.hsl.jore4.hastus.data.format
  * @property leading number of leading numbers
  * @property digits number of digits
  */
-data class NumberWithAccuracy(val value: Number, val leading: Int, val digits: Int) {
+data class NumberWithAccuracy(
+    val value: Number,
+    val leading: Int,
+    val digits: Int
+) {
     // Get the pattern for this number format for a decimal formatter
-    fun getPattern(): String {
-        return if (leading > 0 && digits > 0) {
+    fun getPattern(): String =
+        if (leading > 0 && digits > 0) {
             "0".repeat(leading) + "." + "0".repeat(digits)
         } else if (leading > 0) {
             "0".repeat(leading)
         } else {
             "." + "0".repeat(digits)
         }
-    }
 }
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/data/hastus/imp/ImportableItem.kt b/src/main/kotlin/fi/hsl/jore4/hastus/data/hastus/imp/ImportableItem.kt
@@ -21,14 +21,10 @@ sealed class ImportableItem {
         protected fun timeFormatter(): DateTimeFormatter = TIME_FORMATTER
 
         @JvmStatic
-        protected fun parseToDouble(string: String): Double {
-            return string.trim().toDoubleOrNull() ?: 0.0
-        }
+        protected fun parseToDouble(string: String): Double = string.trim().toDoubleOrNull() ?: 0.0
 
         @JvmStatic
-        protected fun parseToInt(string: String): Int {
-            return string.trim().toIntOrNull() ?: 0
-        }
+        protected fun parseToInt(string: String): Int = string.trim().toIntOrNull() ?: 0
 
         @JvmStatic
         protected fun parseToBoolean(string: String) = parseToInt(string) > 0
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/GraphQLService.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/GraphQLService.kt
@@ -159,8 +159,7 @@ class GraphQLService(
             ?.timetables_vehicle_type_vehicle_type
             ?.associate {
                 it.hsl_id.toInt() to it.vehicle_type_id
-            }
-            .orEmpty()
+            }.orEmpty()
     }
 
     fun getDayTypes(): Map<String, UUID> {
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/ConversionsToGraphQL.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/ConversionsToGraphQL.kt
@@ -62,8 +62,8 @@ object ConversionsToGraphQL {
     private fun mapToGraphQL(
         vehicleService: JoreVehicleService,
         journeyPatternRefIndex: Map<UUID, JoreJourneyPatternRef>
-    ): timetables_vehicle_service_vehicle_service_insert_input {
-        return timetables_vehicle_service_vehicle_service_insert_input(
+    ): timetables_vehicle_service_vehicle_service_insert_input =
+        timetables_vehicle_service_vehicle_service_insert_input(
             day_type_id = OptionalInput.Defined(vehicleService.dayType),
             name_i18n = mapToFiJson(vehicleService.name),
             blocks =
@@ -73,13 +73,12 @@ object ConversionsToGraphQL {
                     )
                 )
         )
-    }
 
     private fun mapToGraphQL(
         block: JoreBlock,
         journeyPatternRefIndex: Map<UUID, JoreJourneyPatternRef>
-    ): timetables_vehicle_service_block_insert_input {
-        return timetables_vehicle_service_block_insert_input(
+    ): timetables_vehicle_service_block_insert_input =
+        timetables_vehicle_service_block_insert_input(
             finishing_time = OptionalInput.Defined(block.finishingTime.toJavaDuration()),
             preparing_time = OptionalInput.Defined(block.preparingTime.toJavaDuration()),
             vehicle_type_id = OptionalInput.Defined(block.vehicleTypeId),
@@ -95,13 +94,12 @@ object ConversionsToGraphQL {
                     )
                 )
         )
-    }
 
     private fun mapToGraphQL(
         vehicleJourney: JoreVehicleJourney,
         associatedJourneyPatternRef: JoreJourneyPatternRef
-    ): timetables_vehicle_journey_vehicle_journey_insert_input {
-        return timetables_vehicle_journey_vehicle_journey_insert_input(
+    ): timetables_vehicle_journey_vehicle_journey_insert_input =
+        timetables_vehicle_journey_vehicle_journey_insert_input(
             displayed_name = OptionalInput.Defined(vehicleJourney.displayedName),
             contract_number = OptionalInput.Defined(vehicleJourney.contractNumber),
             is_backup_journey = OptionalInput.Defined(vehicleJourney.isBackupJourney),
@@ -119,7 +117,6 @@ object ConversionsToGraphQL {
                     )
                 )
         )
-    }
 
     private fun mapToGraphQL(pair: Pair<JorePassingTime, JoreJourneyPatternStopRef>) =
         timetables_passing_times_timetabled_passing_time_insert_input(
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/DateScalarConverter.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/DateScalarConverter.kt
@@ -5,9 +5,7 @@ import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 
 class DateScalarConverter : ScalarConverter<LocalDate> {
-    override fun toJson(value: LocalDate): String {
-        return value.format(formatter)
-    }
+    override fun toJson(value: LocalDate): String = value.format(formatter)
 
     override fun toScalar(rawValue: Any): LocalDate {
         if (rawValue is String) {
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/DateTimeScalarConverter.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/DateTimeScalarConverter.kt
@@ -9,13 +9,12 @@ import java.time.temporal.ChronoField
 class DateTimeScalarConverter : ScalarConverter<OffsetDateTime> {
     override fun toJson(value: OffsetDateTime): String = value.format(dateTimeFormatterForSerialising)
 
-    override fun toScalar(rawValue: Any): OffsetDateTime {
-        return when (rawValue) {
+    override fun toScalar(rawValue: Any): OffsetDateTime =
+        when (rawValue) {
             is String -> OffsetDateTime.parse(rawValue, dateTimeFormatterForDeserialising)
 
             else -> throw IllegalArgumentException("Error parsing $rawValue as OffsetDateTime")
         }
-    }
 
     companion object {
         private const val DATETIME_FORMAT_MILLISECONDS = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/DurationConverter.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/DurationConverter.kt
@@ -6,11 +6,10 @@ import kotlin.time.toJavaDuration
 import kotlin.time.toKotlinDuration
 
 class DurationConverter : ScalarConverter<Duration> {
-    override fun toJson(value: Duration): String {
-        return value.toKotlinDuration().toIsoString()
-    }
+    override fun toJson(value: Duration): String = value.toKotlinDuration().toIsoString()
 
-    override fun toScalar(rawValue: Any): Duration {
-        return kotlin.time.Duration.parseIsoString(rawValue.toString()).toJavaDuration()
-    }
+    override fun toScalar(rawValue: Any): Duration =
+        kotlin.time.Duration
+            .parseIsoString(rawValue.toString())
+            .toJavaDuration()
 }
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/GraphQLAuthenticationFailedException.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/GraphQLAuthenticationFailedException.kt
@@ -3,7 +3,9 @@ package fi.hsl.jore4.hastus.graphql.converter
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
 
-class GraphQLAuthenticationFailedException(message: String) : ResponseStatusException(
-    HttpStatus.FORBIDDEN,
-    message
-)
+class GraphQLAuthenticationFailedException(
+    message: String
+) : ResponseStatusException(
+        HttpStatus.FORBIDDEN,
+        message
+    )
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/UUIDListScalarConverter.kt b/src/main/kotlin/fi/hsl/jore4/hastus/graphql/converter/UUIDListScalarConverter.kt
@@ -5,20 +5,20 @@ import fi.hsl.jore4.hastus.graphql.UUIDList
 import java.util.UUID
 
 class UUIDListScalarConverter : ScalarConverter<UUIDList> {
-    override fun toJson(value: UUIDList): String {
-        return value.content.joinToString(
+    override fun toJson(value: UUIDList): String =
+        value.content.joinToString(
             transform = { it.toString() },
             separator = ",",
             prefix = "{",
             postfix = "}"
         )
-    }
 
     override fun toScalar(rawValue: Any): UUIDList {
         val stringValue = rawValue.toString()
 
         return UUIDList(
-            stringValue.trim(' ', '{', '}')
+            stringValue
+                .trim(' ', '{', '}')
                 .split(',')
                 .map { UUID.fromString(it.trim()) }
         )
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/ConversionsToHastus.kt b/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/ConversionsToHastus.kt
@@ -46,8 +46,8 @@ object ConversionsToHastus {
     private fun convertJoreRoutesToHastusRouteVariants(
         joreRoutes: List<JoreRoute>,
         joreLineLabel: String
-    ): List<IExportableItem> {
-        return joreRoutes.flatMap { joreRoute ->
+    ): List<IExportableItem> =
+        joreRoutes.flatMap { joreRoute ->
             val hastusRouteVariant = convertJoreRouteToHastusRouteVariant(joreRoute, joreLineLabel)
 
             val hastusRouteVariantPoints: List<RouteVariantPoint> =
@@ -58,7 +58,6 @@ object ConversionsToHastus {
 
             listOf(hastusRouteVariant) + hastusRouteVariantPoints
         }
-    }
 
     internal fun convertJoreRouteToHastusRouteVariant(
         joreRoute: JoreRoute,
@@ -95,10 +94,9 @@ object ConversionsToHastus {
         return "$majorVariant$minorVariant$routeDirection"
     }
 
-    private fun getRouteDirectionAsNumberOrThrow(routeDirection: JoreRouteDirection): Int {
-        return routeDirection.wellKnownNumber
+    private fun getRouteDirectionAsNumberOrThrow(routeDirection: JoreRouteDirection): Int =
+        routeDirection.wellKnownNumber
             ?: throw IllegalArgumentException("Cannot convert Jore4 route direction to Hastus: $routeDirection")
-    }
 
     private fun convertJoreStopPointsInJourneyPatternToHastusRouteVariantPoints(
         joreStopPointsInJourneyPattern: List<JoreStopPointInJourneyPattern>,
@@ -169,22 +167,20 @@ object ConversionsToHastus {
         )
     }
 
-    fun convertJoreTimingPlacesToHastus(joreTimingPlaces: List<JoreTimingPlace>): List<Place> {
-        return joreTimingPlaces.map {
+    fun convertJoreTimingPlacesToHastus(joreTimingPlaces: List<JoreTimingPlace>): List<Place> =
+        joreTimingPlaces.map {
             Place(
                 identifier = it.label,
                 description = it.description
             )
         }
-    }
 
-    fun convertDistancesBetweenStopPointsToHastus(distancesBetweenStopPoints: List<JoreDistanceBetweenTwoStopPoints>): List<StopDistance> {
-        return distancesBetweenStopPoints.map {
+    fun convertDistancesBetweenStopPointsToHastus(distancesBetweenStopPoints: List<JoreDistanceBetweenTwoStopPoints>): List<StopDistance> =
+        distancesBetweenStopPoints.map {
             StopDistance(
                 stopStart = it.startLabel,
                 stopEnd = it.endLabel,
                 editedDistance = it.distance.toInt()
             )
         }
-    }
 }
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/validation/FirstStopNotTimingPointException.kt b/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/validation/FirstStopNotTimingPointException.kt
@@ -3,7 +3,9 @@ package fi.hsl.jore4.hastus.service.exporting.validation
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
 
-class FirstStopNotTimingPointException(routeLabel: String) : ResponseStatusException(
-    HttpStatus.BAD_REQUEST,
-    "The first stop point in the journey pattern for route $routeLabel is not a timing point"
-)
+class FirstStopNotTimingPointException(
+    routeLabel: String
+) : ResponseStatusException(
+        HttpStatus.BAD_REQUEST,
+        "The first stop point in the journey pattern for route $routeLabel is not a timing point"
+    )
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/validation/LastStopNotTimingPointException.kt b/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/validation/LastStopNotTimingPointException.kt
@@ -3,7 +3,9 @@ package fi.hsl.jore4.hastus.service.exporting.validation
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
 
-class LastStopNotTimingPointException(routeLabel: String) : ResponseStatusException(
-    HttpStatus.BAD_REQUEST,
-    "The last stop point in the journey pattern for route $routeLabel is not a timing point"
-)
+class LastStopNotTimingPointException(
+    routeLabel: String
+) : ResponseStatusException(
+        HttpStatus.BAD_REQUEST,
+        "The last stop point in the journey pattern for route $routeLabel is not a timing point"
+    )
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/validation/TooFewStopPointsException.kt b/src/main/kotlin/fi/hsl/jore4/hastus/service/exporting/validation/TooFewStopPointsException.kt
@@ -3,7 +3,9 @@ package fi.hsl.jore4.hastus.service.exporting.validation
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
 
-class TooFewStopPointsException(routeLabel: String) : ResponseStatusException(
-    HttpStatus.BAD_REQUEST,
-    "There are less than two stops points in the journey pattern for route $routeLabel"
-)
+class TooFewStopPointsException(
+    routeLabel: String
+) : ResponseStatusException(
+        HttpStatus.BAD_REQUEST,
+        "There are less than two stops points in the journey pattern for route $routeLabel"
+    )
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/service/importing/CannotFindJourneyPatternRefByStopPointLabelsException.kt b/src/main/kotlin/fi/hsl/jore4/hastus/service/importing/CannotFindJourneyPatternRefByStopPointLabelsException.kt
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/service/importing/InvalidHastusDataException.kt b/src/main/kotlin/fi/hsl/jore4/hastus/service/importing/InvalidHastusDataException.kt
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/util/CsvWriter.kt b/src/main/kotlin/fi/hsl/jore4/hastus/util/CsvWriter.kt
diff --git a/src/main/kotlin/fi/hsl/jore4/hastus/util/DateTimeUtil.kt b/src/main/kotlin/fi/hsl/jore4/hastus/util/DateTimeUtil.kt
diff --git a/src/test/kotlin/fi/hsl/jore4/hastus/ObjectMapperTest.kt b/src/test/kotlin/fi/hsl/jore4/hastus/ObjectMapperTest.kt
diff --git a/src/test/kotlin/fi/hsl/jore4/hastus/api/ExportControllerTest.kt b/src/test/kotlin/fi/hsl/jore4/hastus/api/ExportControllerTest.kt
diff --git a/src/test/kotlin/fi/hsl/jore4/hastus/api/ImportControllerTest.kt b/src/test/kotlin/fi/hsl/jore4/hastus/api/ImportControllerTest.kt
diff --git a/src/test/kotlin/fi/hsl/jore4/hastus/service/exporting/ExportTestDataCreator.kt b/src/test/kotlin/fi/hsl/jore4/hastus/service/exporting/ExportTestDataCreator.kt
diff --git a/src/test/kotlin/fi/hsl/jore4/hastus/test/TimetablesDataInserterRunner.kt b/src/test/kotlin/fi/hsl/jore4/hastus/test/TimetablesDataInserterRunner.kt

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package fi.hsl.jore4.hastus.api`
`2`	`2`
`3`	`3`	`object HeaderUtils {`
`4`		`- fun filterInHasuraHeaders(headers: Map<String, String>): Map<String, String> {`
`5`		`- return headers.filter { it.key == "cookie" \|\| it.key.startsWith("x-", true) }`
`6`		`- }`
	`4`	`+ fun filterInHasuraHeaders(headers: Map<String, String>): Map<String, String> =`
	`5`	`+ headers.filter { it.key == "cookie" \|\| it.key.startsWith("x-", true) }`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,7 @@ class GraphQLService(`
`159`	`159`	`?.timetables_vehicle_type_vehicle_type`
`160`	`160`	`?.associate {`
`161`	`161`	`it.hsl_id.toInt() to it.vehicle_type_id`
`162`		`- }`
`163`		`- .orEmpty()`
	`162`	`+ }.orEmpty()`
`164`	`163`	`}`
`165`	`164`
`166`	`165`	`fun getDayTypes(): Map<String, UUID> {`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ object ConversionsToGraphQL {`
`62`	`62`	`private fun mapToGraphQL(`
`63`	`63`	`vehicleService: JoreVehicleService,`
`64`	`64`	`journeyPatternRefIndex: Map<UUID, JoreJourneyPatternRef>`
`65`		`- ): timetables_vehicle_service_vehicle_service_insert_input {`
`66`		`- return timetables_vehicle_service_vehicle_service_insert_input(`
	`65`	`+ ): timetables_vehicle_service_vehicle_service_insert_input =`
	`66`	`+ timetables_vehicle_service_vehicle_service_insert_input(`
`67`	`67`	`day_type_id = OptionalInput.Defined(vehicleService.dayType),`
`68`	`68`	`name_i18n = mapToFiJson(vehicleService.name),`
`69`	`69`	`blocks =`
`@@ -73,13 +73,12 @@ object ConversionsToGraphQL {`
`73`	`73`	`)`
`74`	`74`	`)`
`75`	`75`	`)`
`76`		`- }`
`77`	`76`
`78`	`77`	`private fun mapToGraphQL(`
`79`	`78`	`block: JoreBlock,`
`80`	`79`	`journeyPatternRefIndex: Map<UUID, JoreJourneyPatternRef>`
`81`		`- ): timetables_vehicle_service_block_insert_input {`
`82`		`- return timetables_vehicle_service_block_insert_input(`
	`80`	`+ ): timetables_vehicle_service_block_insert_input =`
	`81`	`+ timetables_vehicle_service_block_insert_input(`
`83`	`82`	`finishing_time = OptionalInput.Defined(block.finishingTime.toJavaDuration()),`
`84`	`83`	`preparing_time = OptionalInput.Defined(block.preparingTime.toJavaDuration()),`
`85`	`84`	`vehicle_type_id = OptionalInput.Defined(block.vehicleTypeId),`
`@@ -95,13 +94,12 @@ object ConversionsToGraphQL {`
`95`	`94`	`)`
`96`	`95`	`)`
`97`	`96`	`)`
`98`		`- }`
`99`	`97`
`100`	`98`	`private fun mapToGraphQL(`
`101`	`99`	`vehicleJourney: JoreVehicleJourney,`
`102`	`100`	`associatedJourneyPatternRef: JoreJourneyPatternRef`
`103`		`- ): timetables_vehicle_journey_vehicle_journey_insert_input {`
`104`		`- return timetables_vehicle_journey_vehicle_journey_insert_input(`
	`101`	`+ ): timetables_vehicle_journey_vehicle_journey_insert_input =`
	`102`	`+ timetables_vehicle_journey_vehicle_journey_insert_input(`
`105`	`103`	`displayed_name = OptionalInput.Defined(vehicleJourney.displayedName),`
`106`	`104`	`contract_number = OptionalInput.Defined(vehicleJourney.contractNumber),`
`107`	`105`	`is_backup_journey = OptionalInput.Defined(vehicleJourney.isBackupJourney),`
`@@ -119,7 +117,6 @@ object ConversionsToGraphQL {`
`119`	`117`	`)`
`120`	`118`	`)`
`121`	`119`	`)`
`122`		`- }`
`123`	`120`
`124`	`121`	`private fun mapToGraphQL(pair: Pair<JorePassingTime, JoreJourneyPatternStopRef>) =`
`125`	`122`	`timetables_passing_times_timetabled_passing_time_insert_input(`