Merge branch '4.0.x'

Closes gh-50622

Author: snicoll

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/nosql/neo4j/repositories/CityRepository.java

@@ -16,12 +16,10 @@
 
 package org.springframework.boot.docs.data.nosql.neo4j.repositories;
 
-import java.util.Optional;
-
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 
 public interface CityRepository extends Neo4jRepository<City, Long> {
 
-	Optional<City> findOneByNameAndState(String name, String state);
+	City findOneByNameAndState(String name, String state);
 
 }

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/data/nosql/neo4j/repositories/CityRepository.kt

@@ -17,11 +17,10 @@
 package org.springframework.boot.docs.data.nosql.neo4j.repositories
 
 import org.springframework.data.neo4j.repository.Neo4jRepository
-import java.util.Optional
 
 interface CityRepository : Neo4jRepository<City, Long> {
 
-	fun findOneByNameAndState(name: String?, state: String?): Optional<City?>?
+	fun findOneByNameAndState(name: String?, state: String?): City?
 
 }