From 147174089938e8513a85a100e2a6ad2600abd74f Mon Sep 17 00:00:00 2001 From: Andrey Somov Date: Sat, 10 Sep 2022 13:51:30 +0300 Subject: Reformat --- src/main/java/org/yaml/snakeyaml/LoaderOptions.java | 1 + src/main/java/org/yaml/snakeyaml/Yaml.java | 4 ++-- .../org/yaml/snakeyaml/constructor/Constructor.java | 1 + .../yaml/snakeyaml/constructor/SafeConstructor.java | 8 +++----- .../java/org/yaml/snakeyaml/scanner/ScannerImpl.java | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/yaml/snakeyaml/LoaderOptions.java b/src/main/java/org/yaml/snakeyaml/LoaderOptions.java index 9625bb2f..911bb043 100644 --- a/src/main/java/org/yaml/snakeyaml/LoaderOptions.java +++ b/src/main/java/org/yaml/snakeyaml/LoaderOptions.java @@ -140,6 +140,7 @@ public class LoaderOptions { /** * The max amount of code points in the input YAML document. Please be aware that byte limit * depends on the encoding. + * * @param codePointLimit - the max allowed size of the YAML data */ public void setCodePointLimit(int codePointLimit) { diff --git a/src/main/java/org/yaml/snakeyaml/Yaml.java b/src/main/java/org/yaml/snakeyaml/Yaml.java index 0cfd2bb2..16114cd9 100644 --- a/src/main/java/org/yaml/snakeyaml/Yaml.java +++ b/src/main/java/org/yaml/snakeyaml/Yaml.java @@ -471,8 +471,8 @@ public class Yaml { } private Object loadFromReader(StreamReader sreader, Class type) { - Composer composer = new Composer(new ParserImpl(sreader, loadingConfig), - resolver, loadingConfig); + Composer composer = + new Composer(new ParserImpl(sreader, loadingConfig), resolver, loadingConfig); constructor.setComposer(composer); return constructor.getSingleData(type); } diff --git a/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java b/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java index 2a87e936..52dd5da8 100644 --- a/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java +++ b/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java @@ -87,6 +87,7 @@ public class Constructor extends SafeConstructor { /** * Create with all possible arguments + * * @param theRoot - the class (usually JavaBean) to be constructed * @param moreTDs - collection of classes used by the root class * @param loadingConfig - configuration diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java index ea154727..b34011c5 100644 --- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java +++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java @@ -98,8 +98,7 @@ public class SafeConstructor extends BaseConstructor { keyNode.setType(String.class); keyNode.setTag(Tag.STR); } else { - throw new YAMLException( - "Keys must be scalars but found: " + keyNode); + throw new YAMLException("Keys must be scalars but found: " + keyNode); } } Object key = constructObject(keyNode); @@ -112,9 +111,8 @@ public class SafeConstructor extends BaseConstructor { try { key.hashCode();// check circular dependencies } catch (Exception e) { - throw new ConstructorException("while constructing a mapping", - node.getStartMark(), "found unacceptable key " + key, - tuple.getKeyNode().getStartMark(), e); + throw new ConstructorException("while constructing a mapping", node.getStartMark(), + "found unacceptable key " + key, tuple.getKeyNode().getStartMark(), e); } } } diff --git a/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java b/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java index e810de85..75c9c15a 100644 --- a/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java +++ b/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java @@ -220,7 +220,7 @@ public final class ScannerImpl implements Scanner { this(reader, new LoaderOptions()); } - public ScannerImpl(StreamReader reader, LoaderOptions options) { + public ScannerImpl(StreamReader reader, LoaderOptions options) { this.parseComments = options.isProcessComments(); this.reader = reader; this.tokens = new ArrayList(100); @@ -232,8 +232,8 @@ public final class ScannerImpl implements Scanner { } /** - * Please use LoaderOptions instead - * Set the scanner to ignore comments or parse them as a CommentToken. + * Please use LoaderOptions instead Set the scanner to ignore comments or parse them as a + * CommentToken. * * @param parseComments true to parse; false to ignore */ @@ -331,8 +331,8 @@ public final class ScannerImpl implements Scanner { */ private void fetchMoreTokens() { if (reader.getIndex() > loaderOptions.getCodePointLimit()) { - throw new YAMLException("The incoming YAML document exceeds the limit: " + - loaderOptions.getCodePointLimit() + " code points."); + throw new YAMLException("The incoming YAML document exceeds the limit: " + + loaderOptions.getCodePointLimit() + " code points."); } // Eat whitespaces and process comments until we reach the next token. scanToNextToken(); @@ -1190,7 +1190,7 @@ public final class ScannerImpl implements Scanner { // whitespace, then this is the start of a plain scalar. return Constant.NULL_BL_T_LINEBR.hasNo(c, "-?:,[]{}#&*!|>'\"%@`") || (Constant.NULL_BL_T_LINEBR.hasNo(reader.peek(1)) - && (c == '-' || (this.flowLevel == 0 && "?:".indexOf(c) != -1))); + && (c == '-' || (this.flowLevel == 0 && "?:".indexOf(c) != -1))); } // Scanners. @@ -1835,7 +1835,7 @@ public final class ScannerImpl implements Scanner { } } // Pass several results back together. - return new Object[]{chunks.toString(), maxIndent, endMark}; + return new Object[] {chunks.toString(), maxIndent, endMark}; } private Object[] scanBlockScalarBreaks(int indent) { @@ -1865,7 +1865,7 @@ public final class ScannerImpl implements Scanner { } } // Return both the assembled intervening string and the end-mark. - return new Object[]{chunks.toString(), endMark}; + return new Object[] {chunks.toString(), endMark}; } /** @@ -2054,7 +2054,7 @@ public final class ScannerImpl implements Scanner { c = reader.peek(length); if (Constant.NULL_BL_T_LINEBR.has(c) || (c == ':' && Constant.NULL_BL_T_LINEBR.has(reader.peek(length + 1), - flowLevel != 0 ? ",[]{}" : "")) + flowLevel != 0 ? ",[]{}" : "")) || (this.flowLevel != 0 && ",?[]{}".indexOf(c) != -1)) { break; } -- cgit v1.2.3