From 745f52d932ba2da308a99f6d1efbd095092a4efc Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Fri, 10 Jul 2020 09:44:25 -0700
Subject: [PATCH] Update snakeyaml to 1.26, cleanup

---
 toolbelt-snakeyaml/build.gradle                        |  2 +-
 .../toolbelt/format/yaml/snakeyaml/YamlFormatter.java  | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/toolbelt-snakeyaml/build.gradle b/toolbelt-snakeyaml/build.gradle
index 52e1176..74d013d 100644
--- 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/toolbelt-snakeyaml/src/main/java/org/rundeck/toolbelt/format/yaml/snakeyaml/YamlFormatter.java b/toolbelt-snakeyaml/src/main/java/org/rundeck/toolbelt/format/yaml/snakeyaml/YamlFormatter.java
index deb78bf..2a488f8 100644
--- a/toolbelt-snakeyaml/src/main/java/org/rundeck/toolbelt/format/yaml/snakeyaml/YamlFormatter.java
+++ b/toolbelt-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(