Skip to content

Commit ff9e078

Browse files
handstandsamhandstandsam
authored
Merge pull request #21 from square/module-path
gradlePath -> modulePath
2 parents fce1a13 + 83831e5 commit ff9e078

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+177
-177
lines changed

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/CollectedStatsAggregate.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.squareup.invert
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44

55
data class CollectedStatsAggregate(
6-
val aggregatedStatsByProject: Map<GradlePath, List<CollectedStat>>,
6+
val aggregatedStatsByProject: Map<ModulePath, List<CollectedStat>>,
77
val globalStats: List<CollectedStat>
88
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/InvertAllCollectedData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.squareup.invert
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import java.io.File
55

66
/**
77
* Information sent to a [StatCollector] for a specific project/module.
88
*/
99
class InvertAllCollectedData(
1010
val rootProjectDir: File,
11-
val projectPath: GradlePath,
11+
val projectPath: ModulePath,
1212
val projectDir: File,
1313
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/InvertAllCollectedDataRepo.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.squareup.invert.internal.models.CollectedOwnershipForProject
66
import com.squareup.invert.internal.models.CollectedPluginsForProject
77
import com.squareup.invert.internal.models.CollectedStatsForProject
88
import com.squareup.invert.internal.models.InvertCombinedCollectedData
9-
import com.squareup.invert.models.GradlePath
9+
import com.squareup.invert.models.ModulePath
1010
import com.squareup.invert.models.OwnerInfo
1111
import com.squareup.invert.models.Stat
1212
import com.squareup.invert.models.js.MetadataJsReportModel
@@ -23,46 +23,46 @@ class InvertAllCollectedDataRepo(
2323

2424
val mavenRepoUrls = projectMetadata.mavenRepoUrls
2525

26-
val projectPaths: Set<GradlePath> by lazy {
26+
val projectPaths: Set<ModulePath> by lazy {
2727
mutableSetOf<String>().apply {
2828
allCollectedData.apply {
2929
collectedDependencies.forEach { add(it.path) }
30-
collectedConfigurations.forEach { add(it.path) }
30+
collectedConfigurations.forEach { add(it.modulePath) }
3131
collectedOwners.forEach { add(it.path) }
3232
collectedStats.forEach { add(it.path) }
3333
collectedPlugins.forEach { add(it.path) }
3434
}
3535
}
3636
}
3737

38-
fun getProject(gradlePath: GradlePath): AllCollectedDataForProject? {
38+
fun getProject(modulePath: ModulePath): AllCollectedDataForProject? {
3939
return AllCollectedDataForProject(
40-
collectedDependencies = allCollectedData.collectedDependencies.firstOrNull { it.path == gradlePath }
40+
collectedDependencies = allCollectedData.collectedDependencies.firstOrNull { it.path == modulePath }
4141
?: CollectedDependenciesForProject(
42-
path = gradlePath,
42+
path = modulePath,
4343
emptyMap(),
4444
emptyMap()
4545
),
46-
collectedConfigurations = allCollectedData.collectedConfigurations.firstOrNull { it.path == gradlePath }
46+
collectedConfigurations = allCollectedData.collectedConfigurations.firstOrNull { it.modulePath == modulePath }
4747
?: CollectedConfigurationsForProject(
48-
path = gradlePath,
48+
modulePath = modulePath,
4949
emptySet(),
5050
emptySet()
5151
),
52-
collectedOwners = allCollectedData.collectedOwners.firstOrNull { it.path == gradlePath }
52+
collectedOwners = allCollectedData.collectedOwners.firstOrNull { it.path == modulePath }
5353
?: CollectedOwnershipForProject(
54-
path = gradlePath,
54+
path = modulePath,
5555
ownerInfo = OwnerInfo("None"),
5656
),
57-
collectedStats = allCollectedData.collectedStats.firstOrNull { it.path == gradlePath }
57+
collectedStats = allCollectedData.collectedStats.firstOrNull { it.path == modulePath }
5858
?: CollectedStatsForProject(
59-
path = gradlePath,
59+
path = modulePath,
6060
emptyMap(),
6161
emptyMap()
6262
),
63-
collectedPlugins = allCollectedData.collectedPlugins.firstOrNull { it.path == gradlePath }
63+
collectedPlugins = allCollectedData.collectedPlugins.firstOrNull { it.path == modulePath }
6464
?: CollectedPluginsForProject(
65-
path = gradlePath,
65+
path = modulePath,
6666
emptyList()
6767
),
6868
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/InvertOwnershipCollector.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.squareup.invert
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import com.squareup.invert.models.OwnerInfo
55

66
/**
@@ -9,6 +9,6 @@ import com.squareup.invert.models.OwnerInfo
99
interface InvertOwnershipCollector {
1010
fun collect(
1111
rootProjectDir: String,
12-
gradlePath: GradlePath
12+
modulePath: ModulePath
1313
): OwnerInfo?
1414
}

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/InvertProjectData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.squareup.invert
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import java.io.File
55

66

77
class InvertProjectData(
88
val rootProjectDir: File,
9-
val projectPath: GradlePath,
9+
val projectPath: ModulePath,
1010
val projectDir: File,
1111
)
1212

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/CollectedStatAggregator.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.squareup.invert.internal.models.InvertCombinedCollectedData
99
import com.squareup.invert.internal.report.json.InvertJsonReportWriter
1010
import com.squareup.invert.models.ExtraDataType
1111
import com.squareup.invert.models.ExtraMetadata
12-
import com.squareup.invert.models.GradlePath
12+
import com.squareup.invert.models.ModulePath
1313
import com.squareup.invert.models.Stat
1414
import com.squareup.invert.models.StatKey
1515
import com.squareup.invert.models.StatMetadata
@@ -25,10 +25,10 @@ data class AggregatedCodeReferences(
2525

2626
object CollectedStatAggregator {
2727

28-
private val PROJECT_EXTRA_METADATA = ExtraMetadata(
29-
key = "project",
28+
private val MODULE_EXTRA_METADATA = ExtraMetadata(
29+
key = "module_path",
3030
type = ExtraDataType.STRING,
31-
description = "Project"
31+
description = "Module Path"
3232
)
3333

3434
private fun exportFullListOfCodeReferences(
@@ -52,7 +52,7 @@ object CollectedStatAggregator {
5252
collectedCodeReferenceStat.value.map { codeReference: Stat.CodeReferencesStat.CodeReference ->
5353
// Adding addition "extra" field named "project"
5454
codeReference.copy(
55-
extras = codeReference.extras.plus(PROJECT_EXTRA_METADATA.key to collectedStatsForProject.path)
55+
extras = codeReference.extras.plus(MODULE_EXTRA_METADATA.key to collectedStatsForProject.path)
5656
)
5757
}
5858
)
@@ -69,7 +69,7 @@ object CollectedStatAggregator {
6969
),
7070
serializer = AggregatedCodeReferences.serializer(),
7171
value = AggregatedCodeReferences(
72-
metadata = statMetadata.copy(extras = statMetadata.extras.plus(PROJECT_EXTRA_METADATA)),
72+
metadata = statMetadata.copy(extras = statMetadata.extras.plus(MODULE_EXTRA_METADATA)),
7373
values = allCodeReferencesForStatWithProjectPathExtra
7474
)
7575
)
@@ -85,7 +85,7 @@ object CollectedStatAggregator {
8585
reportMetadata: MetadataJsReportModel,
8686
statCollectorsForAggregation: List<StatCollector>?
8787
): InvertCombinedCollectedData {
88-
val projectPathToCollectedStatsForProject: MutableMap<GradlePath, CollectedStatsForProject> =
88+
val projectPathToCollectedStatsForProject: MutableMap<ModulePath, CollectedStatsForProject> =
8989
origAllCollectedData.collectedStats
9090
.associateBy { it.path }
9191
.toMutableMap()

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/NoOpOwnershipCollector.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.squareup.invert.internal
22

33
import com.squareup.invert.InvertOwnershipCollector
4-
import com.squareup.invert.models.GradlePath
4+
import com.squareup.invert.models.ModulePath
55
import com.squareup.invert.models.OwnerInfo
66

77
/**
@@ -10,6 +10,6 @@ import com.squareup.invert.models.OwnerInfo
1010
object NoOpOwnershipCollector : InvertOwnershipCollector {
1111
override fun collect(
1212
rootProjectDir: String,
13-
gradlePath: GradlePath
13+
modulePath: ModulePath
1414
): OwnerInfo? = null
1515
}

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/CollectedConfigurationsForProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.squareup.invert.internal.models
22
import com.squareup.invert.models.ConfigurationName
3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import kotlinx.serialization.Serializable
55

66
/**
@@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable
1010
*/
1111
@Serializable
1212
data class CollectedConfigurationsForProject(
13-
val path: GradlePath,
13+
val modulePath: ModulePath,
1414
/** All Available Configurations */
1515
val allConfigurationNames: Set<ConfigurationName>,
1616
/** Configurations that were analyzed */

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/CollectedDependenciesForProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.squareup.invert.internal.models
22
import com.squareup.invert.models.ConfigurationName
33
import com.squareup.invert.models.DependencyId
4-
import com.squareup.invert.models.GradlePath
4+
import com.squareup.invert.models.ModulePath
55
import kotlinx.serialization.Serializable
66

77
/**
@@ -11,7 +11,7 @@ import kotlinx.serialization.Serializable
1111
*/
1212
@Serializable
1313
data class CollectedDependenciesForProject(
14-
val path: GradlePath,
14+
val path: ModulePath,
1515
val dependencies: Map<DependencyId, Set<ConfigurationName>>,
1616
val directDependencies: Map<ConfigurationName, Set<DependencyId>>,
1717
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/CollectedOwnershipForProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.squareup.invert.internal.models
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import com.squareup.invert.models.OwnerInfo
55
import kotlinx.serialization.Serializable
66

@@ -11,6 +11,6 @@ import kotlinx.serialization.Serializable
1111
*/
1212
@Serializable
1313
data class CollectedOwnershipForProject(
14-
val path: GradlePath,
14+
val path: ModulePath,
1515
val ownerInfo: OwnerInfo,
1616
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/CollectedPluginsForProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.squareup.invert.internal.models
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import com.squareup.invert.models.GradlePluginId
55
import kotlinx.serialization.Serializable
66

@@ -9,6 +9,6 @@ import kotlinx.serialization.Serializable
99
*/
1010
@Serializable
1111
data class CollectedPluginsForProject(
12-
val path: GradlePath,
12+
val path: ModulePath,
1313
val plugins: List<GradlePluginId>,
1414
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/CollectedStatsForProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.squareup.invert.internal.models
22

3-
import com.squareup.invert.models.GradlePath
3+
import com.squareup.invert.models.ModulePath
44
import com.squareup.invert.models.Stat
55
import com.squareup.invert.models.StatKey
66
import com.squareup.invert.models.StatMetadata
@@ -11,7 +11,7 @@ import kotlinx.serialization.Serializable
1111
*/
1212
@Serializable
1313
data class CollectedStatsForProject(
14-
val path: GradlePath,
14+
val path: ModulePath,
1515
val statInfos: Map<StatKey, StatMetadata>,
1616
val stats: Map<StatKey, Stat>
1717
)

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/InvertReportWriter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.squareup.invert.internal.report.js.InvertJsReportWriter
1111
import com.squareup.invert.internal.report.json.InvertJsonReportWriter
1212
import com.squareup.invert.logging.InvertLogger
1313
import com.squareup.invert.models.DependencyId
14-
import com.squareup.invert.models.GradlePath
14+
import com.squareup.invert.models.ModulePath
1515
import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
1616
import com.squareup.invert.models.js.MetadataJsReportModel
1717
import java.io.File
@@ -75,7 +75,7 @@ class InvertReportWriter(
7575
*/
7676
private fun assertModuleMatch(
7777
logger: InvertLogger,
78-
modulesList: List<GradlePath>,
78+
modulesList: List<ModulePath>,
7979
invertedModulesList: List<DependencyId>
8080
) {
8181
if (!invertedModulesList.containsAll(modulesList)) {

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/js/InvertJsReportUtils.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.squareup.invert.internal.models.CollectedStatsForProject
88
import com.squareup.invert.models.ConfigurationName
99
import com.squareup.invert.models.StatDataType
1010
import com.squareup.invert.models.DependencyId
11-
import com.squareup.invert.models.GradlePath
11+
import com.squareup.invert.models.ModulePath
1212
import com.squareup.invert.models.GradlePluginId
1313
import com.squareup.invert.models.Stat
1414
import com.squareup.invert.models.StatKey
@@ -88,7 +88,7 @@ object InvertJsReportUtils {
8888
}
8989
.associateBy { it.key }
9090

91-
val statData = mutableMapOf<GradlePath, Map<StatKey, Stat>>()
91+
val statData = mutableMapOf<ModulePath, Map<StatKey, Stat>>()
9292
collectedStats.forEach { collectedStatForProject: CollectedStatsForProject ->
9393
statData[collectedStatForProject.path] = collectedStatForProject.stats
9494
}
@@ -104,7 +104,7 @@ object InvertJsReportUtils {
104104
*/
105105
fun toCollectedPlugins(allPlugins: List<CollectedPluginsForProject>): PluginsJsReportModel {
106106
return PluginsJsReportModel(
107-
plugins = mutableMapOf<GradlePluginId, MutableList<GradlePath>>()
107+
plugins = mutableMapOf<GradlePluginId, MutableList<ModulePath>>()
108108
.also { resultingDepIdToModuleUsageInfo ->
109109
allPlugins.forEach { collectedDataFromModule ->
110110
collectedDataFromModule.plugins.forEach { pluginId ->
@@ -114,7 +114,7 @@ object InvertJsReportUtils {
114114
}
115115
}
116116
},
117-
modules = mutableMapOf<GradlePath, List<GradlePluginId>>()
117+
modules = mutableMapOf<ModulePath, List<GradlePluginId>>()
118118
.also { map ->
119119
allPlugins.forEach { collectedDataFromModule ->
120120
collectedDataFromModule.plugins.onEach {
@@ -132,12 +132,12 @@ object InvertJsReportUtils {
132132
collectedDependenciesForProjects: List<CollectedDependenciesForProject>
133133
): DependenciesJsReportModel {
134134
return DependenciesJsReportModel(
135-
mutableMapOf<DependencyId, MutableMap<GradlePath, MutableList<ConfigurationName>>>()
135+
mutableMapOf<DependencyId, MutableMap<ModulePath, MutableList<ConfigurationName>>>()
136136
.also { resultingDepIdToModuleUsageInfo ->
137137
collectedDependenciesForProjects.forEach { collectedDataFromModule ->
138138
val collectedDataFromModuleGradlePath = collectedDataFromModule.path
139139
collectedDataFromModule.dependencies.forEach { (dependencyId, usedInConfigurationNames) ->
140-
val currDataForDepName: MutableMap<GradlePath, MutableList<ConfigurationName>> =
140+
val currDataForDepName: MutableMap<ModulePath, MutableList<ConfigurationName>> =
141141
resultingDepIdToModuleUsageInfo[dependencyId] ?: mutableMapOf()
142142
val currConfigsForPath: MutableList<ConfigurationName> =
143143
currDataForDepName[collectedDataFromModuleGradlePath] ?: mutableListOf()
@@ -154,20 +154,20 @@ object InvertJsReportUtils {
154154
allProjectsConfigurationsData: List<CollectedConfigurationsForProject>
155155
): ConfigurationsJsReportModel {
156156
val allConfigurationNames = mutableSetOf<String>()
157-
val moduleToAllConfigurationNames = mutableMapOf<GradlePath, Set<ConfigurationName>>()
158-
val moduleToAnalyzedConfigurationNames = mutableMapOf<GradlePath, Set<ConfigurationName>>()
159-
val analyzedConfigurationNameToModules = mutableMapOf<ConfigurationName, MutableSet<GradlePath>>()
157+
val moduleToAllConfigurationNames = mutableMapOf<ModulePath, Set<ConfigurationName>>()
158+
val moduleToAnalyzedConfigurationNames = mutableMapOf<ModulePath, Set<ConfigurationName>>()
159+
val analyzedConfigurationNameToModules = mutableMapOf<ConfigurationName, MutableSet<ModulePath>>()
160160

161161
allProjectsConfigurationsData.forEach { projectConfigurationsData ->
162162
allConfigurationNames.addAll(projectConfigurationsData.allConfigurationNames)
163-
moduleToAllConfigurationNames[projectConfigurationsData.path] =
163+
moduleToAllConfigurationNames[projectConfigurationsData.modulePath] =
164164
projectConfigurationsData.allConfigurationNames
165-
moduleToAnalyzedConfigurationNames[projectConfigurationsData.path] =
165+
moduleToAnalyzedConfigurationNames[projectConfigurationsData.modulePath] =
166166
projectConfigurationsData.analyzedConfigurationNames
167167
projectConfigurationsData.analyzedConfigurationNames.forEach { analyzedConfigurationName ->
168168
val modules =
169169
analyzedConfigurationNameToModules[analyzedConfigurationName] ?: mutableSetOf()
170-
modules.add(projectConfigurationsData.path)
170+
modules.add(projectConfigurationsData.modulePath)
171171
analyzedConfigurationNameToModules[analyzedConfigurationName] = modules
172172
}
173173
}

‎invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/tasks/InvertCollectDependenciesTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ internal abstract class InvertCollectDependenciesTask : DefaultTask() {
9696
.toTransitiveDeps(),
9797
)
9898
val collectedConfigurations = CollectedConfigurationsForProject(
99-
path = projectPath.get(),
99+
modulePath = projectPath.get(),
100100
allConfigurationNames = allConfigurationNames.get(),
101101
analyzedConfigurationNames = analyzedConfigurationNames.get(),
102102
)

0 commit comments

Comments
 (0)