Skip to content

Commit f62e6e3

Browse files
committed
Reformat with spotless
1 parent 827f959 commit f62e6e3

File tree

16 files changed

+124
-87
lines changed

16 files changed

+124
-87
lines changed

cli/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/cli/Main.kt

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,18 @@ fun saveReportAsHtml(
9898
/**
9999
* Parses and validates CLI arguments
100100
*/
101-
class CliArguments(args: Array<String>, private val path: Path) {
101+
class CliArguments(
102+
args: Array<String>,
103+
private val path: Path,
104+
) {
102105
private val parser = ArgParser("Compose Compiler Report to HTML Generator ~ ${Constants.VERSION}")
103106

104-
val applicationName by parser.option(
105-
ArgType.String,
106-
shortName = "app",
107-
description = "Application name (To be displayed in the report)",
108-
).required()
107+
val applicationName by parser
108+
.option(
109+
ArgType.String,
110+
shortName = "app",
111+
description = "Application name (To be displayed in the report)",
112+
).required()
109113

110114
val inputDirectory by parser.option(
111115
ArgType.String,
@@ -137,31 +141,36 @@ class CliArguments(args: Array<String>, private val path: Path) {
137141
description = "Class Metrics TXT files (separated by commas)",
138142
)
139143

140-
val outputDirectory by parser.option(
141-
ArgType.String,
142-
shortName = "o",
143-
description = "Output directory name",
144-
).default(path.toAbsolutePath().toString())
145-
146-
val includeStableComposables by parser.option(
147-
ArgType.Boolean,
148-
description = "Whether to include stable Composable functions in the report",
149-
).default(true)
150-
151-
val includeStableClasses by parser.option(
152-
ArgType.Boolean,
153-
description = "Whether to include stable classes in the report",
154-
).default(true)
155-
156-
val includeClasses by parser.option(
157-
ArgType.Boolean,
158-
description = "Whether to include all the classes in the report",
159-
).default(true)
160-
161-
val showOnlyUnstableComposables by parser.option(
162-
ArgType.Boolean,
163-
description = "Whether to ONLY include unstable composables in the report",
164-
).default(false)
144+
val outputDirectory by parser
145+
.option(
146+
ArgType.String,
147+
shortName = "o",
148+
description = "Output directory name",
149+
).default(path.toAbsolutePath().toString())
150+
151+
val includeStableComposables by parser
152+
.option(
153+
ArgType.Boolean,
154+
description = "Whether to include stable Composable functions in the report",
155+
).default(true)
156+
157+
val includeStableClasses by parser
158+
.option(
159+
ArgType.Boolean,
160+
description = "Whether to include stable classes in the report",
161+
).default(true)
162+
163+
val includeClasses by parser
164+
.option(
165+
ArgType.Boolean,
166+
description = "Whether to include all the classes in the report",
167+
).default(true)
168+
169+
val showOnlyUnstableComposables by parser
170+
.option(
171+
ArgType.Boolean,
172+
description = "Whether to ONLY include unstable composables in the report",
173+
).default(false)
165174

166175
init {
167176
parser.parse(args)
@@ -195,22 +204,18 @@ class CliArguments(args: Array<String>, private val path: Path) {
195204
}
196205
}
197206

198-
private fun getRawReportProviderFromIndividualFiles(): ComposeCompilerRawReportProvider {
199-
return ComposeCompilerRawReportProvider.FromIndividualFiles(
207+
private fun getRawReportProviderFromIndividualFiles(): ComposeCompilerRawReportProvider =
208+
ComposeCompilerRawReportProvider.FromIndividualFiles(
200209
briefStatisticsJsonFiles = files(overallStatsFile!!),
201210
detailedStatisticsCsvFiles = files(detailedStatsFile!!),
202211
composableReportFiles = files(composableMetricsFile!!),
203212
classesReportFiles = files(classMetricsFile!!),
204213
)
205-
}
206214

207-
private fun getRawReportProviderFromDirectory(directory: String): ComposeCompilerRawReportProvider.FromDirectory {
208-
return ComposeCompilerRawReportProvider.FromDirectory(File(Paths.get(directory).toAbsolutePath().toString()))
209-
}
215+
private fun getRawReportProviderFromDirectory(directory: String): ComposeCompilerRawReportProvider.FromDirectory =
216+
ComposeCompilerRawReportProvider.FromDirectory(File(Paths.get(directory).toAbsolutePath().toString()))
210217

211-
private fun files(filenames: String): List<File> {
212-
return filenames.split(",").map { ensureFileExists(it) { "File not exist: $it" } }
213-
}
218+
private fun files(filenames: String): List<File> = filenames.split(",").map { ensureFileExists(it) { "File not exist: $it" } }
214219
}
215220

216221
fun printHeader(header: String) =

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/ComposeCompilerMetricsProvider.kt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ private class DefaultComposeCompilerMetricsProvider(
101101
if (csv.size > 1) {
102102
val headers = splitWithCsvSeparator(csv.first())
103103

104-
csv.subList(1, csv.size)
104+
csv
105+
.subList(1, csv.size)
105106
.map { splitWithCsvSeparator(it) }
106107
.map { items -> RowItems(items.mapIndexed { index, value -> Item(headers[index], value) }) }
107108
} else {
@@ -111,13 +112,9 @@ private class DefaultComposeCompilerMetricsProvider(
111112
return DetailedStatistics(metrics)
112113
}
113114

114-
override fun getComposablesReport(): ComposablesReport {
115-
return ComposableReportParser.parse(contentProvider.composablesReportContents)
116-
}
115+
override fun getComposablesReport(): ComposablesReport = ComposableReportParser.parse(contentProvider.composablesReportContents)
117116

118-
override fun getClassesReport(): ClassesReport {
119-
return ClassReportParser.parse(contentProvider.classesReportContents)
120-
}
117+
override fun getClassesReport(): ClassesReport = ClassReportParser.parse(contentProvider.classesReportContents)
121118

122119
private fun splitWithCsvSeparator(content: String) = content.split(",").filter { it.isNotBlank() }
123120
}

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/ComposeCompilerRawReportProvider.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ sealed interface ComposeCompilerRawReportProvider {
5454
/**
5555
* Searches for files in the given [directory] and provides report and metric files found in that directory.
5656
*/
57-
class FromDirectory(directory: File) : ComposeCompilerRawReportProvider {
57+
class FromDirectory(
58+
directory: File,
59+
) : ComposeCompilerRawReportProvider {
5860
private val finder = ReportAndMetricsFileFinder(directory)
5961

6062
override val briefStatisticsJsonFiles: List<File> = finder.findBriefStatisticsJsonFile()

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/ComposeMetricsContentProvider.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ package dev.shreyaspatil.composeCompilerMetricsGenerator.core
2626
/**
2727
* Provides content of a composable report and metrics
2828
*/
29-
class ComposeMetricsContentProvider(private val fileProvider: ComposeCompilerRawReportProvider) {
29+
class ComposeMetricsContentProvider(
30+
private val fileProvider: ComposeCompilerRawReportProvider,
31+
) {
3032
val briefStatisticsContents: List<String> get() = fileProvider.briefStatisticsJsonFiles.map { it.readText() }
3133
val detailedStatisticsCsvRows: List<String> get() = fileProvider.detailedStatisticsCsvFiles.flatMap { it.readLines() }
3234
val composablesReportContents: String get() = fileProvider.composableReportFiles.joinToString(separator = "\n") { it.readText() }

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/file/ReportAndMetricsFileFinder.kt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,22 @@ import java.io.File
3030
*
3131
* @param directory The directory in which files will be searched
3232
*/
33-
class ReportAndMetricsFileFinder(directory: File) {
33+
class ReportAndMetricsFileFinder(
34+
directory: File,
35+
) {
3436
private val allFiles =
3537
directory
3638
.listFiles()
3739
?.filterNotNull()
3840
?: emptyList()
3941

40-
fun findBriefStatisticsJsonFile(): List<File> {
41-
return allFiles.filter { it.name.endsWith(FileSuffixes.MODULE_REPORT_JSON) }
42-
}
42+
fun findBriefStatisticsJsonFile(): List<File> = allFiles.filter { it.name.endsWith(FileSuffixes.MODULE_REPORT_JSON) }
4343

44-
fun findDetailsStatisticsCsvFile(): List<File> {
45-
return allFiles.filter { it.name.endsWith(FileSuffixes.COMPOSABLES_STATS_METRICS_CSV) }
46-
}
44+
fun findDetailsStatisticsCsvFile(): List<File> = allFiles.filter { it.name.endsWith(FileSuffixes.COMPOSABLES_STATS_METRICS_CSV) }
4745

48-
fun findComposablesReportTxtFile(): List<File> {
49-
return allFiles.filter { it.name.endsWith(FileSuffixes.COMPOSABLES_REPORT_TXT) }
50-
}
46+
fun findComposablesReportTxtFile(): List<File> = allFiles.filter { it.name.endsWith(FileSuffixes.COMPOSABLES_REPORT_TXT) }
5147

52-
fun findClassesReportTxtFile(): List<File> {
53-
return allFiles.filter { it.name.endsWith(FileSuffixes.CLASSES_REPORT_TXT) }
54-
}
48+
fun findClassesReportTxtFile(): List<File> = allFiles.filter { it.name.endsWith(FileSuffixes.CLASSES_REPORT_TXT) }
5549

5650
object FileSuffixes {
5751
const val CLASSES_REPORT_TXT = "-classes.txt"

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/DetailedStatistics.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ package dev.shreyaspatil.composeCompilerMetricsGenerator.core.model
2828
*
2929
* @property items List of detailed items
3030
*/
31-
data class DetailedStatistics(val items: List<RowItems>) {
31+
data class DetailedStatistics(
32+
val items: List<RowItems>,
33+
) {
3234
/**
3335
* Headers of a report
3436
*/
@@ -38,9 +40,14 @@ data class DetailedStatistics(val items: List<RowItems>) {
3840
/**
3941
* Model for holding list of name and value pairs i.e. item details
4042
*/
41-
data class RowItems(val item: List<Item>)
43+
data class RowItems(
44+
val item: List<Item>,
45+
)
4246

4347
/**
4448
* Model representing name-value pairs
4549
*/
46-
data class Item(val name: String, val value: String)
50+
data class Item(
51+
val name: String,
52+
val value: String,
53+
)

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/RawContent.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ package dev.shreyaspatil.composeCompilerMetricsGenerator.core.model
2727
* Represents raw data provided by Compose compiler.
2828
* Example: Composable function metric generated by compiler extracted from `-composables.txt` file
2929
*/
30-
data class RawContent(val content: String)
30+
data class RawContent(
31+
val content: String,
32+
)

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/classes/ClassDetail.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ data class ClassDetail(
4747
* @property status Status of a field. E.g. STABLE, UNSTABLE, etc
4848
* @property details Name and type details of a field.
4949
*/
50-
data class Field(val status: String, val details: String) {
50+
data class Field(
51+
val status: String,
52+
val details: String,
53+
) {
5154
private val nameAndType by lazy {
52-
details.split(":")
55+
details
56+
.split(":")
5357
.map { it.trim() }
5458
.let { (name, type) -> name to type }
5559
}

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/classes/ClassesReport.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ import dev.shreyaspatil.composeCompilerMetricsGenerator.core.model.Condition
3232
* @property classes All class details
3333
* @property errors List of Errors occurred while parsing the classes
3434
*/
35-
data class ClassesReport(val classes: List<ClassDetail>, val errors: List<ParsingException>) {
35+
data class ClassesReport(
36+
val classes: List<ClassDetail>,
37+
val errors: List<ParsingException>,
38+
) {
3639
private val stableAndUnstableClasses by lazy {
3740
classes.partition { it.stability === Condition.STABLE }
3841
}

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/composables/ComposableDetail.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ data class ComposableDetail(
4949
* @property condition Stability condition of a parameter
5050
* @property details Name and type details of a parameter
5151
*/
52-
data class Parameter(val condition: Condition, val details: String) {
52+
data class Parameter(
53+
val condition: Condition,
54+
val details: String,
55+
) {
5356
private val nameAndType by lazy {
5457
details.split(":").map { it.trim() }.let { (name, type) -> name to type }
5558
}

0 commit comments

Comments
 (0)