diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
index 166135fc18d..ebc24e6e1f0 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
@@ -64,7 +64,7 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
 			throws BeansException {
 		if (bean instanceof LocalContainerEntityManagerFactoryBean) {
 			LocalContainerEntityManagerFactoryBean factory = (LocalContainerEntityManagerFactoryBean) bean;
-			factory.setJpaVendorAdapter(new DataSourceSchemeCreatedPublisher(factory));
+			factory.setJpaVendorAdapter(new DataSourceSchemaCreatedPublisher(factory));
 		}
 		return bean;
 	}
@@ -140,13 +140,13 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
 
 	}
 
-	final class DataSourceSchemeCreatedPublisher implements JpaVendorAdapter {
+	final class DataSourceSchemaCreatedPublisher implements JpaVendorAdapter {
 
 		private final JpaVendorAdapter delegate;
 
 		private final LocalContainerEntityManagerFactoryBean factory;
 
-		private DataSourceSchemeCreatedPublisher(
+		private DataSourceSchemaCreatedPublisher(
 				LocalContainerEntityManagerFactoryBean factory) {
 			this.delegate = factory.getJpaVendorAdapter();
 			this.factory = factory;
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
index 8327df6993e..8b0241b5c8d 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
@@ -213,7 +213,7 @@ public class RestartClassLoaderTests {
 
 	private <T> List<T> toList(Enumeration<T> enumeration) {
 		return (enumeration != null) ? Collections.list(enumeration)
-				: Collections.<T>emptyList();
+				: Collections.emptyList();
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 1821bf6b9c5..f0bae95a8e0 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -5645,7 +5645,7 @@ The following component creates a listener endpoint on the `someTopic` topic:
 Spring for Apache Kafka provides a factory bean to create a `StreamsBuilder` object and
 manage the lifecycle of its streams. Spring Boot auto-configures the required
 `KafkaStreamsConfiguration` bean as long as `kafka-streams` in on the classpath and kafka
-streams is enabled via the @EnableKafkaStreams` annotation.
+streams is enabled via the `@EnableKafkaStreams` annotation.
 
 Enabling Kafka Streams means that the application id and bootstrap servers must be set.
 The former can be configured using `spring.kafka.streams.application-id`, defaulting to
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AbstractPropertyMapperTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AbstractPropertyMapperTests.java
index bacbcc8e098..be1c9059e56 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AbstractPropertyMapperTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AbstractPropertyMapperTests.java
@@ -31,20 +31,12 @@ public abstract class AbstractPropertyMapperTests {
 	protected abstract PropertyMapper getMapper();
 
 	protected final Iterator<String> namesFromString(String name) {
-		return namesFromString(name, "value");
-	}
-
-	protected final Iterator<String> namesFromString(String name, Object value) {
 		return Arrays.stream(getMapper().map(name))
 				.map((mapping) -> mapping.getConfigurationPropertyName().toString())
 				.iterator();
 	}
 
 	protected final Iterator<String> namesFromConfiguration(String name) {
-		return namesFromConfiguration(name, "value");
-	}
-
-	protected final Iterator<String> namesFromConfiguration(String name, String value) {
 		return Arrays.stream(getMapper().map(ConfigurationPropertyName.of(name)))
 				.map(PropertyMapping::getPropertySourceName).iterator();
 	}