From df944c635423ad7d9281ffbbd6ebba11ea598594 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 8 Sep 2020 11:19:33 -0700
Subject: [PATCH] Polish

---
 .../src/docs/asciidoc/spring-boot-features.adoc             | 1 +
 .../boot/context/metrics/buffering/BufferedStartupStep.java | 6 +++---
 .../properties/source/ConfigurationPropertyName.java        | 6 ++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
index 879754b448..0a1500025f 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@@ -443,6 +443,7 @@ This feature could also be useful for any service wrapper implementation.
 TIP: If you want to know on which HTTP port the application is running, get the property with a key of `local.server.port`.
 
 
+
 [[boot-features-application-startup-tracking]]
 === Application Startup tracking
 During the application startup, the `SpringApplication` and the `ApplicationContext` perform many tasks related to the application lifecycle,
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferedStartupStep.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferedStartupStep.java
index c674215002..ad96ac1bc9 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferedStartupStep.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferedStartupStep.java
@@ -126,16 +126,16 @@ class BufferedStartupStep implements StartupStep {
 
 		private class TagsIterator implements Iterator<Tag> {
 
-			private int idx = 0;
+			private int index = 0;
 
 			@Override
 			public boolean hasNext() {
-				return this.idx < DefaultTags.this.tags.length;
+				return this.index < DefaultTags.this.tags.length;
 			}
 
 			@Override
 			public Tag next() {
-				return DefaultTags.this.tags[this.idx++];
+				return DefaultTags.this.tags[this.index++];
 			}
 
 			@Override
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
index f85c1a98a8..b3bb0963db 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
@@ -326,12 +326,10 @@ public final class ConfigurationPropertyName implements Comparable<Configuration
 		if (type1.allowsFastEqualityCheck() && type2.allowsFastEqualityCheck()) {
 			return !fastElementEquals(e1, e2, i);
 		}
-		else if (type1.allowsDashIgnoringEqualityCheck() && type2.allowsDashIgnoringEqualityCheck()) {
+		if (type1.allowsDashIgnoringEqualityCheck() && type2.allowsDashIgnoringEqualityCheck()) {
 			return !dashIgnoringElementEquals(e1, e2, i);
 		}
-		else {
-			return !defaultElementEquals(e1, e2, i);
-		}
+		return !defaultElementEquals(e1, e2, i);
 	}
 
 	private boolean fastElementEquals(Elements e1, Elements e2, int i) {