Skip to content

Commit 590f959

Browse files
bric3bric3
committed
fix: PR comments
1 parent 5a502dc commit 590f959

File tree

96 files changed

+131
-129
lines changed

Some content is hidden

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

96 files changed

+131
-129
lines changed

‎buildSrc/src/main/kotlin/datadog.test-jvm-contraints.gradle.kts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import datadog.gradle.plugin.testJvmConstraints.ProvideJvmArgsOnJvmLauncherVersion
22
import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension
3+
import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension.Companion.TEST_JVM_CONSTRAINTS
34
import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec
45
import datadog.gradle.plugin.testJvmConstraints.isJavaVersionAllowed
56
import datadog.gradle.plugin.testJvmConstraints.isTestJvmAllowed
@@ -8,12 +9,12 @@ plugins {
89
java
910
}
1011

11-
val projectExtension = extensions.create<TestJvmConstraintsExtension>(TestJvmConstraintsExtension.NAME)
12+
val projectExtension = extensions.create<TestJvmConstraintsExtension>(TEST_JVM_CONSTRAINTS)
1213

1314
val testJvmSpec = TestJvmSpec(project)
1415

1516
tasks.withType<Test>().configureEach {
16-
if (extensions.findByName(TestJvmConstraintsExtension.NAME) != null) {
17+
if (extensions.findByName(TEST_JVM_CONSTRAINTS) != null) {
1718
return@configureEach
1819
}
1920

@@ -23,14 +24,14 @@ tasks.withType<Test>().configureEach {
2324
configureConventions(it, projectExtension)
2425
}
2526

26-
inputs.property("${TestJvmConstraintsExtension.NAME}.allowReflectiveAccessToJdk", taskExtension.allowReflectiveAccessToJdk).optional(true)
27-
inputs.property("${TestJvmConstraintsExtension.NAME}.excludeJdk", taskExtension.excludeJdk)
28-
inputs.property("${TestJvmConstraintsExtension.NAME}.includeJdk", taskExtension.includeJdk)
29-
inputs.property("${TestJvmConstraintsExtension.NAME}.forceJdk", taskExtension.forceJdk)
30-
inputs.property("${TestJvmConstraintsExtension.NAME}.minJavaVersion", taskExtension.minJavaVersion).optional(true)
31-
inputs.property("${TestJvmConstraintsExtension.NAME}.maxJavaVersion", taskExtension.maxJavaVersion).optional(true)
27+
inputs.property("$TEST_JVM_CONSTRAINTS.allowReflectiveAccessToJdk", taskExtension.allowReflectiveAccessToJdk).optional(true)
28+
inputs.property("$TEST_JVM_CONSTRAINTS.excludeJdk", taskExtension.excludeJdk)
29+
inputs.property("$TEST_JVM_CONSTRAINTS.includeJdk", taskExtension.includeJdk)
30+
inputs.property("$TEST_JVM_CONSTRAINTS.forceJdk", taskExtension.forceJdk)
31+
inputs.property("$TEST_JVM_CONSTRAINTS.minJavaVersion", taskExtension.minJavaVersion).optional(true)
32+
inputs.property("$TEST_JVM_CONSTRAINTS.maxJavaVersion", taskExtension.maxJavaVersion).optional(true)
3233

33-
extensions.add(TestJvmConstraintsExtension.NAME, taskExtension)
34+
extensions.add(TEST_JVM_CONSTRAINTS, taskExtension)
3435

3536
configureTestJvm(taskExtension)
3637
}

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsExtension.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ interface TestJvmConstraintsExtension {
3131
val excludeJdk: ListProperty<String>
3232

3333
/**
34-
* Indicate if test jvm allows reflective access to JDK modules, in particular this toggle
35-
* openning `java.base/java.lang` and `java.base/java.util`.
34+
* Indicate if the test JVM allows reflective access to JDK
35+
* `java.base/java.lang` and `java.base/java.util` modules by
36+
* openning them.
3637
*/
3738
val allowReflectiveAccessToJdk: Property<Boolean>
3839

3940
companion object {
40-
const val NAME = "testJvmConstraint"
41+
const val TEST_JVM_CONSTRAINTS = "testJvmConstraints"
4142
}
4243
}

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsUtils.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.gradle.api.logging.Logging
66
private val logger = Logging.getLogger("TestJvmConstraintsUtils")
77

88
internal fun TestJvmConstraintsExtension.isJavaVersionAllowed(version: JavaVersion): Boolean {
9-
return isWithinAllowedRange(version)
9+
return withinAllowedRange(version)
1010
}
1111

1212
internal fun TestJvmConstraintsExtension.isTestJvmAllowed(testJvmSpec: TestJvmSpec): Boolean {
@@ -23,14 +23,14 @@ internal fun TestJvmConstraintsExtension.isTestJvmAllowed(testJvmSpec: TestJvmSp
2323
}
2424

2525
val launcherVersion = JavaVersion.toVersion(testJvmSpec.javaTestLauncher.get().metadata.languageVersion.asInt())
26-
if (!isWithinAllowedRange(launcherVersion) && forceJdk.get().none { it.equals(testJvmName, ignoreCase = true) }) {
26+
if (!withinAllowedRange(launcherVersion) && forceJdk.get().none { it.equals(testJvmName, ignoreCase = true) }) {
2727
return false
2828
}
2929

3030
return true
3131
}
3232

33-
private fun TestJvmConstraintsExtension.isWithinAllowedRange(currentJvmVersion: JavaVersion): Boolean {
33+
private fun TestJvmConstraintsExtension.withinAllowedRange(currentJvmVersion: JavaVersion): Boolean {
3434
val definedMin = minJavaVersion.isPresent
3535
val definedMax = maxJavaVersion.isPresent
3636

‎dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tracerJava {
99
}
1010
}
1111

12-
testJvmConstraint {
12+
testJvmConstraints {
1313
minJavaVersion = JavaVersion.VERSION_11
1414
excludeJdk = ['SEMERU11', 'SEMERU17']
1515
}

‎dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
33
apply from: "$rootDir/gradle/java.gradle"
44
apply plugin: 'idea'
55

6-
testJvmConstraint {
6+
testJvmConstraints {
77
// the tests need Java 11 because the JFR writer got compiled with a version
88
// of ByteBuffer.position(int) which is binary incompatible with Java 8 ¯\_(ツ)_/¯
99
minJavaVersion = JavaVersion.VERSION_11

‎dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
44
apply from: "$rootDir/gradle/java.gradle"
55
apply plugin: 'idea'
66

7-
testJvmConstraint {
7+
testJvmConstraints {
88
minJavaVersion = JavaVersion.VERSION_1_8
99
}
1010

‎dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tracerJava {
99
}
1010
}
1111

12-
testJvmConstraint {
12+
testJvmConstraints {
1313
minJavaVersion = JavaVersion.VERSION_11
1414
// Zulu has backported profiling support
1515
forceJdk = ['ZULU8']

‎dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727

2828
// Oracle JDK requires extra JVM arguments to enable JFR
2929
tasks.withType(Test).configureEach {
30-
testJvmConstraint {
30+
testJvmConstraints {
3131
includeJdk = ['ORACLE8']
3232
}
3333

‎dd-java-agent/instrumentation/aerospike-4.0/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
1515
addTestSuiteExtendingForDir("latest7DepForkedTest", "latest7DepTest", "test")
1616

1717
tasks.named("latestDepTest", Test) {
18-
testJvmConstraint {
18+
testJvmConstraints {
1919
minJavaVersion = JavaVersion.VERSION_21
2020
}
2121
}
2222

2323
tasks.named("latestDepForkedTest", Test) {
24-
testJvmConstraint {
24+
testJvmConstraints {
2525
minJavaVersion = JavaVersion.VERSION_21
2626
}
2727
}

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ addTestSuiteForDir 'version102IastTest', 'iastTest'
1818
addTestSuiteForDir 'latestDepIastTest', 'iastTest'
1919

2020
tasks.named("lagomTest", Test) {
21-
testJvmConstraint {
21+
testJvmConstraints {
2222
maxJavaVersion = JavaVersion.VERSION_1_8
2323
}
2424
}

0 commit comments

Comments
 (0)