[Gradle|Exec] cleanup: migrate Gradle Property#location from String to nio.Path

GitOrigin-RevId: 85dbe829219201c6bcb4948a4402f0a5a8b70c27
This commit is contained in:
Sergei Vorobyov
2024-11-28 17:40:51 +00:00
committed by intellij-monorepo-bot
parent 8739d91fff
commit 2dd12bd2fe
5 changed files with 18 additions and 18 deletions
@@ -9,15 +9,15 @@ import java.util.*
*/
data class Property<T>(
val value: T,
val location: String
val location: Path
)
fun Properties.getStringProperty(key: String, propertiesPath: Path): Property<String>? {
val property = getProperty(key) ?: return null
return Property(property, propertiesPath.toString())
return Property(property, propertiesPath)
}
fun Properties.getBooleanProperty(key: String, propertiesPath: Path): Property<Boolean>? {
val property = getProperty(key) ?: return null
return Property(property.toBoolean(), propertiesPath.toString())
return Property(property.toBoolean(), propertiesPath)
}
@@ -70,7 +70,7 @@ private fun notifyInvalidGradleJavaHomeInfo(
javaHomeProperty: Property<String>,
reason: JavaHomeValidationStatus
) {
val propertyLocation = createLinkToFile(project, javaHomeProperty.location)
val propertyLocation = createLinkToFile(project, javaHomeProperty.location.toString())
val notificationContent = GradleBundle.message("gradle.notifications.java.home.property.content", propertyLocation)
notifyInvalidGradleJvmInfo(project, notificationContent, reason)
}
@@ -44,9 +44,9 @@ class GradleDaemonJvmPropertiesFileTest : GradleDaemonJvmPropertiesFileTestCase(
}
assertGradleDaemonJvmPropertiesFile {
Assertions.assertEquals("value2", version?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), version?.location)
Assertions.assertEquals(projectPropertiesPath, version?.location)
Assertions.assertEquals("value4", vendor?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), vendor?.location)
Assertions.assertEquals(projectPropertiesPath, vendor?.location)
}
}
}
@@ -32,7 +32,7 @@ class GradleLocalPropertiesFileTest : GradleLocalPropertiesFileTestCase() {
}
asserGradleLocalPropertiesFile {
Assertions.assertEquals("javaHome", javaHomeProperty?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), javaHomeProperty?.location)
Assertions.assertEquals(projectPropertiesPath, javaHomeProperty?.location)
}
}
@@ -45,7 +45,7 @@ class GradleLocalPropertiesFileTest : GradleLocalPropertiesFileTestCase() {
}
asserGradleLocalPropertiesFile {
Assertions.assertEquals("value2", javaHomeProperty?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), javaHomeProperty?.location)
Assertions.assertEquals(projectPropertiesPath, javaHomeProperty?.location)
}
}
}
@@ -44,15 +44,15 @@ class GradlePropertiesFileTest : GradlePropertiesFileTestCase() {
}
assertGradlePropertiesFile {
Assertions.assertEquals("javaHome", javaHomeProperty?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), javaHomeProperty?.location)
Assertions.assertEquals(projectPropertiesPath, javaHomeProperty?.location)
Assertions.assertEquals("info", gradleLoggingLevel?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), gradleLoggingLevel?.location)
Assertions.assertEquals(projectPropertiesPath, gradleLoggingLevel?.location)
Assertions.assertEquals(true, parallel?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), parallel?.location)
Assertions.assertEquals(projectPropertiesPath, parallel?.location)
Assertions.assertEquals(true, isolatedProjects?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), isolatedProjects?.location)
Assertions.assertEquals(projectPropertiesPath, isolatedProjects?.location)
Assertions.assertEquals( "-Xmx20G", jvmOptions?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), jvmOptions?.location)
Assertions.assertEquals(projectPropertiesPath, jvmOptions?.location)
}
}
@@ -69,15 +69,15 @@ class GradlePropertiesFileTest : GradlePropertiesFileTestCase() {
}
assertGradlePropertiesFile {
Assertions.assertEquals("value2", javaHomeProperty?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), javaHomeProperty?.location)
Assertions.assertEquals(projectPropertiesPath, javaHomeProperty?.location)
Assertions.assertEquals("value3", gradleLoggingLevel?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), gradleLoggingLevel?.location)
Assertions.assertEquals(projectPropertiesPath, gradleLoggingLevel?.location)
Assertions.assertEquals(true, parallel?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), parallel?.location)
Assertions.assertEquals(projectPropertiesPath, parallel?.location)
Assertions.assertEquals(true, isolatedProjects?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), isolatedProjects?.location)
Assertions.assertEquals(projectPropertiesPath, isolatedProjects?.location)
Assertions.assertEquals("-Xmx20G", jvmOptions?.value)
Assertions.assertEquals(projectPropertiesPath.toString(), jvmOptions?.location)
Assertions.assertEquals(projectPropertiesPath, jvmOptions?.location)
}
}
}