Skip to content

Commit 54d94e0

Browse files
Spotless apply
1 parent 9d553e7 commit 54d94e0

File tree

5 files changed

+18
-20
lines changed

5 files changed

+18
-20
lines changed

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ private fun loadConfigFields(
5151
val supportedSet =
5252
when (supportedField) {
5353
is Set<*> -> supportedField as Set<String>
54-
5554
is Map<*, *> -> supportedField.keys as Set<String>
56-
5755
else -> throw IllegalStateException("SUPPORTED field must be either Set<String> or Map<String, Any>, but was ${supportedField?.javaClass}")
5856
}
5957

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ParseV2SupportedConfigurationsTask.kt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package datadog.gradle.plugin.config
22

3+
import com.fasterxml.jackson.core.type.TypeReference
4+
import com.fasterxml.jackson.databind.ObjectMapper
35
import org.gradle.api.DefaultTask
4-
import org.gradle.kotlin.dsl.property
56
import org.gradle.api.model.ObjectFactory
7+
import org.gradle.api.tasks.CacheableTask
68
import org.gradle.api.tasks.Input
79
import org.gradle.api.tasks.InputFile
810
import org.gradle.api.tasks.OutputDirectory
9-
import org.gradle.api.tasks.TaskAction
10-
import com.fasterxml.jackson.core.type.TypeReference
11-
import com.fasterxml.jackson.databind.ObjectMapper
12-
import org.gradle.api.tasks.CacheableTask
1311
import org.gradle.api.tasks.PathSensitive
1412
import org.gradle.api.tasks.PathSensitivity
13+
import org.gradle.api.tasks.TaskAction
14+
import org.gradle.kotlin.dsl.property
1515
import java.io.File
1616
import java.io.FileInputStream
1717
import java.io.PrintWriter
1818
import javax.inject.Inject
1919

2020
@CacheableTask
21-
abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
21+
abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
2222
private val objects: ObjectFactory
2323
) : DefaultTask() {
2424
@InputFile
@@ -47,6 +47,7 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
4747
// Fetch top-level keys of JSON file
4848
@Suppress("UNCHECKED_CAST")
4949
val supportedRaw = fileData["supportedConfigurations"] as Map<String, List<Map<String, Any?>>>
50+
5051
@Suppress("UNCHECKED_CAST")
5152
val deprecated = (fileData["deprecations"] as? Map<String, String>) ?: emptyMap()
5253

@@ -196,14 +197,11 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
196197
}
197198
}
198199

199-
private fun quoteList(list: List<String>): String =
200-
list.joinToString(", ") { "\"${esc(it)}\"" }
200+
private fun quoteList(list: List<String>): String = list.joinToString(", ") { "\"${esc(it)}\"" }
201201

202-
private fun esc(s: String): String =
203-
s.replace("\\", "\\\\").replace("\"", "\\\"")
202+
private fun esc(s: String): String = s.replace("\\", "\\\\").replace("\"", "\\\"")
204203

205-
private fun escNullableString(s: String?): String =
206-
if (s == null) "null" else "\"${esc(s)}\""
204+
private fun escNullableString(s: String?): String = if (s == null) "null" else "\"${esc(s)}\""
207205
}
208206

209207
private data class SupportedConfigurationItem(

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzlePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class MuzzlePlugin : Plugin<Project> {
120120
val muzzleTaskName = taskName.removePrefix(":")
121121
val projectPath = project.path.removePrefix(":")
122122
muzzleTaskName == "muzzle" || "$projectPath:muzzle" == muzzleTaskName ||
123-
muzzleTaskName == "runMuzzle"
123+
muzzleTaskName == "runMuzzle"
124124
}
125125
if (!hasRelevantTask) {
126126
// Adding muzzle dependencies has a large config overhead. Stop unless muzzle is explicitly run.

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ abstract class MuzzleTask @Inject constructor(
100100
workerExecutor.processIsolation {
101101
forkOptions {
102102
// datadog.trace.agent.tooling.muzzle.MuzzleVersionScanPlugin needs reflective access to ClassLoader.findLoadedClass
103-
if(javaLauncher.metadata.languageVersion > JavaLanguageVersion.of(9)) {
103+
if (javaLauncher.metadata.languageVersion > JavaLanguageVersion.of(9)) {
104104
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
105105
}
106106
executable(javaLauncher.executablePath)

buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tasks.withType<Test>().configureEach {
4545

4646
// Trick to avoid on CI: "Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock."
4747
// Use a task-specific user prefs directory
48-
systemProperty("java.util.prefs.userRoot", "$buildDir/tmp/userPrefs/${name}")
48+
systemProperty("java.util.prefs.userRoot", "$buildDir/tmp/userPrefs/$name")
4949

5050
// Split up tests that want to run forked in their own separate JVM for generated tasks
5151
if (name.startsWith("forkedTest") || name.endsWith("ForkedTest")) {
@@ -76,9 +76,11 @@ tasks.register("allTests") {
7676
// Register a task "allLatestDepTests" that depends on all Test tasks whose names include 'latest'.
7777
// This is used when we want to run tests against the latest dependency versions.
7878
tasks.register("allLatestDepTests") {
79-
dependsOn(tasks.withType<Test>().matching { testTask ->
80-
testTask.name.contains("latest", ignoreCase = true)
81-
})
79+
dependsOn(
80+
tasks.withType<Test>().matching { testTask ->
81+
testTask.name.contains("latest", ignoreCase = true)
82+
}
83+
)
8284
}
8385

8486
// Make the 'check' task depend on all Test tasks in the project.

0 commit comments

Comments
 (0)