From 2dd12bd2fe2fbe2f18872017e1c50f2e0f728740 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Thu, 28 Nov 2024 12:55:58 +0100 Subject: [PATCH] [Gradle|Exec] cleanup: migrate Gradle Property#location from String to nio.Path GitOrigin-RevId: 85dbe829219201c6bcb4948a4402f0a5a8b70c27 --- .../gradle/properties/models/Property.kt | 6 +++--- .../gradle/util/GradleJvmValidationUtil.kt | 2 +- .../GradleDaemonJvmPropertiesFileTest.kt | 4 ++-- .../GradleLocalPropertiesFileTest.kt | 4 ++-- .../properties/GradlePropertiesFileTest.kt | 20 +++++++++---------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/properties/models/Property.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/properties/models/Property.kt index a371f1649ce6..b19d83d13197 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/properties/models/Property.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/properties/models/Property.kt @@ -9,15 +9,15 @@ import java.util.* */ data class Property( val value: T, - val location: String + val location: Path ) fun Properties.getStringProperty(key: String, propertiesPath: Path): Property? { val property = getProperty(key) ?: return null - return Property(property, propertiesPath.toString()) + return Property(property, propertiesPath) } fun Properties.getBooleanProperty(key: String, propertiesPath: Path): Property? { val property = getProperty(key) ?: return null - return Property(property.toBoolean(), propertiesPath.toString()) + return Property(property.toBoolean(), propertiesPath) } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleJvmValidationUtil.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleJvmValidationUtil.kt index 1721d8748586..6c8f0df2c0c9 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleJvmValidationUtil.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleJvmValidationUtil.kt @@ -70,7 +70,7 @@ private fun notifyInvalidGradleJavaHomeInfo( javaHomeProperty: Property, 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) } diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleDaemonJvmPropertiesFileTest.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleDaemonJvmPropertiesFileTest.kt index ab5a9f511a30..86454155af77 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleDaemonJvmPropertiesFileTest.kt +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleDaemonJvmPropertiesFileTest.kt @@ -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) } } } \ No newline at end of file diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleLocalPropertiesFileTest.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleLocalPropertiesFileTest.kt index ae19387f3a20..a71de3e2011f 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleLocalPropertiesFileTest.kt +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradleLocalPropertiesFileTest.kt @@ -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) } } } \ No newline at end of file diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradlePropertiesFileTest.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradlePropertiesFileTest.kt index cef2d0280563..8d2502c7f1da 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradlePropertiesFileTest.kt +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/properties/GradlePropertiesFileTest.kt @@ -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) } } } \ No newline at end of file