Merge branch '7.0.x'

framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc

@@ -174,7 +174,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	val actors = jdbcTemplate.query("select first_name, last_name from t_actor") { rs, _ ->
-			Actor(rs.getString("first_name"), rs.getString("last_name"))
+			Actor(rs.getString("first_name"), rs.getString("last_name")) }
 ----
 ======
 
@@ -557,8 +557,6 @@ Kotlin::
 	// some JDBC-backed DAO class...
 	private val namedParameterJdbcTemplate = NamedParameterJdbcTemplate(dataSource)
 
-	private val namedParameterJdbcTemplate = NamedParameterJdbcTemplate(dataSource)
-
 	fun countOfActors(exampleActor: Actor): Int {
 		// notice how the named parameters match the properties of the above 'Actor' class
 		val sql = "select count(*) from t_actor where first_name = :firstName and last_name = :lastName"

framework-docs/modules/ROOT/pages/integration/scheduling.adoc

@@ -131,7 +131,7 @@ listing shows the `TaskScheduler` interface definition:
 		ScheduledFuture scheduleWithFixedDelay(Runnable task, Instant startTime, Duration delay);
 
 		ScheduledFuture scheduleWithFixedDelay(Runnable task, Duration delay);
-
+	}
 ----
 
 The simplest method is the one named `schedule` that takes only a `Runnable` and an `Instant`.
@@ -475,7 +475,7 @@ seconds:
 				return Mono.fromRunnable(() -> System.out.println("Message"));
 			}
 			return Mono.error(new IllegalStateException("Cannot deliver message"));
-		})
+		});
 	}
 ----