Merge branch '2.9'

Author: cowtowncoder

release-notes/VERSION

@@ -8,9 +8,14 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.4 (not yet released)
+
+#62: SnakeYAML base64Coder is not OSGI exported
+ (reported by mbechler@github)
+
 2.9.3 (09-Dec-2017)
 
-#39 (yamk): Binary data not recognized by YAML parser
+#39 (yaml): Binary data not recognized by YAML parser
  (repoted by tmoschou@github)
 #42 (csv): Add support for escaping double quotes with the configured escape character
  (contributed by frankgrimes97@github)

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java

@@ -12,7 +12,6 @@
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
 import org.yaml.snakeyaml.emitter.Emitter;
 import org.yaml.snakeyaml.events.*;
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 import org.yaml.snakeyaml.nodes.Tag;
 
 import com.fasterxml.jackson.core.*;
@@ -600,7 +599,7 @@ public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int l
         if (offset > 0 || (offset+len) != data.length) {
             data = Arrays.copyOfRange(data, offset, offset+len);
         }
-        _writeScalarBinary(data);
+        _writeScalarBinary(b64variant, data);
     }
 
     /*
@@ -774,10 +773,15 @@ protected void _writeScalar(String value, String type, Character style) throws I
         _emitter.emit(_scalarEvent(value, style));
     }
 
-    private void _writeScalarBinary(byte[] data) throws IOException
+    private void _writeScalarBinary(Base64Variant b64variant,
+            byte[] data) throws IOException
     {
-        // 29-Nov-2017, tatu: Use SnakeYAML encoder instead of Jackson's
-        String encoded = Base64Coder.encodeLines(data);
+        // 15-Dec-2017, tatu: as per [dataformats-text#62], can not use SnakeYAML's internal
+        //    codec. Also: force use of linefeed variant if using default
+        if (b64variant == Base64Variants.getDefaultVariant()) {
+            b64variant = Base64Variants.MIME;
+        }
+        String encoded = b64variant.encode(data);
         _emitter.emit(new ScalarEvent(null, TAG_BINARY, EXPLICIT_TAGS, encoded,
                 null, null, STYLE_BASE64));
     }

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java

@@ -7,7 +7,6 @@
 
 import org.yaml.snakeyaml.error.Mark;
 import org.yaml.snakeyaml.events.*;
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 import org.yaml.snakeyaml.nodes.NodeId;
 import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.parser.ParserImpl;
@@ -458,10 +457,16 @@ protected JsonToken _decodeScalar(ScalarEvent scalar) throws IOException
             }
             // [dataformats-text#39]: support binary type
             if ("binary".equals(typeTag)) {
-                // 29-Nov-2017, tatu: two choices for base64 codecs (or 3 with Java 8):
-                //   Jackson's own or SnakeYAML. Former is faster, but maybe makes sense
-                //   to use latter for sake of consistency.
-                _binaryValue = Base64Coder.decodeLines(value);
+                // 15-Dec-2017, tatu: 2.9.4 uses Jackson's codec because SnakeYAML does
+                //    not export its codec via OSGi (breaking 2.9.3). Note that trailing
+                //    whitespace is ok with core 2.9.4, but not earlier, so we'll trim
+                //    on purpose here
+                value = value.trim();
+                try {
+                    _binaryValue = Base64Variants.MIME.decode(value);
+                } catch (IllegalArgumentException e) {
+                    _reportError(e.getMessage());
+                }
                 return JsonToken.VALUE_EMBEDDED_OBJECT;
             }
             // canonical values by YAML are actually 'y' and 'n'; but plenty more unofficial:

yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/BinaryReadTest.java

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.yaml.deser;
 
+import java.io.IOException;
 import java.util.Arrays;
 
 import org.junit.Assert;
@@ -14,16 +15,21 @@ public class BinaryReadTest extends ModuleTestBase
 
     public void testBinaryViaTree() throws Exception
     {
-        final String BASE64 = " R0lGODlhDAAMAIQAAP//9/X\n"
-+" 17unp5WZmZgAAAOfn515eXv\n"
-+" Pz7Y6OjuDg4J+fn5OTk6enp\n"
-+" 56enmleECcgggoBADs=";
+        final String BASE64 = " R0lGODlhDAAMAIQAAP//9/X1\n"
++" 7unp5WZmZgAAAOfn515eXvPz\n"
++" 7Y6OjuDg4J+fn5OTk6enp56e\n"
++" nmleECcgggoBADs=";
         final String DOC = String.format(
 "---\n"
 +"picture: !!binary |\n"
 +"%s\n", BASE64);
-        
-        final JsonNode bean = MAPPER.readTree(DOC);
+
+        JsonNode bean = null;
+        try {
+            bean = MAPPER.readTree(DOC);
+        } catch (IOException e) {
+            fail("Should have decoded properly, instead got "+e);
+        }
         final JsonNode picture = bean.get("picture");
         assertNotNull(picture);
 

yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/ser/DatabindWriteTest.java

@@ -33,7 +33,14 @@ public void testBasicPOJO() throws Exception
         assertEquals("firstName: \"Bob\"", it.next());
         assertEquals("gender: \"MALE\"", it.next());
         assertEquals("lastName: \"Dabolito\"", it.next());
-        assertEquals("userImage: !!binary |", it.next());
+        // 15-Dec-2017, tatu: different linefeed modes, see f.ex:
+        //    https://stackoverflow.com/questions/3790454/in-yaml-how-do-i-break-a-string-over-multiple-lines
+        String line = it.next();
+        String expLine = "userImage: !!binary |";
+        if (line.endsWith("|-")) {
+            expLine += "-";
+        }
+        assertEquals(expLine, line);
         assertEquals("verified: false", it.next());
         assertFalse(it.hasNext());
     }