Change property order to be more logical in ImporterRoute.

Author: jarkkoka

src/main/java/fi/hsl/jore/importer/feature/batch/route/RouteExportMapper.java

@@ -31,12 +31,12 @@ public RouteExportMapper(final IJsonbConverter jsonConverter) {
     @Override
     public ImporterRoute mapRow(final ResultSet resultSet, final int rowNumber) throws SQLException {
         return ImporterRoute.of(
+                resultSet.getString("route_number"),
+                getOptionalShort(resultSet, "hidden_variant"),
                 UUID.fromString(resultSet.getString("direction_id")),
                 DirectionType.of(resultSet.getString("direction_type")),
                 jsonConverter.fromJson(resultSet.getString("name"), MultilingualString.class),
                 UUID.fromString(resultSet.getString("line_jore4_id")),
-                resultSet.getString("route_number"),
-                getOptionalShort(resultSet, "hidden_variant"),
                 DATE_RANGE_CONVERTER.from(resultSet.getString("valid_date_range")),
                 LegacyHslMunicipalityCode.valueOf(resultSet.getString("legacy_hsl_municipality_code"))
         );

src/main/java/fi/hsl/jore/importer/feature/network/route/dto/ImporterRoute.java

@@ -32,13 +32,13 @@ public interface ImporterRoute {
 
     LegacyHslMunicipalityCode legacyHslMunicipalityCode();
 
-    static ImporterRoute of(final UUID directionId,
+    static ImporterRoute of(final String routeNumber,
+                            final Optional<Short> hiddenVariant,
+                            final UUID directionId,
                             final DirectionType directionType,
                             final MultilingualString name,
                             final UUID lineJore4Id,
-                            final String routeNumber,
-                            final Optional<Short> hiddenVariant,
-                            final DateRange  validDateRange,
+                            final DateRange validDateRange,
                             final LegacyHslMunicipalityCode legacyHslMunicipalityCode) {
         return ImmutableImporterRoute.builder()
                 .directionId(directionId)

src/test/java/fi/hsl/jore/importer/feature/batch/route/RouteExportProcessorTest.java

@@ -33,12 +33,12 @@ class RouteExportProcessorTest {
     private static final LegacyHslMunicipalityCode ROUTE_LEGACY_HSL_MUNICIPALITY_CODE = LegacyHslMunicipalityCode.HELSINKI;
 
     private static final ImporterRoute INPUT = ImporterRoute.of(
+            ROUTE_NUMBER,
+            ROUTE_HIDDEN_VARIANT,
             IMPORTER_ROUTE_DIRECTION_ID,
             IMPORTER_ROUTE_DIRECTION,
             createMultilingualString(FINNISH_NAME, SWEDISH_NAME),
             LINE_JORE4_ID,
-            ROUTE_NUMBER,
-            ROUTE_HIDDEN_VARIANT,
             DateRange.between(VALIDITY_PERIOD_START_DAY, VALIDITY_PERIOD_END_DAY),
             ROUTE_LEGACY_HSL_MUNICIPALITY_CODE
     );