From 848167abf02faf5b691a41252a5322852df370a2 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Wed, 13 Nov 2024 11:14:56 -0500 Subject: [PATCH] Removed dependency injection type since it is a custom type. In our project we are now using a CodeReference, but represented these models as a JSON blob. This JSON is then deserialized in the custom pages we have for this. This method helps further clarify these stat types. --- .../invert/models/InvertSerialization.kt | 5 --- .../kotlin/com/squareup/invert/models/Stat.kt | 42 +------------------ .../squareup/invert/models/StatDataType.kt | 4 +- .../invert/common/pages/AllStatsReportPage.kt | 2 +- 4 files changed, 3 insertions(+), 50 deletions(-) diff --git a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/InvertSerialization.kt b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/InvertSerialization.kt index 4ddfdff..6cd79bf 100644 --- a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/InvertSerialization.kt +++ b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/InvertSerialization.kt @@ -26,11 +26,6 @@ object InvertSerialization { actualClass = Stat.NumericStat::class, actualSerializer = Stat.NumericStat.serializer() ) - polymorphic( - baseClass = Stat::class, - actualClass = Stat.DiProvidesAndInjectsStat::class, - actualSerializer = Stat.DiProvidesAndInjectsStat.serializer() - ) polymorphic( baseClass = Stat::class, actualClass = Stat.CodeReferencesStat::class, diff --git a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/Stat.kt b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/Stat.kt index 5f71a58..a4037f8 100644 --- a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/Stat.kt +++ b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/Stat.kt @@ -47,44 +47,4 @@ sealed interface Stat { val owner: OwnerName? = null, ) } - - @Serializable - @SerialName("di_provides_and_injects") - data class DiProvidesAndInjectsStat( - val value: List, - val details: String? = null, - ) : Stat { - /** - * Represents the data in an Anvil ContributesBinding Annotation Usage - */ - @Serializable - data class DiContribution( - val annotation: String, - val scope: String, - val boundImplementation: String, - val boundType: String, - val replaces: List, - ) - - /** - * Represents the data in an Anvil ContributesBinding Annotation Usage - */ - @Serializable - data class DiInjection( - val type: String, - val qualifierAnnotations: List, - val startLine: Int, - val endLine: Int, - ) - - @Serializable - data class ProvidesAndInjects( - val classFqName: String, - val contributions: List, - val consumptions: List, - val filePath: String, - val startLine: Int, - val endLine: Int, - ) - } -} +} \ No newline at end of file diff --git a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/StatDataType.kt b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/StatDataType.kt index ae492ad..25612a4 100644 --- a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/StatDataType.kt +++ b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/StatDataType.kt @@ -9,8 +9,7 @@ enum class StatDataType( BOOLEAN(Boolean::class), NUMERIC(Long::class), STRING(String::class), - CODE_REFERENCES(Stat.CodeReferencesStat.CodeReference::class), // EXPLORE (CUSTOM) - DI_PROVIDES_AND_INJECTS(Stat.DiProvidesAndInjectsStat::class); // EXPLORE (CUSTOM) + CODE_REFERENCES(Stat.CodeReferencesStat.CodeReference::class); companion object { fun fromString(type: String?): StatDataType? { @@ -23,7 +22,6 @@ enum class StatDataType( NUMERIC -> "Numeric" STRING -> "String" CODE_REFERENCES -> "Code References" - DI_PROVIDES_AND_INJECTS -> "DI Provides and Injects" } } diff --git a/invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/AllStatsReportPage.kt b/invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/AllStatsReportPage.kt index 1f57aaa..03e1d3f 100644 --- a/invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/AllStatsReportPage.kt +++ b/invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/AllStatsReportPage.kt @@ -139,7 +139,7 @@ fun AllStatsComposable( headers = listOf("Key", "Description", "Type", "Category", "Count"), maxResultsLimitConstant = PagingConstants.MAX_RESULTS, rows = stats - .filter { it.dataType != StatDataType.STRING && it.dataType != StatDataType.DI_PROVIDES_AND_INJECTS } + .filter { it.dataType != StatDataType.STRING } .map { statMetadata -> mutableListOf( statMetadata.key,