Merge branch '1.2.x'

Author: bclozel

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/controllers/namespacing/MusicController.java

@@ -24,7 +24,7 @@
 import org.springframework.stereotype.Controller;
 
 @Controller
-@SchemaMapping(typeName="MusicQueries") // <1>
+@SchemaMapping(typeName = "MusicQueries") // <1>
 public class MusicController {
 
 	@QueryMapping // <2>

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/controllers/namespacing/NamespaceConfiguration.java

@@ -30,10 +30,11 @@ public class NamespaceConfiguration {
 	@Bean
 	public GraphQlSourceBuilderCustomizer customizer() {
 		List<String> queryWrappers = List.of("music", "users"); // <1>
-		return sourceBuilder -> sourceBuilder.configureRuntimeWiring(wiringBuilder -> {
-			queryWrappers.forEach(field -> wiringBuilder.type("Query",
-					builder -> builder.dataFetcher(field, env -> Collections.emptyMap()))); // <2>
-		});
+
+		return (sourceBuilder) -> sourceBuilder.configureRuntimeWiring((wiringBuilder) ->
+				queryWrappers.forEach((field) -> wiringBuilder.type("Query",
+						(builder) -> builder.dataFetcher(field, (env) -> Collections.emptyMap()))) // <2>
+		);
 	}
 
 }

src/checkstyle/checkstyle-suppressions.xml

@@ -11,5 +11,5 @@
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="JavadocPackage|SpringJavadoc|InnerTypeLast|SpringMethodVisibility|RequireThis|SpringLambda|SpringTernary|FinalClass|RedundantModifier|SpringAvoidStaticImport" />
 
 	<!-- docs -->
-	<suppress files="(.*graphql-docs.*)" checks="JavadocPackage|OneTopLevelClass" />
+	<suppress files="(.*graphql-docs.*)" checks="JavadocPackage|OneTopLevelClass|InnerTypeLast" />
 </suppressions>