psych 5.0.1-java → 5.1.0.pre1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a636a31c1720b2efa0ebf3cef2a8a4d13f93028b0859b3559689ae43f1d6d4
-  data.tar.gz: c243a20bcedab1c7ddbaa9370fd6e643d9abb694422415e07e56d410080228e2
+  metadata.gz: 6e3ca9e0683d2ca342865ab6fa4609d505446db917a5745a30d66aa929970190
+  data.tar.gz: 2519befec441ec3e4a5637ae31db529ebc70985474a257f2699bc5a6169ef8b7
 SHA512:
-  metadata.gz: b69c593028d6a89daa2f390dc70eff0d423c81f180939b7486cc7f8c4d223dacef18047be9b0d012a3eb77b5fe5558d00ca6e139c36d14d2dc509b8bb227b11e
-  data.tar.gz: '06970e06310e2e3ec81522a79117d8244bcdf017c4532a9ff419e13d0d99a0099104ec8566f85b2a16c84e3b1d8c9871c643914410f0430f72c5245d6eea43c4'
+  metadata.gz: '05581e2dbd2f83ccde48d893c1555673b123ba5314589e785f6583c4f89624441d9e2feda37e7b1689ecf78fc9d95272f58a5adc6fddcdf8705f7940c0ad588f'
+  data.tar.gz: '0966f93bd2e9bd437205eed8b1f3bf15a6609db548c7f4aca4328514ce7e26f9aff7aa06ae283870f74cd4935ea75a732b67d92bb85044091819acc411ee7ef8'

data/Mavenfile

@@ -1,6 +1,6 @@
 #-*- mode: ruby -*-
 
-jar 'org.yaml:snakeyaml:${snakeyaml.version}'
+jar 'org.snakeyaml:snakeyaml-engine:${snakeyaml.version}'
 
 plugin :dependency, '2.8', :outputFile => 'pkg/classpath'
 

data/Rakefile

@@ -21,8 +21,8 @@ if RUBY_PLATFORM =~ /java/
     # this is basically the same as running from the commandline:
     # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
     Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')
-    ext.source_version = '1.7'
-    ext.target_version = '1.7'
+    ext.source_version = '1.8'
+    ext.target_version = '1.8'
     ext.classpath = File.read('pkg/classpath')
     ext.ext_dir = 'ext/java'
   end

data/ext/java/org/jruby/ext/psych/PsychEmitter.java

@@ -27,57 +27,59 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.ext.psych;
 
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
-import org.jruby.RubyFixnum;
+import org.jruby.RubyEncoding;
 import org.jruby.RubyModule;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 import org.jruby.util.IOOutputStream;
 import org.jruby.util.TypeConverter;
 import org.jruby.util.io.EncodingUtils;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.emitter.Emitter;
-import org.yaml.snakeyaml.emitter.EmitterException;
-import org.yaml.snakeyaml.error.Mark;
-import org.yaml.snakeyaml.events.AliasEvent;
-import org.yaml.snakeyaml.events.DocumentEndEvent;
-import org.yaml.snakeyaml.events.DocumentStartEvent;
-import org.yaml.snakeyaml.events.Event;
-import org.yaml.snakeyaml.events.ImplicitTuple;
-import org.yaml.snakeyaml.events.MappingEndEvent;
-import org.yaml.snakeyaml.events.MappingStartEvent;
-import org.yaml.snakeyaml.events.ScalarEvent;
-import org.yaml.snakeyaml.events.SequenceEndEvent;
-import org.yaml.snakeyaml.events.SequenceStartEvent;
-import org.yaml.snakeyaml.events.StreamEndEvent;
-import org.yaml.snakeyaml.events.StreamStartEvent;
-
-import static org.jruby.runtime.Visibility.*;
+import org.snakeyaml.engine.v2.api.DumpSettings;
+import org.snakeyaml.engine.v2.api.DumpSettingsBuilder;
+import org.snakeyaml.engine.v2.api.StreamDataWriter;
+import org.snakeyaml.engine.v2.api.YamlOutputStreamWriter;
+import org.snakeyaml.engine.v2.common.Anchor;
+import org.snakeyaml.engine.v2.common.FlowStyle;
+import org.snakeyaml.engine.v2.common.ScalarStyle;
+import org.snakeyaml.engine.v2.common.SpecVersion;
+import org.snakeyaml.engine.v2.emitter.Emitter;
+import org.snakeyaml.engine.v2.events.AliasEvent;
+import org.snakeyaml.engine.v2.events.DocumentEndEvent;
+import org.snakeyaml.engine.v2.events.DocumentStartEvent;
+import org.snakeyaml.engine.v2.events.Event;
+import org.snakeyaml.engine.v2.events.ImplicitTuple;
+import org.snakeyaml.engine.v2.events.MappingEndEvent;
+import org.snakeyaml.engine.v2.events.MappingStartEvent;
+import org.snakeyaml.engine.v2.events.ScalarEvent;
+import org.snakeyaml.engine.v2.events.SequenceEndEvent;
+import org.snakeyaml.engine.v2.events.SequenceStartEvent;
+import org.snakeyaml.engine.v2.events.StreamEndEvent;
+import org.snakeyaml.engine.v2.events.StreamStartEvent;
+import org.snakeyaml.engine.v2.exceptions.EmitterException;
+import org.snakeyaml.engine.v2.exceptions.Mark;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.jruby.runtime.Visibility.PRIVATE;
 
 public class PsychEmitter extends RubyObject {
     public static void initPsychEmitter(Ruby runtime, RubyModule psych) {
         RubyClass psychHandler = runtime.defineClassUnder("Handler", runtime.getObject(), runtime.getObject().getAllocator(), psych);
-        RubyClass psychEmitter = runtime.defineClassUnder("Emitter", psychHandler, new ObjectAllocator() {
-            public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new PsychEmitter(runtime, klazz);
-            }
-        }, psych);
+        RubyClass psychEmitter = runtime.defineClassUnder("Emitter", psychHandler, PsychEmitter::new, psych);
 
         psychEmitter.defineAnnotatedMethods(PsychEmitter.class);
     }
@@ -88,8 +90,7 @@ public class PsychEmitter extends RubyObject {
 
     @JRubyMethod(visibility = PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject io) {
-        options = new DumperOptions();
-        options.setIndent(2);
+        dumpSettingsBuilder.setIndent(2);
 
         this.io = io;
 
@@ -102,10 +103,8 @@ public class PsychEmitter extends RubyObject {
         IRubyObject canonical = rbOptions.callMethod(context, "canonical");
         IRubyObject level     = rbOptions.callMethod(context, "indentation");
 
-        options = new DumperOptions();
-
-        options.setCanonical(canonical.isTrue());
-        options.setIndent((int)level.convertToInteger().getLongValue());
+        dumpSettingsBuilder.setCanonical(canonical.isTrue());
+        dumpSettingsBuilder.setIndent((int)level.convertToInteger().getLongValue());
         line_width_set(context, width);
 
         this.io = io;
@@ -119,47 +118,45 @@ public class PsychEmitter extends RubyObject {
 
         initEmitter(context, encoding);
 
-        StreamStartEvent event = new StreamStartEvent(NULL_MARK, NULL_MARK);
-
-        emit(context, event);
+        emit(context, NULL_STREAM_START_EVENT);
 
         return this;
     }
 
     @JRubyMethod
     public IRubyObject end_stream(ThreadContext context) {
-        StreamEndEvent event = new StreamEndEvent(NULL_MARK, NULL_MARK);
-        emit(context, event);
+        emit(context, NULL_STREAM_START_EVENT);
         return this;
     }
 
     @JRubyMethod
     public IRubyObject start_document(ThreadContext context, IRubyObject _version, IRubyObject tags, IRubyObject implicit) {
-        DumperOptions.Version version = null;
+        Ruby runtime = context.runtime;
+
         boolean implicitBool = implicit.isTrue();
-        Map<String, String> tagsMap = null;
 
-        TypeConverter.checkType(context, _version, context.runtime.getArray());
+        RubyClass arrayClass = runtime.getArray();
+        TypeConverter.checkType(context, _version, arrayClass);
 
         RubyArray versionAry = _version.convertToArray();
+        Optional<SpecVersion> specVersion;
         if (versionAry.size() == 2) {
-            int versionInt0 = (int)versionAry.eltInternal(0).convertToInteger().getLongValue();
-            int versionInt1 = (int)versionAry.eltInternal(1).convertToInteger().getLongValue();
-
-            if (versionInt0 == 1) {
-                if (versionInt1 == 0) {
-                    version = DumperOptions.Version.V1_0;
-                } else if (versionInt1 == 1) {
-                    version = DumperOptions.Version.V1_1;
-                }
-            }
-            if (version == null) {
-                throw context.runtime.newArgumentError("invalid YAML version: " + versionAry);
+            int versionInt0 = versionAry.eltInternal(0).convertToInteger().getIntValue();
+            int versionInt1 = versionAry.eltInternal(1).convertToInteger().getIntValue();
+
+            if (versionInt0 != 1) {
+                throw runtime.newArgumentError("invalid YAML version: " + versionAry);
             }
+
+            specVersion = Optional.of(new SpecVersion(versionInt0, versionInt1));
+        } else {
+            specVersion = Optional.empty();
         }
 
+        Map<String, String> tagsMap = new HashMap<>();
+
         if (!tags.isNil()) {
-            TypeConverter.checkType(context, tags, context.runtime.getArray());
+            TypeConverter.checkType(context, tags, arrayClass);
 
             RubyArray tagsAry = tags.convertToArray();
             if (tagsAry.size() > 0) {
@@ -167,7 +164,7 @@ public class PsychEmitter extends RubyObject {
                 for (int i = 0; i < tagsAry.size(); i++) {
                     RubyArray tagsTuple = tagsAry.eltInternal(i).convertToArray();
                     if (tagsTuple.size() != 2) {
-                        throw context.runtime.newRuntimeError("tags tuple must be of length 2");
+                        throw runtime.newRuntimeError("tags tuple must be of length 2");
                     }
                     IRubyObject key = tagsTuple.eltInternal(0);
                     IRubyObject value = tagsTuple.eltInternal(1);
@@ -178,14 +175,14 @@ public class PsychEmitter extends RubyObject {
             }
         }
 
-        DocumentStartEvent event = new DocumentStartEvent(NULL_MARK, NULL_MARK, !implicitBool, version, tagsMap);
+        DocumentStartEvent event = new DocumentStartEvent(!implicitBool, specVersion, tagsMap, NULL_MARK, NULL_MARK);
         emit(context, event);
         return this;
     }
 
     @JRubyMethod
     public IRubyObject end_document(ThreadContext context, IRubyObject implicit) {
-        DocumentEndEvent event = new DocumentEndEvent(NULL_MARK, NULL_MARK, !implicit.isTrue());
+        DocumentEndEvent event = new DocumentEndEvent(!implicit.isTrue(), NULL_MARK, NULL_MARK);
         emit(context, event);
         return this;
     }
@@ -207,17 +204,17 @@ public class PsychEmitter extends RubyObject {
 
         valueStr = EncodingUtils.strConvEnc(context, valueStr, valueStr.getEncoding(), UTF8Encoding.INSTANCE);
 
-        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
-        RubyString tagStr = exportToUTF8(context, tag, stringClass);
+        String anchorStr = exportToUTF8(context, anchor, stringClass);
+        String tagStr = exportToUTF8(context, tag, stringClass);
 
         ScalarEvent event = new ScalarEvent(
-                anchorStr == null ? null : anchorStr.asJavaString(),
-                tagStr == null ? null : tagStr.asJavaString(),
+                Optional.ofNullable(anchorStr == null ? null : new Anchor(anchorStr)),
+                Optional.ofNullable(tagStr),
                 new ImplicitTuple(plain.isTrue(), quoted.isTrue()),
                 valueStr.asJavaString(),
+                SCALAR_STYLES[style.convertToInteger().getIntValue()],
                 NULL_MARK,
-                NULL_MARK,
-                SCALAR_STYLES[style.convertToInteger().getIntValue()]);
+                NULL_MARK);
 
         emit(context, event);
 
@@ -233,16 +230,16 @@ public class PsychEmitter extends RubyObject {
 
         RubyClass stringClass = context.runtime.getString();
 
-        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
-        RubyString tagStr = exportToUTF8(context, tag, stringClass);
+        String anchorStr = exportToUTF8(context, anchor, stringClass);
+        String tagStr = exportToUTF8(context, tag, stringClass);
 
         SequenceStartEvent event = new SequenceStartEvent(
-                anchorStr == null ? null : anchorStr.asJavaString(),
-                tagStr == null ? null : tagStr.asJavaString(),
+                Optional.ofNullable(anchorStr == null ? null : new Anchor(anchorStr)),
+                Optional.ofNullable(tagStr),
                 implicit.isTrue(),
+                FLOW_STYLES[style.convertToInteger().getIntValue()],
                 NULL_MARK,
-                NULL_MARK,
-                FLOW_STYLES[style.convertToInteger().getIntValue()]);
+                NULL_MARK);
         emit(context, event);
         return this;
     }
@@ -263,16 +260,16 @@ public class PsychEmitter extends RubyObject {
 
         RubyClass stringClass = context.runtime.getString();
 
-        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
-        RubyString tagStr = exportToUTF8(context, tag, stringClass);
+        String anchorStr = exportToUTF8(context, anchor, stringClass);
+        String tagStr = exportToUTF8(context, tag, stringClass);
 
         MappingStartEvent event = new MappingStartEvent(
-                anchorStr == null ? null : anchorStr.asJavaString(),
-                tagStr == null ? null : tagStr.asJavaString(),
+                Optional.ofNullable(anchorStr == null ? null : new Anchor(anchorStr)),
+                Optional.ofNullable(tagStr),
                 implicit.isTrue(),
+                FLOW_STYLES[style.convertToInteger().getIntValue()],
                 NULL_MARK,
-                NULL_MARK,
-                FLOW_STYLES[style.convertToInteger().getIntValue()]);
+                NULL_MARK);
 
         emit(context, event);
 
@@ -290,9 +287,9 @@ public class PsychEmitter extends RubyObject {
     public IRubyObject alias(ThreadContext context, IRubyObject anchor) {
         RubyClass stringClass = context.runtime.getString();
 
-        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
+        String anchorStr = exportToUTF8(context, anchor, stringClass);
 
-        AliasEvent event = new AliasEvent(anchorStr.asJavaString(), NULL_MARK, NULL_MARK);
+        AliasEvent event = new AliasEvent(Optional.of(new Anchor(anchorStr)), NULL_MARK, NULL_MARK);
         emit(context, event);
         return this;
     }
@@ -300,40 +297,40 @@ public class PsychEmitter extends RubyObject {
     @JRubyMethod(name = "canonical=")
     public IRubyObject canonical_set(ThreadContext context, IRubyObject canonical) {
         // TODO: unclear if this affects a running emitter
-        options.setCanonical(canonical.isTrue());
+        dumpSettingsBuilder.setCanonical(canonical.isTrue());
         return canonical;
     }
 
     @JRubyMethod
     public IRubyObject canonical(ThreadContext context) {
         // TODO: unclear if this affects a running emitter
-        return RubyBoolean.newBoolean(context, options.isCanonical());
+        return RubyBoolean.newBoolean(context, buildDumpSettings().isCanonical());
     }
 
     @JRubyMethod(name = "indentation=")
     public IRubyObject indentation_set(ThreadContext context, IRubyObject level) {
         // TODO: unclear if this affects a running emitter
-        options.setIndent((int)level.convertToInteger().getLongValue());
+        dumpSettingsBuilder.setIndent(level.convertToInteger().getIntValue());
         return level;
     }
 
     @JRubyMethod
     public IRubyObject indentation(ThreadContext context) {
         // TODO: unclear if this affects a running emitter
-        return context.runtime.newFixnum(options.getIndent());
+        return context.runtime.newFixnum(buildDumpSettings().getIndent());
     }
 
     @JRubyMethod(name = "line_width=")
     public IRubyObject line_width_set(ThreadContext context, IRubyObject width) {
-        int newWidth = (int)width.convertToInteger().getLongValue();
+        int newWidth = width.convertToInteger().getIntValue();
         if (newWidth <= 0) newWidth = Integer.MAX_VALUE;
-        options.setWidth(newWidth);
+        dumpSettingsBuilder.setWidth(newWidth);
         return width;
     }
 
     @JRubyMethod
     public IRubyObject line_width(ThreadContext context) {
-        return context.runtime.newFixnum(options.getWidth());
+        return context.runtime.newFixnum(buildDumpSettings().getWidth());
     }
 
     private void emit(ThreadContext context, Event event) {
@@ -344,8 +341,6 @@ public class PsychEmitter extends RubyObject {
 
             // flush writer after each emit
             writer.flush();
-        } catch (IOException ioe) {
-            throw context.runtime.newIOErrorFromException(ioe);
         } catch (EmitterException ee) {
             throw context.runtime.newRuntimeError(ee.toString());
         }
@@ -357,41 +352,55 @@ public class PsychEmitter extends RubyObject {
         Encoding encoding = PsychLibrary.YAMLEncoding.values()[(int)_encoding.convertToInteger().getLongValue()].encoding;
         Charset charset = context.runtime.getEncodingService().charsetForEncoding(encoding);
 
-        writer = new OutputStreamWriter(new IOOutputStream(io, encoding), charset);
-        emitter = new Emitter(writer, options);
+        writer = new YamlOutputStreamWriter(new IOOutputStream(io, encoding), charset) {
+            @Override
+            public void processIOException(IOException ioe) {
+                throw context.runtime.newIOErrorFromException(ioe);
+            }
+        };
+        emitter = new Emitter(buildDumpSettings(), writer);
+    }
+
+    private DumpSettings buildDumpSettings() {
+        return dumpSettingsBuilder.build();
     }
 
-    private RubyString exportToUTF8(ThreadContext context, IRubyObject tag, RubyClass stringClass) {
-        RubyString tagStr = null;
-        if (!tag.isNil()) {
-            TypeConverter.checkType(context, tag, stringClass);
-            tagStr = (RubyString) tag;
-            tagStr = EncodingUtils.strConvEnc(context, tagStr, tagStr.getEncoding(), UTF8Encoding.INSTANCE);
+    private String exportToUTF8(ThreadContext context, IRubyObject maybeString, RubyClass stringClass) {
+        if (maybeString.isNil()) {
+            return null;
         }
-        return tagStr;
+
+        RubyString string;
+
+        TypeConverter.checkType(context, maybeString, stringClass);
+        string = (RubyString) maybeString;
+        ByteList bytes = string.getByteList();
+
+        return RubyEncoding.decodeUTF8(bytes.unsafeBytes(), bytes.begin(), bytes.realSize());
     }
 
     Emitter emitter;
-    Writer writer;
-    DumperOptions options = new DumperOptions();
+    StreamDataWriter writer;
+    final DumpSettingsBuilder dumpSettingsBuilder = DumpSettings.builder();
     IRubyObject io;
 
-    private static final Mark NULL_MARK = new Mark("", 0, 0, 0, new int[0], 0);
+    private static final Optional<Mark> NULL_MARK = Optional.empty();
+    private static final StreamStartEvent NULL_STREAM_START_EVENT = new StreamStartEvent(NULL_MARK, NULL_MARK);
 
     // Map style constants from Psych values (ANY = 0 ... FOLDED = 5)
     // to SnakeYaml values; see psych/nodes/scalar.rb.
-    private static final DumperOptions.ScalarStyle[] SCALAR_STYLES = {
-            DumperOptions.ScalarStyle.PLAIN, // ANY
-            DumperOptions.ScalarStyle.PLAIN,
-            DumperOptions.ScalarStyle.SINGLE_QUOTED,
-            DumperOptions.ScalarStyle.DOUBLE_QUOTED,
-            DumperOptions.ScalarStyle.LITERAL,
-            DumperOptions.ScalarStyle.FOLDED
+    private static final ScalarStyle[] SCALAR_STYLES = {
+            ScalarStyle.PLAIN, // ANY
+            ScalarStyle.PLAIN,
+            ScalarStyle.SINGLE_QUOTED,
+            ScalarStyle.DOUBLE_QUOTED,
+            ScalarStyle.LITERAL,
+            ScalarStyle.FOLDED
     };
 
-    private static final DumperOptions.FlowStyle[] FLOW_STYLES = {
-            DumperOptions.FlowStyle.AUTO,
-            DumperOptions.FlowStyle.BLOCK,
-            DumperOptions.FlowStyle.FLOW
+    private static final FlowStyle[] FLOW_STYLES = {
+            FlowStyle.AUTO,
+            FlowStyle.BLOCK,
+            FlowStyle.FLOW
     };
 }

data/ext/java/org/jruby/ext/psych/PsychLibrary.java

@@ -27,10 +27,6 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.ext.psych;
 
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Properties;
-
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF16BEEncoding;
 import org.jcodings.specific.UTF16LEEncoding;
@@ -44,7 +40,10 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.Library;
-import org.yaml.snakeyaml.error.Mark;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 public class PsychLibrary implements Library {
     private static final String DUMMY_VERSION = "0.0";
@@ -54,7 +53,7 @@ public class PsychLibrary implements Library {
 
         // load version from properties packed with the jar
         Properties props = new Properties();
-        try( InputStream is = runtime.getJRubyClassLoader().getResourceAsStream("META-INF/maven/org.yaml/snakeyaml/pom.properties") ) {
+        try( InputStream is = runtime.getJRubyClassLoader().getResourceAsStream("META-INF/maven/org.snakeyaml/snakeyaml-engine/pom.properties") ) {
             props.load(is);
         }
         catch( IOException e ) {
@@ -66,27 +65,6 @@ public class PsychLibrary implements Library {
             snakeyamlVersion = snakeyamlVersion.substring(0, snakeyamlVersion.length() - "-SNAPSHOT".length());
         }
 
-        // Try to determine if we have a new enough SnakeYAML.
-        // Versions before 1.21 removed a Mark constructor that JRuby uses.
-        // See https://github.com/bundler/bundler/issues/6878
-        if (snakeyamlVersion.equals(DUMMY_VERSION)) {
-            try {
-                // Use reflection to try to confirm we have a new enough version
-                Mark.class.getConstructor(String.class, int.class, int.class, int.class, int[].class, int.class);
-            } catch (NoSuchMethodException nsme) {
-                throw runtime.newLoadError("bad SnakeYAML version, required 1.21 or higher; check your CLASSPATH for a conflicting jar");
-            }
-        } else {
-            // Parse version string to check for 1.21+
-            String[] majorMinor = snakeyamlVersion.split("\\.");
-
-            if (majorMinor.length < 2 || Integer.parseInt(majorMinor[0]) < 1 || Integer.parseInt(majorMinor[1]) < 21) {
-                throw runtime.newLoadError(
-                        "bad SnakeYAML version " + snakeyamlVersion +
-                                ", required 1.21 or higher; check your CLASSPATH for a conflicting jar");
-            }
-        }
-
         RubyString version = runtime.newString(snakeyamlVersion + ".0");
         version.setFrozen(true);
         psych.setConstant("SNAKEYAML_VERSION", version);
@@ -105,7 +83,6 @@ public class PsychLibrary implements Library {
         PsychParser.initPsychParser(runtime, psych);
         PsychEmitter.initPsychEmitter(runtime, psych);
         PsychToRuby.initPsychToRuby(runtime, psych);
-        PsychYamlTree.initPsychYamlTree(runtime, psych);
     }
 
     public enum YAMLEncoding {