Rename exception classes related to import feature.

Author: jarkkoka

…/UnmatchedRoutesWithinImportException.kt …nRefByRouteLabelAndDirectionException.ktsrc/main/kotlin/fi/hsl/jore4/hastus/service/importing/UnmatchedRoutesWithinImportException.kt renamed to src/main/kotlin/fi/hsl/jore4/hastus/service/importing/CannotFindJourneyPatternRefByRouteLabelAndDirectionException.kt src/main/kotlin/fi/hsl/jore4/hastus/service/importing/UnmatchedRoutesWithinImportException.kt renamed to src/main/kotlin/fi/hsl/jore4/hastus/service/importing/CannotFindJourneyPatternRefByRouteLabelAndDirectionException.kt

@@ -4,7 +4,9 @@ import fi.hsl.jore4.hastus.data.format.RouteLabelAndDirection
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
 
-class UnmatchedRoutesWithinImportException(routeIdentifiers: List<RouteLabelAndDirection>) : ResponseStatusException(
+class CannotFindJourneyPatternRefByRouteLabelAndDirectionException(
+    routeIdentifiers: List<RouteLabelAndDirection>
+) : ResponseStatusException(
     HttpStatus.BAD_REQUEST,
     "Could not find journey pattern reference for Hastus trips with the following route labels and directions: ${
         routeIdentifiers.joinToString(separator = ",")

…ernRefMatchesHastusTripStopsException.kt …opLabelsAndTimingPointLabelsException.ktsrc/main/kotlin/fi/hsl/jore4/hastus/service/importing/NoJourneyPatternRefMatchesHastusTripStopsException.kt renamed to src/main/kotlin/fi/hsl/jore4/hastus/service/importing/CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException.kt src/main/kotlin/fi/hsl/jore4/hastus/service/importing/NoJourneyPatternRefMatchesHastusTripStopsException.kt renamed to src/main/kotlin/fi/hsl/jore4/hastus/service/importing/CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException.kt

@@ -5,10 +5,13 @@ import fi.hsl.jore4.hastus.service.exporting.ConversionsToHastus
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
 
-class NoJourneyPatternRefMatchesHastusTripStopsException(message: String) : ResponseStatusException(
+class CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException(
+    message: String
+) : ResponseStatusException(
     HttpStatus.BAD_REQUEST,
     message
 ) {
+
     constructor(
         routeIdentifier: RouteLabelAndDirection,
         stopLabels: List<String>,

src/main/kotlin/fi/hsl/jore4/hastus/service/importing/ConversionsFromHastus.kt

@@ -178,7 +178,8 @@ object ConversionsFromHastus {
                 // Should never happen during application runtime because journeyPatternRefIndex is
                 // expected to be complete at this point. Possible failures should have occurred
                 // earlier in the processing chain. Hence, logging as an error.
-                val exception = UnmatchedRoutesWithinImportException(listOf(routeLabelAndDirection))
+                val exception =
+                    CannotFindJourneyPatternRefByRouteLabelAndDirectionException(listOf(routeLabelAndDirection))
                 LOGGER.error(exception.message)
                 throw exception
             }
@@ -200,7 +201,7 @@ object ConversionsFromHastus {
                             unknownStopLabels.joinToString(prefix = "'", separator = ",", postfix = "'")
                         }"
                     LOGGER.error(errorMessage)
-                    throw NoJourneyPatternRefMatchesHastusTripStopsException(errorMessage)
+                    throw CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException(errorMessage)
                 }
             }
 

src/main/kotlin/fi/hsl/jore4/hastus/service/importing/ImportService.kt

@@ -129,7 +129,7 @@ class ImportService(private val graphQLServiceFactory: GraphQLServiceFactory) {
                             joreStopLabels == hastusStopLabels && joreTimingPlaceLabels == hastusTimingPlaceLabels
                         }
                         ?: run {
-                            val exception = NoJourneyPatternRefMatchesHastusTripStopsException(
+                            val exception = CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException(
                                 hastusRouteLabelAndDirection,
                                 hastusStopLabels,
                                 hastusTimingPlaceLabels
@@ -153,7 +153,9 @@ class ImportService(private val graphQLServiceFactory: GraphQLServiceFactory) {
                 .sorted()
 
             if (missingRouteLabelsAndDirections.isNotEmpty()) {
-                val exception = UnmatchedRoutesWithinImportException(missingRouteLabelsAndDirections)
+                val exception = CannotFindJourneyPatternRefByRouteLabelAndDirectionException(
+                    missingRouteLabelsAndDirections
+                )
                 LOGGER.warn(exception.message)
                 throw exception
             }

src/test/kotlin/fi/hsl/jore4/hastus/api/ImportControllerTest.kt

@@ -5,10 +5,10 @@ import fi.hsl.jore4.hastus.Constants.MIME_TYPE_CSV
 import fi.hsl.jore4.hastus.data.format.JoreRouteDirection
 import fi.hsl.jore4.hastus.data.format.RouteLabelAndDirection
 import fi.hsl.jore4.hastus.graphql.converter.GraphQLAuthenticationFailedException
+import fi.hsl.jore4.hastus.service.importing.CannotFindJourneyPatternRefByRouteLabelAndDirectionException
+import fi.hsl.jore4.hastus.service.importing.CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException
 import fi.hsl.jore4.hastus.service.importing.ImportService
 import fi.hsl.jore4.hastus.service.importing.InvalidHastusDataException
-import fi.hsl.jore4.hastus.service.importing.NoJourneyPatternRefMatchesHastusTripStopsException
-import fi.hsl.jore4.hastus.service.importing.UnmatchedRoutesWithinImportException
 import io.mockk.every
 import io.mockk.junit5.MockKExtension
 import io.mockk.verify
@@ -106,7 +106,7 @@ class ImportControllerTest @Autowired constructor(
     fun `returns 400 when there are unmatched routes in Hastus data`() {
         every {
             importService.importTimetablesFromCsv(any(), any())
-        } throws UnmatchedRoutesWithinImportException(
+        } throws CannotFindJourneyPatternRefByRouteLabelAndDirectionException(
             listOf(
                 RouteLabelAndDirection("123", JoreRouteDirection.OUTBOUND),
                 RouteLabelAndDirection("456", JoreRouteDirection.INBOUND)
@@ -131,7 +131,7 @@ class ImportControllerTest @Autowired constructor(
     fun `returns 400 when no journey pattern reference matches any trip record in Hastus data`() {
         every {
             importService.importTimetablesFromCsv(any(), any())
-        } throws NoJourneyPatternRefMatchesHastusTripStopsException(
+        } throws CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException(
             RouteLabelAndDirection("123", JoreRouteDirection.OUTBOUND),
             listOf("H1000", "H1001", "H1002"),
             listOf("1PLACE", null, "2PLACE")

src/test/kotlin/fi/hsl/jore4/hastus/service/importing/ConversionsFromHastusTest.kt

@@ -260,7 +260,7 @@ class ConversionsFromHastusTest {
                 generateTripStopRecord("trip1", "stop3", "0530", "T", "")
             )
 
-            val exception = assertFailsWith<NoJourneyPatternRefMatchesHastusTripStopsException> {
+            val exception = assertFailsWith<CannotFindJourneyPatternRefByStopLabelsAndTimingPointLabelsException> {
                 ConversionsFromHastus.convertHastusDataToJore(
                     hastusData,
                     vehicleTypeIndex,