Skip to content

Commit d9298f8

Browse files
committed
minor cleanup on yaml/binary fix from 2.10
1 parent 3c54b6e commit d9298f8

File tree

3 files changed

+4
-38
lines changed

3 files changed

+4
-38
lines changed

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

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ private void _writeScalarBinary(Base64Variant b64variant,
811811
b64variant = Base64Variants.MIME;
812812
}
813813
final String lf = _lf();
814-
String encoded = _base64encode(b64variant, data, lf);
814+
String encoded = b64variant.encode(data, false, lf);
815815
_emitter.emit(new ScalarEvent(null, TAG_BINARY, EXPLICIT_TAGS, encoded,
816816
null, null, STYLE_BASE64));
817817
}
@@ -832,40 +832,6 @@ protected ScalarEvent _scalarEvent(String value, DumperOptions.ScalarStyle style
832832
null, null, style);
833833
}
834834

835-
// // // 26-Feb-2019, tatu: Copied temporarily (for 2.10) from `Base64Variant` to prevent
836-
// // // hard dependency for same minor version
837-
838-
private String _base64encode(final Base64Variant b64v, final byte[] input, final String linefeed)
839-
{
840-
final int inputEnd = input.length;
841-
final StringBuilder sb = new StringBuilder(inputEnd + (inputEnd >> 2) + (inputEnd >> 3));
842-
843-
int chunksBeforeLF = b64v.getMaxLineLength() >> 2;
844-
845-
int inputPtr = 0;
846-
int safeInputEnd = inputEnd-3;
847-
848-
while (inputPtr <= safeInputEnd) {
849-
int b24 = ((int) input[inputPtr++]) << 8;
850-
b24 |= ((int) input[inputPtr++]) & 0xFF;
851-
b24 = (b24 << 8) | (((int) input[inputPtr++]) & 0xFF);
852-
b64v.encodeBase64Chunk(sb, b24);
853-
if (--chunksBeforeLF <= 0) {
854-
sb.append(linefeed);
855-
chunksBeforeLF = b64v.getMaxLineLength() >> 2;
856-
}
857-
}
858-
int inputLeft = inputEnd - inputPtr;
859-
if (inputLeft > 0) {
860-
int b24 = ((int) input[inputPtr++]) << 16;
861-
if (inputLeft == 2) {
862-
b24 |= (((int) input[inputPtr++]) & 0xFF) << 8;
863-
}
864-
b64v.encodeBase64Partial(sb, b24, inputLeft);
865-
}
866-
return sb.toString();
867-
}
868-
869835
protected String _lf() {
870836
return _outputOptions.getLineBreak().getString();
871837
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ public void testReadLongBinary() throws Exception {
5353

5454
ByteArrayOutputStream os = new ByteArrayOutputStream();
5555

56-
try (JsonGenerator gen = MAPPER.getFactory().createGenerator(os)) {
56+
try (JsonGenerator gen = MAPPER.createGenerator(os)) {
5757
gen.writeStartObject();
5858
gen.writeBinaryField("data", data);
5959
gen.writeEndObject();
6060
gen.close();
6161
}
6262

63-
try (JsonParser parser = MAPPER.getFactory().createParser(os.toByteArray())) {
63+
try (JsonParser parser = MAPPER.createParser(os.toByteArray())) {
6464
assertEquals(JsonToken.START_OBJECT, parser.nextToken());
6565
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
6666
assertEquals("data", parser.currentName());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void testWriteLongBinary() throws Exception {
3838

3939
StringWriter w = new StringWriter();
4040

41-
try (JsonGenerator gen = MAPPER.getFactory().createGenerator(w)) {
41+
try (JsonGenerator gen = MAPPER.createGenerator(w)) {
4242
gen.writeStartObject();
4343
gen.writeBinaryField("array", data);
4444
gen.writeEndObject();

0 commit comments

Comments
 (0)