From 2c7114fa17f2631259e9408be97bf543a29c1526 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 18 Oct 2022 17:06:36 -0700 Subject: [PATCH] Polish 'Use exclamation character for the document separator prefix' See gh-32521 --- .../boot/env/OriginTrackedPropertiesLoader.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java index 4d2cb2c84b83..4d6706920790 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java @@ -42,6 +42,7 @@ * @author Madhura Bhave * @author Phillip Webb * @author Thiago Hirata + * @author Guirong Hu */ class OriginTrackedPropertiesLoader { @@ -90,12 +91,12 @@ List load(boolean expandLists) throws IOException { if (document.isEmpty() && !documents.isEmpty()) { document = documents.remove(documents.size() - 1); } - reader.setLastLineCommentPrefix(commentPrefixCharacter); + reader.setLastLineCommentPrefixCharacter(commentPrefixCharacter); reader.skipComment(); } } else { - reader.setLastLineCommentPrefix(-1); + reader.setLastLineCommentPrefixCharacter(-1); loadKeyAndValue(expandLists, document, reader, buffer); } } @@ -197,7 +198,7 @@ private static class CharacterReader implements Closeable { private int character; - private int lastLineCommentPrefix; + private int lastLineCommentPrefixCharacter; CharacterReader(Resource resource) throws IOException { this.reader = new LineNumberReader( @@ -233,8 +234,8 @@ private void skipWhitespace() throws IOException { } } - private void setLastLineCommentPrefix(int lastLineCommentPrefix) { - this.lastLineCommentPrefix = lastLineCommentPrefix; + private void setLastLineCommentPrefixCharacter(int lastLineCommentPrefixCharacter) { + this.lastLineCommentPrefixCharacter = lastLineCommentPrefixCharacter; } private void skipComment() throws IOException { @@ -307,7 +308,7 @@ Location getLocation() { } boolean isSameLastLineCommentPrefix() { - return this.lastLineCommentPrefix == this.character; + return this.lastLineCommentPrefixCharacter == this.character; } boolean isCommentPrefixCharacter() {