Skip to content

Commit a43a92d

Browse files
committed
removed escaping forward slash
1 parent 9f8af12 commit a43a92d

File tree

3 files changed

+8
-31
lines changed

3 files changed

+8
-31
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
66

77
## [Unreleased]
88

9+
- removed escaping forward slash in `VPackParser`
10+
911
## [2.4.1] - 2020-08-14
1012

1113
- fixed base64 encoding for Java version >= 9

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.arangodb</groupId>
66
<artifactId>velocypack</artifactId>
7-
<version>2.4.1</version>
7+
<version>2.4.2-SNAPSHOT</version>
88
<inceptionYear>2017</inceptionYear>
99
<packaging>jar</packaging>
1010

src/main/java/com/arangodb/velocypack/VPackParser.java

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
import com.arangodb.velocypack.exception.VPackBuilderException;
2424
import com.arangodb.velocypack.exception.VPackException;
2525
import com.arangodb.velocypack.internal.util.DateUtil;
26-
import com.fasterxml.jackson.core.*;
27-
import com.fasterxml.jackson.core.io.CharacterEscapes;
28-
import com.fasterxml.jackson.core.io.SerializedString;
26+
import com.fasterxml.jackson.core.JsonFactory;
27+
import com.fasterxml.jackson.core.JsonGenerator;
28+
import com.fasterxml.jackson.core.JsonParser;
29+
import com.fasterxml.jackson.core.JsonToken;
2930

3031
import java.io.IOException;
3132
import java.io.StringWriter;
@@ -452,8 +453,7 @@ private void parseValue(final VPackBuilder builder, final String fieldName, fina
452453
public static String toJSONString(final String text) {
453454
final StringWriter writer = new StringWriter();
454455
try {
455-
final JsonGenerator generator = new JsonFactory().setCharacterEscapes(new CustomCharacterEscapes())
456-
.createGenerator(writer);
456+
final JsonGenerator generator = new JsonFactory().createGenerator(writer);
457457
generator.writeString(text);
458458
generator.close();
459459
} catch (final IOException e) {
@@ -462,29 +462,4 @@ public static String toJSONString(final String text) {
462462
return writer.toString();
463463
}
464464

465-
static class CustomCharacterEscapes extends CharacterEscapes {
466-
467-
private static final long serialVersionUID = -1774622969327286211L;
468-
private static final SerializedString escapeSlash = new SerializedString("\\/");
469-
private final int[] _asciiEscapes;
470-
471-
public CustomCharacterEscapes() {
472-
_asciiEscapes = standardAsciiEscapesForJSON();
473-
_asciiEscapes['/'] = CharacterEscapes.ESCAPE_CUSTOM;
474-
}
475-
476-
@Override
477-
public int[] getEscapeCodesForAscii() {
478-
return _asciiEscapes;
479-
}
480-
481-
@Override
482-
public SerializableString getEscapeSequence(final int i) {
483-
if (i == 47) {
484-
return escapeSlash;
485-
}
486-
return null;
487-
}
488-
}
489-
490465
}

0 commit comments

Comments
 (0)