From 4a8e1023a3c7dd540cbece4796b279ec7bb643a9 Mon Sep 17 00:00:00 2001 From: Wu Zhenwei Date: Sun, 25 Jan 2015 12:33:52 +0800 Subject: [PATCH] Rename set functions to with. --- .../java/com/typesafe/config/ConfigValue.java | 5 ++-- .../java/com/typesafe/config/impl/Parser.java | 6 ++-- .../config/impl/SimpleConfigOrigin.java | 28 ++++++------------- .../com/typesafe/config/impl/Tokenizer.java | 8 +++--- 4 files changed, 18 insertions(+), 29 deletions(-) diff --git a/config/src/main/java/com/typesafe/config/ConfigValue.java b/config/src/main/java/com/typesafe/config/ConfigValue.java index b5dc2411..795454cd 100644 --- a/config/src/main/java/com/typesafe/config/ConfigValue.java +++ b/config/src/main/java/com/typesafe/config/ConfigValue.java @@ -108,9 +108,10 @@ public interface ConfigValue extends ConfigMergeable { Config atKey(String key); /** - * Returns a new {@code ConfigValue} based on this one, but with the given - * origin. This is useful when you are parsing a new format of file or setting + * Returns a {@code ConfigValue} based on this one, but with the given + * origin. This is useful when you are parsing a new format of file or setting * comments for a single ConfigValue. + * * @param origin the origin set on the returned value * @return the new ConfigValue with the given origin */ diff --git a/config/src/main/java/com/typesafe/config/impl/Parser.java b/config/src/main/java/com/typesafe/config/impl/Parser.java index 221ae9e7..8f9b4735 100644 --- a/config/src/main/java/com/typesafe/config/impl/Parser.java +++ b/config/src/main/java/com/typesafe/config/impl/Parser.java @@ -424,7 +424,7 @@ final class Parser { } private SimpleConfigOrigin lineOrigin() { - return ((SimpleConfigOrigin) baseOrigin).setLineNumber(lineNumber); + return ((SimpleConfigOrigin) baseOrigin).withLineNumber(lineNumber); } private ConfigException parseError(String message) { @@ -559,13 +559,13 @@ final class Parser { // "foo.bar" not also to "foo" ListIterator i = keys.listIterator(keys.size()); String deepest = i.previous(); - AbstractConfigObject o = new SimpleConfigObject(value.origin().setComments(null), + AbstractConfigObject o = new SimpleConfigObject(value.origin().withComments(null), Collections. singletonMap( deepest, value)); while (i.hasPrevious()) { Map m = Collections. singletonMap( i.previous(), o); - o = new SimpleConfigObject(value.origin().setComments(null), m); + o = new SimpleConfigObject(value.origin().withComments(null), m); } return o; diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java index 6e275d34..5e39077e 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java @@ -70,7 +70,8 @@ final class SimpleConfigOrigin implements ConfigOrigin { return newResource(resource, null); } - SimpleConfigOrigin setLineNumber(int lineNumber) { + @Override + public SimpleConfigOrigin withLineNumber(int lineNumber) { if (lineNumber == this.lineNumber && lineNumber == this.endLineNumber) { return this; } else { @@ -84,7 +85,8 @@ final class SimpleConfigOrigin implements ConfigOrigin { this.originType, url != null ? url.toExternalForm() : null, this.commentsOrNull); } - SimpleConfigOrigin setComments(List comments) { + @Override + public SimpleConfigOrigin withComments(List comments) { if (ConfigImplUtil.equalsHandlingNull(comments, this.commentsOrNull)) { return this; } else { @@ -97,13 +99,13 @@ final class SimpleConfigOrigin implements ConfigOrigin { if (ConfigImplUtil.equalsHandlingNull(comments, this.commentsOrNull) || comments == null) { return this; } else if (this.commentsOrNull == null) { - return setComments(comments); + return withComments(comments); } else { List merged = new ArrayList(comments.size() + this.commentsOrNull.size()); merged.addAll(comments); merged.addAll(this.commentsOrNull); - return setComments(merged); + return withComments(merged); } } @@ -111,13 +113,13 @@ final class SimpleConfigOrigin implements ConfigOrigin { if (ConfigImplUtil.equalsHandlingNull(comments, this.commentsOrNull) || comments == null) { return this; } else if (this.commentsOrNull == null) { - return setComments(comments); + return withComments(comments); } else { List merged = new ArrayList(comments.size() + this.commentsOrNull.size()); merged.addAll(this.commentsOrNull); merged.addAll(comments); - return setComments(merged); + return withComments(merged); } } @@ -550,18 +552,4 @@ final class SimpleConfigOrigin implements ConfigOrigin { Map fields = applyFieldsDelta(baseFields, delta); return fromFields(fields); } - - @Override - public ConfigOrigin withComments(List comments) { - return this.setComments(comments); - } - - @Override - public ConfigOrigin withLineNumber(int lineNumber) { - if (this.originType == OriginType.GENERIC) { - //This type should not have a lineNumber. - throw new UnsupportedOperationException(); - } - return this.setLineNumber(lineNumber); - } } diff --git a/config/src/main/java/com/typesafe/config/impl/Tokenizer.java b/config/src/main/java/com/typesafe/config/impl/Tokenizer.java index 03460ed7..d8701f93 100644 --- a/config/src/main/java/com/typesafe/config/impl/Tokenizer.java +++ b/config/src/main/java/com/typesafe/config/impl/Tokenizer.java @@ -128,7 +128,7 @@ final class Tokenizer { this.allowComments = allowComments; this.buffer = new LinkedList(); lineNumber = 1; - lineOrigin = this.origin.setLineNumber(lineNumber); + lineOrigin = this.origin.withLineNumber(lineNumber); tokens = new LinkedList(); tokens.add(Tokens.START); whitespaceSaver = new WhitespaceSaver(); @@ -254,7 +254,7 @@ final class Tokenizer { private static ConfigOrigin lineOrigin(ConfigOrigin baseOrigin, int lineNumber) { - return ((SimpleConfigOrigin) baseOrigin).setLineNumber(lineNumber); + return ((SimpleConfigOrigin) baseOrigin).withLineNumber(lineNumber); } // ONE char has always been consumed, either the # or the first /, but @@ -446,7 +446,7 @@ final class Tokenizer { else if (c == '\n') { // keep the line number accurate lineNumber += 1; - lineOrigin = origin.setLineNumber(lineNumber); + lineOrigin = origin.withLineNumber(lineNumber); } } @@ -549,7 +549,7 @@ final class Tokenizer { // newline tokens have the just-ended line number Token line = Tokens.newLine(lineOrigin); lineNumber += 1; - lineOrigin = origin.setLineNumber(lineNumber); + lineOrigin = origin.withLineNumber(lineNumber); return line; } else { Token t;