Skip to content

Commit 925208d

Browse files
committed
Merge remote-tracking branch 'origin/master' into xuorig-field-extension-uniqueness-perf
# Conflicts: # src/main/java/graphql/schema/idl/SchemaTypeExtensionsChecker.java
2 parents 71625e9 + 441898b commit 925208d

52 files changed

Lines changed: 9514 additions & 95 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is a [GraphQL](https://github.com/graphql/graphql-spec) Java implementation
77
Latest build in Maven central: https://repo1.maven.org/maven2/com/graphql-java/graphql-java/
88

99
[![Build](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml)
10-
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=23.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
10+
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=24.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
1111
[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?label=maven-central%20snapshot&versionPrefix=0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
1212
[![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java/blob/master/LICENSE.md)
1313

README.zh_cn.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
该组件是 [GraphQL 规范](https://github.com/graphql/graphql-spec) 的 Java 实现。
66

77
[![Build](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml)
8-
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=23.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
8+
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=24.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
99
[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?label=maven-central%20snapshot&versionPrefix=0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
1010
[![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java/blob/master/LICENSE.md)
1111

@@ -15,6 +15,8 @@
1515

1616
更多细节请参考`graphql-java`官方文档: https://www.graphql-java.com/documentation/getting-started
1717

18+
我们写了一本书: [GraphQL with Java and Spring](https://leanpub.com/graphql-java)
19+
1820
如果您想了解新版本更多的信息和变更日志请参阅[ releases 列表](https://github.com/graphql-java/graphql-java/releases)
1921

2022
### 行为规范

build.gradle

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ dependencies {
144144

145145
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
146146
testImplementation "com.tngtech.archunit:archunit-junit5:1.4.1"
147+
testImplementation 'org.openjdk.jmh:jmh-core:1.37' // required for ArchUnit to check JMH tests
147148

148149
antlr 'org.antlr:antlr4:' + antlrVersion
149150

@@ -309,13 +310,17 @@ artifacts {
309310

310311
List<TestDescriptor> failedTests = []
311312

312-
test {
313+
tasks.withType(Test) {
313314
useJUnitPlatform()
314315
testLogging {
315316
events "FAILED", "SKIPPED"
316317
exceptionFormat = "FULL"
317318
}
318319

320+
// Required for JMH ArchUnit tests
321+
classpath += sourceSets.jmh.output
322+
dependsOn "jmhClasses"
323+
319324
afterTest { TestDescriptor descriptor, TestResult result ->
320325
if (result.getFailedTestCount() > 0) {
321326
failedTests.add(descriptor)
@@ -327,34 +332,11 @@ tasks.register('testWithJava17', Test) {
327332
javaLauncher = javaToolchains.launcherFor {
328333
languageVersion = JavaLanguageVersion.of(17)
329334
}
330-
useJUnitPlatform()
331-
testLogging {
332-
events "FAILED", "SKIPPED"
333-
exceptionFormat = "FULL"
334-
}
335-
336-
afterTest { TestDescriptor descriptor, TestResult result ->
337-
if (result.getFailedTestCount() > 0) {
338-
failedTests.add(descriptor)
339-
}
340-
}
341-
342335
}
343336
tasks.register('testWithJava11', Test) {
344337
javaLauncher = javaToolchains.launcherFor {
345338
languageVersion = JavaLanguageVersion.of(11)
346339
}
347-
useJUnitPlatform()
348-
testLogging {
349-
events "FAILED", "SKIPPED"
350-
exceptionFormat = "FULL"
351-
}
352-
353-
afterTest { TestDescriptor descriptor, TestResult result ->
354-
if (result.getFailedTestCount() > 0) {
355-
failedTests.add(descriptor)
356-
}
357-
}
358340
}
359341
test.dependsOn testWithJava17
360342
test.dependsOn testWithJava11

0 commit comments

Comments
 (0)