v0.3.1

Author: chenby

src/main/java/com/moilioncircle/redis/rdb/cli/ext/rct/JsonRdbVisitor.java

@@ -28,6 +28,7 @@
 import com.moilioncircle.redis.rdb.cli.ext.datatype.DummyKeyValuePair;
 import com.moilioncircle.redis.rdb.cli.glossary.DataType;
 import com.moilioncircle.redis.rdb.cli.glossary.Escape;
+import com.moilioncircle.redis.rdb.cli.glossary.Escaper;
 import com.moilioncircle.redis.rdb.cli.glossary.JsonEscape;
 import com.moilioncircle.redis.rdb.cli.util.OutputStreams;
 import com.moilioncircle.redis.replicator.Replicator;
@@ -42,21 +43,21 @@
  * @author Baoyi Chen
  */
 public class JsonRdbVisitor extends AbstractRdbVisitor {
-    
+
+    private Escaper escaper;
     private boolean first = true;
     private boolean hasdb = false;
-    private JsonEscape jsonEscape;
     private boolean firstkey = true;
 
     public JsonRdbVisitor(Replicator replicator, Configure configure, File out, List<Long> db, List<String> regexs, List<DataType> types, Escape escape) {
         super(replicator, configure, out, db, regexs, types, escape);
-        this.jsonEscape = new JsonEscape(escape);
+        this.escaper = new JsonEscape(escape);
     }
 
     private void emitZSet(byte[] field, double value) {
         emitString(field);
         OutputStreams.write(':', out);
-        jsonEscape.encode(value, out, configure);
+        escaper.encode(value, out, configure);
     }
 
     private void emitField(byte[] field, byte[] value) {
@@ -67,7 +68,7 @@ private void emitField(byte[] field, byte[] value) {
 
     private void emitString(byte[] str) {
         OutputStreams.write('"', out);
-        jsonEscape.encode(str, out, configure);
+        escaper.encode(str, out, configure);
         OutputStreams.write('"', out);
     }
 
@@ -461,7 +462,7 @@ protected Event doApplyModule(RedisInputStream in, int version, byte[] key, bool
         OutputStreams.write(':', out);
         OutputStreams.write('"', out);
         version = configure.getDumpRdbVersion() == -1 ? version : configure.getDumpRdbVersion();
-        try (DumpRawByteListener listener = new DumpRawByteListener((byte) type, version, out, jsonEscape, configure)) {
+        try (DumpRawByteListener listener = new DumpRawByteListener((byte) type, version, out, escaper, configure)) {
             replicator.addRawByteListener(listener);
             super.doApplyModule(in, version, key, contains, type, context);
             replicator.removeRawByteListener(listener);
@@ -481,7 +482,7 @@ protected Event doApplyModule2(RedisInputStream in, int version, byte[] key, boo
         OutputStreams.write(':', out);
         OutputStreams.write('"', out);
         version = configure.getDumpRdbVersion() == -1 ? version : configure.getDumpRdbVersion();
-        try (DumpRawByteListener listener = new DumpRawByteListener((byte) type, version, out, jsonEscape, configure)) {
+        try (DumpRawByteListener listener = new DumpRawByteListener((byte) type, version, out, escaper, configure)) {
             replicator.addRawByteListener(listener);
             super.doApplyModule2(in, version, key, contains, type, context);
             replicator.removeRawByteListener(listener);
@@ -501,7 +502,7 @@ protected Event doApplyStreamListPacks(RedisInputStream in, int version, byte[]
         OutputStreams.write(':', out);
         OutputStreams.write('"', out);
         version = configure.getDumpRdbVersion() == -1 ? version : configure.getDumpRdbVersion();
-        try (DumpRawByteListener listener = new DumpRawByteListener((byte) type, version, out, jsonEscape, configure)) {
+        try (DumpRawByteListener listener = new DumpRawByteListener((byte) type, version, out, escaper, configure)) {
             replicator.addRawByteListener(listener);
             super.doApplyStreamListPacks(in, version, key, contains, type, context);
             replicator.removeRawByteListener(listener);