Skip to content

Add detekt #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 3 commits into from
Jul 31, 2026
+89 −5
Merged

Add detekt #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
865d43a
Add `detekt`
mmathieum Jul 31, 2026
8fc0f0f
buildUponDefaultConfig = true
mmathieum Jul 31, 2026
3985ccb
wip
mmathieum Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions detekt-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" ?>
<SmellBaseline>
<ManuallySuppressedIssues/>
<CurrentIssues>
<ID>CyclomaticComplexMethod:StopTimeSQL.kt:StopTimeSQL$fun update: Boolean</ID>
<ID>CyclomaticComplexMethod:StringsCleanerTests.kt:StringsCleanerTests$@Test fun test_cleanRouteLongName</ID>
<ID>CyclomaticComplexMethod:StringsCleanerTests.kt:StringsCleanerTests$@Test fun test_cleanTripHeadsign</ID>
<ID>EmptyDefaultConstructor:CommonSQL.kt:CommonSQL</ID>
<ID>FunctionOnlyReturningConstant:CleanUtilsExt.kt:fun makeALL_CHARS_REGEX_REPLACEMENT</ID>
<ID>FunctionOnlyReturningConstant:CleanUtilsExt.kt:fun makeALL_FACE_A_REGEX_REPLACEMENT</ID>
<ID>FunctionOnlyReturningConstant:CleanUtilsExt.kt:fun makeALL_ST_REGEX_REPLACEMENT</ID>
<ID>LongMethod:StringsCleanerTests.kt:StringsCleanerTests$@Test fun test_cleanRouteLongName</ID>
<ID>LoopWithTooManyJumpStatements:CharUtils.kt:CharUtils$for</ID>
<ID>MagicNumber:SourceUtils.kt:SourceUtils$3</ID>
<ID>NewLineAtEndOfFile:AgencySQL.kt:org.mtransit.commons.gtfs.sql.AgencySQL.kt</ID>
<ID>NewLineAtEndOfFile:CaVancouverTransLinkProviderCommons.kt:org.mtransit.commons.provider.CaVancouverTransLinkProviderCommons.kt</ID>
<ID>NewLineAtEndOfFile:CalendarDateSQL.kt:org.mtransit.commons.gtfs.sql.CalendarDateSQL.kt</ID>
<ID>NewLineAtEndOfFile:CalendarExceptionType.kt:org.mtransit.commons.gtfs.data.CalendarExceptionType.kt</ID>
<ID>NewLineAtEndOfFile:CharUtils.kt:org.mtransit.commons.CharUtils.kt</ID>
<ID>NewLineAtEndOfFile:CleanerTest.kt:org.mtransit.commons.CleanerTest.kt</ID>
<ID>NewLineAtEndOfFile:CollectionsExtTest.kt:org.mtransit.commons.CollectionsExtTest.kt</ID>
<ID>NewLineAtEndOfFile:Color.kt:org.mtransit.commons.gtfs.data.Color.kt</ID>
<ID>NewLineAtEndOfFile:CommonSQL.kt:org.mtransit.commons.gtfs.sql.CommonSQL.kt</ID>
<ID>NewLineAtEndOfFile:CommonsApp.kt:org.mtransit.commons.CommonsApp.kt</ID>
<ID>NewLineAtEndOfFile:CommonsMain.kt:org.mtransit.scratch.CommonsMain.kt</ID>
<ID>NewLineAtEndOfFile:DirectionSQL.kt:org.mtransit.commons.gtfs.sql.DirectionSQL.kt</ID>
<ID>NewLineAtEndOfFile:FrequencySQL.kt:org.mtransit.commons.gtfs.sql.FrequencySQL.kt</ID>
<ID>NewLineAtEndOfFile:GTFSCommons.kt:org.mtransit.commons.GTFSCommons.kt</ID>
<ID>NewLineAtEndOfFile:OneBusAwayProviderCommons.kt:org.mtransit.commons.provider.OneBusAwayProviderCommons.kt</ID>
<ID>NewLineAtEndOfFile:PrimitivesTxt.kt:org.mtransit.commons.PrimitivesTxt.kt</ID>
<ID>NewLineAtEndOfFile:Quadruple.kt:org.mtransit.commons.model.Quadruple.kt</ID>
<ID>NewLineAtEndOfFile:Quintuple.kt:org.mtransit.commons.model.Quintuple.kt</ID>
<ID>NewLineAtEndOfFile:RTCQuebecProviderCommons.kt:org.mtransit.commons.provider.RTCQuebecProviderCommons.kt</ID>
<ID>NewLineAtEndOfFile:RegexScratch.kt:org.mtransit.scratch.RegexScratch.kt</ID>
<ID>NewLineAtEndOfFile:RegexUtils.kt:org.mtransit.commons.RegexUtils.kt</ID>
<ID>NewLineAtEndOfFile:RouteSQL.kt:org.mtransit.commons.gtfs.sql.RouteSQL.kt</ID>
<ID>NewLineAtEndOfFile:SQLColumDef.kt:org.mtransit.commons.gtfs.sql.SQLColumDef.kt</ID>
<ID>NewLineAtEndOfFile:SQLCreateBuilder.kt:org.mtransit.commons.sql.SQLCreateBuilder.kt</ID>
<ID>NewLineAtEndOfFile:SQLExt.kt:org.mtransit.commons.sql.SQLExt.kt</ID>
<ID>NewLineAtEndOfFile:SQLInsertBuilder.kt:org.mtransit.commons.sql.SQLInsertBuilder.kt</ID>
<ID>NewLineAtEndOfFile:SQLJoinBuilder.kt:org.mtransit.commons.sql.SQLJoinBuilder.kt</ID>
<ID>NewLineAtEndOfFile:SQLTableDef.kt:org.mtransit.commons.gtfs.sql.SQLTableDef.kt</ID>
<ID>NewLineAtEndOfFile:SQLUtils.kt:org.mtransit.commons.sql.SQLUtils.kt</ID>
<ID>NewLineAtEndOfFile:Stop.kt:org.mtransit.commons.gtfs.data.Stop.kt</ID>
<ID>NewLineAtEndOfFile:StopSQL.kt:org.mtransit.commons.gtfs.sql.StopSQL.kt</ID>
<ID>NewLineAtEndOfFile:StopTime.kt:org.mtransit.commons.gtfs.data.StopTime.kt</ID>
<ID>NewLineAtEndOfFile:StopTimeSQL.kt:org.mtransit.commons.gtfs.sql.StopTimeSQL.kt</ID>
<ID>NewLineAtEndOfFile:StringUtils.kt:org.mtransit.commons.StringUtils.kt</ID>
<ID>NewLineAtEndOfFile:TableSQL.kt:org.mtransit.commons.gtfs.sql.TableSQL.kt</ID>
<ID>NewLineAtEndOfFile:Text.kt:org.mtransit.commons.gtfs.data.Text.kt</ID>
<ID>NewLineAtEndOfFile:Time.kt:org.mtransit.commons.gtfs.data.Time.kt</ID>
<ID>NewLineAtEndOfFile:TripSQL.kt:org.mtransit.commons.gtfs.sql.TripSQL.kt</ID>
<ID>NewLineAtEndOfFile:Url.kt:org.mtransit.commons.gtfs.data.Url.kt</ID>
<ID>NewLineAtEndOfFile:WinnipegTransitProviderCommons.kt:org.mtransit.commons.provider.WinnipegTransitProviderCommons.kt</ID>
<ID>NewLineAtEndOfFile:WordUtils.kt:org.mtransit.commons.WordUtils.kt</ID>
<ID>ReturnCount:CharUtils.kt:CharUtils$@JvmStatic fun isUppercaseOnly: Boolean</ID>
<ID>ReturnCount:CommonSQL.kt:CommonSQL$fun insertIntoMainTable: Boolean</ID>
<ID>ReturnCount:WordUtils.kt:WordUtils$private fun isDelimiter: Boolean</ID>
<ID>TooGenericExceptionCaught:CommonSQL.kt:CommonSQL$e: Exception</ID>
<ID>TooGenericExceptionCaught:SourceUtils.kt:SourceUtils$e: Exception</ID>
<ID>TooGenericExceptionThrown:CommonSQL.kt:CommonSQL$throw Exception("Error while counting routes!")</ID>
<ID>TooGenericExceptionThrown:CommonSQL.kt:CommonSQL$throw Exception("Error while inserting $mainTableName ID $id!")</ID>
<ID>TooGenericExceptionThrown:CommonSQL.kt:CommonSQL$throw Exception("No main table!")</ID>
<ID>TooGenericExceptionThrown:PrimitivesTxt.kt:throw Exception("Invalid timestamp in sec '$this'!")</ID>
<ID>TooGenericExceptionThrown:RegexUtils.kt:RegexUtils$throw RuntimeException("Platform not set!")</ID>
<ID>TooGenericExceptionThrown:RouteSQL.kt:RouteSQL$throw Exception("Can't find agency ID!")</ID>
<ID>TooGenericExceptionThrown:SQLExt.kt:throw Exception("SQL error while executing query '$query'!", e)</ID>
<ID>TooGenericExceptionThrown:SQLExt.kt:throw Exception("SQL error while executing update '$query'!", e)</ID>
<ID>TooManyFunctions:CollectionUtils.kt:CollectionUtils</ID>
<ID>TooManyFunctions:CommonSQL.kt:CommonSQL&lt;MainType&gt; : TableSQL</ID>
<ID>TooManyFunctions:RegexUtils.kt:RegexUtils</ID>
<ID>TooManyFunctions:SQLUtils.kt:SQLUtils</ID>
</CurrentIssues>
</SmellBaseline>
2 changes: 2 additions & 0 deletions src/main/java/org/mtransit/commons/SourceUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ object SourceUtils {
"www",
)

@Suppress("PrintStackTrace") // used from JVM & Android
@JvmStatic
fun getSourceLabel(urlString: String): String {
try {
Expand All @@ -56,6 +57,7 @@ object SourceUtils {
}
}

@Suppress("PrintStackTrace") // used from JVM & Android
@JvmStatic
fun getSourceLabel(url: URL): String {
try {
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/org/mtransit/commons/gtfs/sql/CalendarDateSQL.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,14 @@ object CalendarDateSQL : CommonSQL<CalendarDate>(), TableSQL {
override fun getMainTable() = SQLTableDef(
T_CALENDAR_DATE,
listOf(
SQLColumDef(T_CALENDAR_DATE_K_SERVICE_ID_INT, SQLUtils.INT, primaryKey = !CALENDAR_IN_CALENDAR_DATES, SQLForeignKey(T_SERVICE_IDS, T_SERVICE_IDS_K_ID_INT)),
SQLColumDef(T_CALENDAR_DATE_K_DATE, SQLUtils.INT, primaryKey = !CALENDAR_IN_CALENDAR_DATES), // YYYYMMDD
SQLColumDef(
T_CALENDAR_DATE_K_SERVICE_ID_INT, SQLUtils.INT,
primaryKey = !CALENDAR_IN_CALENDAR_DATES, foreignKey = SQLForeignKey(T_SERVICE_IDS, T_SERVICE_IDS_K_ID_INT)
),
SQLColumDef(
T_CALENDAR_DATE_K_DATE, SQLUtils.INT, // YYYYMMDD
primaryKey = !CALENDAR_IN_CALENDAR_DATES
),
SQLColumDef(T_CALENDAR_DATE_K_EXCEPTION_TYPE, SQLUtils.INT), // 1: added, 2: removed (MT: +0: default)
),
insertAllowReplace = false,
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/mtransit/commons/gtfs/sql/StopSQL.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ object StopSQL : CommonSQL<Stop>(), TableSQL {
return statement.executeQuery(sql).use { rs ->
buildList {
while (rs.next()) {
add(rs.getString(T_STOP_IDS_K_ID))
add(rs.getString(T_STOP_IDS_K_ID))
}
}
}
Expand Down Expand Up @@ -80,7 +80,8 @@ object StopSQL : CommonSQL<Stop>(), TableSQL {
append("${getJoinAlias(T_STOP_K_PARENT_STATION_ID_INT)}.$T_STOP_IDS_K_ID AS ${getAlias(T_STOP_K_PARENT_STATION_ID_INT, T_STOP_IDS_K_ID)} ")
append("FROM $T_STOP ")
append("JOIN $T_STOP_IDS AS ${getJoinAlias(T_STOP_K_ID_INT)} ON $T_STOP.$T_STOP_K_ID_INT =${getJoinAlias(T_STOP_K_ID_INT)}.$T_STOP_K_ID_INT ")
append("JOIN $T_STOP_IDS AS ${getJoinAlias(T_STOP_K_PARENT_STATION_ID_INT)} ON $T_STOP.$T_STOP_K_PARENT_STATION_ID_INT = ${getJoinAlias(T_STOP_K_PARENT_STATION_ID_INT)}.$T_STOP_K_ID_INT ")
append("JOIN $T_STOP_IDS AS ${getJoinAlias(T_STOP_K_PARENT_STATION_ID_INT)} ")
.append("ON $T_STOP.$T_STOP_K_PARENT_STATION_ID_INT = ${getJoinAlias(T_STOP_K_PARENT_STATION_ID_INT)}.$T_STOP_K_ID_INT ")
stopId?.let {
append("WHERE ${getJoinAlias(T_STOP_K_ID_INT)}.$T_STOP_IDS_K_ID = '$it'")
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/mtransit/commons/gtfs/sql/TripSQL.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ object TripSQL : CommonSQL<Trip>(), TableSQL {
append("FROM $T_TRIP ")
append("JOIN $T_TRIP_IDS ON $T_TRIP.$T_TRIP_K_ID_INT = $T_TRIP_IDS.$T_TRIP_IDS_K_ID_INT ")
append("JOIN ${RouteSQL.T_ROUTE_IDS} ON $T_TRIP.${T_TRIP_K_ROUTE_ID_INT} = ${RouteSQL.T_ROUTE_IDS}.${RouteSQL.T_ROUTE_K_ID_INT} ")
append("JOIN ${CalendarDateSQL.T_SERVICE_IDS} ON $T_TRIP.${T_TRIP_K_SERVICE_ID_INT} = ${CalendarDateSQL.T_SERVICE_IDS}.${CalendarDateSQL.T_SERVICE_IDS_K_ID_INT} ")
append("JOIN ${CalendarDateSQL.T_SERVICE_IDS} ")
.append("ON $T_TRIP.${T_TRIP_K_SERVICE_ID_INT} = ${CalendarDateSQL.T_SERVICE_IDS}.${CalendarDateSQL.T_SERVICE_IDS_K_ID_INT} ")
tripIds?.let {
append("WHERE $T_TRIP_IDS.$T_TRIP_IDS_K_ID IN (${it.joinToString { "'$it'" }}) ")
}
Expand Down