Merge branch '6.2.x'

bclozel · bclozel · commit ffd7b93dde74 · 2025-01-20T08:03:12.000+01:00
diff --git a/framework-docs/src/main/kotlin/org/springframework/docs/integration/resthttpinterface/customresolver/CustomHttpServiceArgumentResolver.kt b/framework-docs/src/main/kotlin/org/springframework/docs/integration/resthttpinterface/customresolver/CustomHttpServiceArgumentResolver.kt
@@ -44,11 +44,12 @@ class CustomHttpServiceArgumentResolver {
 				.builderFor(adapter)
 				.customArgumentResolver(SearchQueryArgumentResolver())
 				.build()
-			val repositoryService = factory.createClient<RepositoryService?>(RepositoryService::class.java)
+			val repositoryService = factory.createClient<RepositoryService>(RepositoryService::class.java)
 
 			val search = Search(owner = "spring-projects", language = "java", query = "rest")
 			val repositories = repositoryService.searchRepository(search)
 			// end::usage[]
+			repositories.size
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,12 @@ class CustomHttpServiceArgumentResolver {`
`44`	`44`	`.builderFor(adapter)`
`45`	`45`	`.customArgumentResolver(SearchQueryArgumentResolver())`
`46`	`46`	`.build()`
`47`		`- val repositoryService = factory.createClient<RepositoryService?>(RepositoryService::class.java)`
	`47`	`+ val repositoryService = factory.createClient<RepositoryService>(RepositoryService::class.java)`
`48`	`48`
`49`	`49`	`val search = Search(owner = "spring-projects", language = "java", query = "rest")`
`50`	`50`	`val repositories = repositoryService.searchRepository(search)`
`51`	`51`	`// end::usage[]`
	`52`	`+ repositories.size`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`