Skip to content

FilteringGeneratorDelegate.writeUTF8String() should delegate to writeUTF8String() #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2016
Merged

FilteringGeneratorDelegate.writeUTF8String() should delegate to writeUTF8String() #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/fasterxml/jackson/core/filter/FilteringGeneratorDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public void writeUTF8String(byte[] text, int offset, int length) throws IOExcept
{
// not exact match, but best we can do
if (_checkRawValueWrite()) {
delegate.writeRawUTF8String(text, offset, length);
delegate.writeUTF8String(text, offset, length);
}
}

Expand Down
60 changes: 57 additions & 3 deletions src/test/java/com/fasterxml/jackson/core/json/TestUtf8Generator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
package com.fasterxml.jackson.core.json;

import java.io.*;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.BaseTest;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.filter.FilteringGeneratorDelegate;
import com.fasterxml.jackson.core.filter.JsonPointerBasedFilter;
import com.fasterxml.jackson.core.io.CharTypes;
import com.fasterxml.jackson.core.io.IOContext;
import com.fasterxml.jackson.core.util.BufferRecycler;

import java.io.ByteArrayOutputStream;

public class TestUtf8Generator extends BaseTest
{
private final JsonFactory JSON_F = new JsonFactory();
Expand Down Expand Up @@ -60,4 +67,51 @@ public void testSurrogatesWithRaw() throws Exception
assertToken(JsonToken.END_ARRAY, jp.nextToken());
jp.close();
}

public void testFilteringWithEscapedChars() throws Exception
{
final String SAMPLE_WITH_QUOTES = "\b\t\f\n\r\"foo\"\u0000";

ByteArrayOutputStream out = new ByteArrayOutputStream();
JsonGenerator jgen = JSON_F.createGenerator(out);

FilteringGeneratorDelegate gen = new FilteringGeneratorDelegate(jgen,
new JsonPointerBasedFilter("/escapes"),
true, // includePath
false // multipleMatches
);

//final String JSON = "{'a':123,'array':[1,2],'escapes':'\b\t\f\n\r\"foo\"\u0000'}";

gen.writeStartObject();

gen.writeFieldName("a");
gen.writeNumber((int) 123);

gen.writeFieldName("array");
gen.writeStartArray();
gen.writeNumber((short) 1);
gen.writeNumber((short) 2);
gen.writeEndArray();

gen.writeFieldName("escapes");

final byte[] raw = SAMPLE_WITH_QUOTES.toString().getBytes("UTF-8");
gen.writeUTF8String(raw, 0, raw.length);

gen.writeEndObject();
gen.close();

JsonParser p = JSON_F.createParser(out.toByteArray());

assertToken(JsonToken.START_OBJECT, p.nextToken());
assertToken(JsonToken.FIELD_NAME, p.nextToken());
assertEquals("escapes", p.getCurrentName());

assertToken(JsonToken.VALUE_STRING, p.nextToken());
assertEquals(SAMPLE_WITH_QUOTES, p.getText());
assertToken(JsonToken.END_OBJECT, p.nextToken());
assertNull(p.nextToken());
p.close();
}
}