Merge pull request #21 from rundeck/upgrade/snakeyaml-1.26

Update snakeyaml to 1.26, cleanup
rundeck · Jul 10, 2020 · 6741279 · 6741279
2 parents 5600b85 + 745f52d
commit 6741279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/toolbelt-snakeyaml/build.gradle b/toolbelt-snakeyaml/build.gradle
@@ -5,7 +5,7 @@ repositories {
 }
 
 dependencies {
-    api 'org.yaml:snakeyaml:1.9'
+    api 'org.yaml:snakeyaml:1.26'
     api project(":toolbelt")
     testImplementation group: 'junit', name: 'junit', version: '4.11'
 }
diff --git a/...elt-snakeyaml/src/main/java/org/rundeck/toolbelt/format/yaml/snakeyaml/YamlFormatter.java b/...elt-snakeyaml/src/main/java/org/rundeck/toolbelt/format/yaml/snakeyaml/YamlFormatter.java
@@ -17,9 +17,7 @@
  * formatter will be used
  */
 public class YamlFormatter extends BaseDataOutputFormatter {
-    private Yaml yaml;
-
-
+    private final Yaml yaml;
     /**
      */
     public YamlFormatter() {
@@ -29,8 +27,7 @@ public YamlFormatter() {
     /**
      */
     public YamlFormatter(Representer representer, DumperOptions options) {
-        super(new ToStringFormatter());
-        this.yaml = new Yaml(representer, options);
+        this(new Yaml(representer, options), new ToStringFormatter());
     }
 
     public YamlFormatter(
@@ -46,8 +43,7 @@ public YamlFormatter(
      * @param base base formatter
      */
     public YamlFormatter(final OutputFormatter base) {
-        super(base);
-        this.yaml = new Yaml();
+        this(new Yaml(), base);
     }
 
     public YamlFormatter(