Refactored Internals

src/main/java/com/rethinkdb/RethinkDB.java

@@ -17,47 +17,11 @@ public class RethinkDB extends TopLevel {
      * The Singleton to use to begin interacting with RethinkDB Driver
      */
     public static final RethinkDB r = new RethinkDB();
-
-    /**
-     * Jackson's {@link ObjectMapper} for internal JSON handling from and to RethinkDB's internals.
-     */
-    private static ObjectMapper internalMapper;
     /**
      * Jackson's {@link ObjectMapper} for handling {@link com.rethinkdb.net.Result}'s values.
      */
     private static ObjectMapper resultMapper;
 
-    /**
-     * Gets (or creates, if null) the {@link ObjectMapper} for internal JSON handling from and to RethinkDB's internals.
-     * <br><br>
-     * <b>WARNING:If you're trying to get or configure the {@link com.rethinkdb.net.Result}'s mapper,
-     * use {@link RethinkDB#getResultMapper()} instead.</b>
-     *
-     * @return the internal {@link ObjectMapper}
-     */
-    public synchronized static @NotNull ObjectMapper getInternalMapper() {
-        ObjectMapper mapper = internalMapper;
-        if (mapper == null) {
-            mapper = new ObjectMapper()
-                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-                .enable(DeserializationFeature.USE_LONG_FOR_INTS);
-            internalMapper = mapper;
-        }
-        return mapper;
-    }
-
-    /**
-     * Sets the {@link ObjectMapper} for internal JSON handling from and to RethinkDB's internals.
-     * <br><br>
-     * <b>WARNING:If you're trying to set the {@link com.rethinkdb.net.Result}'s mapper,
-     * use {@link RethinkDB#setResultMapper(ObjectMapper)} instead.</b>
-     *
-     * @param mapper an {@link ObjectMapper}, or null
-     */
-    public synchronized static void setInternalMapper(@Nullable ObjectMapper mapper) {
-        internalMapper = mapper;
-    }
-
     /**
      * Gets (or creates, if null) the {@link ObjectMapper} for handling {@link com.rethinkdb.net.Result}'s values.
      *

src/main/java/com/rethinkdb/ast/Query.java

@@ -4,6 +4,7 @@
 import com.rethinkdb.gen.exc.ReqlRuntimeError;
 import com.rethinkdb.gen.proto.QueryType;
 import com.rethinkdb.model.OptArgs;
+import com.rethinkdb.utils.Internals;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +50,7 @@ public ByteBuffer serialize() {
             if (!globalOptions.isEmpty()) {
                 list.add(ReqlAst.buildOptarg(globalOptions));
             }
-            String json = RethinkDB.getInternalMapper().writeValueAsString(list);
+            String json = Internals.getInternalMapper().writeValueAsString(list);
             byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
             ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES + Integer.BYTES + bytes.length)
                 .order(ByteOrder.LITTLE_ENDIAN)

src/main/java/com/rethinkdb/gen/ast/Add.java

@@ -16,7 +16,7 @@ public class Add extends ReqlExpr {
     public Add(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Add(Arguments args){
+    public Add(Arguments args) {
         this(args, null);
     }
     public Add(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/And.java

@@ -16,7 +16,7 @@ public class And extends ReqlExpr {
     public And(Object arg) {
         this(new Arguments(arg), null);
     }
-    public And(Arguments args){
+    public And(Arguments args) {
         this(args, null);
     }
     public And(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Append.java

@@ -16,7 +16,7 @@ public class Append extends ReqlExpr {
     public Append(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Append(Arguments args){
+    public Append(Arguments args) {
         this(args, null);
     }
     public Append(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/April.java

@@ -16,7 +16,7 @@ public class April extends ReqlExpr {
     public April(Object arg) {
         this(new Arguments(arg), null);
     }
-    public April(Arguments args){
+    public April(Arguments args) {
         this(args, null);
     }
     public April(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Args.java

@@ -16,7 +16,7 @@ public class Args extends ReqlExpr {
     public Args(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Args(Arguments args){
+    public Args(Arguments args) {
         this(args, null);
     }
     public Args(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Asc.java

@@ -16,7 +16,7 @@ public class Asc extends ReqlExpr {
     public Asc(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Asc(Arguments args){
+    public Asc(Arguments args) {
         this(args, null);
     }
     public Asc(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/August.java

@@ -16,7 +16,7 @@ public class August extends ReqlExpr {
     public August(Object arg) {
         this(new Arguments(arg), null);
     }
-    public August(Arguments args){
+    public August(Arguments args) {
         this(args, null);
     }
     public August(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Avg.java

@@ -16,7 +16,7 @@ public class Avg extends ReqlExpr {
     public Avg(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Avg(Arguments args){
+    public Avg(Arguments args) {
         this(args, null);
     }
     public Avg(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Between.java

@@ -16,7 +16,7 @@ public class Between extends ReqlExpr {
     public Between(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Between(Arguments args){
+    public Between(Arguments args) {
         this(args, null);
     }
     public Between(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Binary.java

@@ -11,7 +11,7 @@
 import com.rethinkdb.model.OptArgs;
 import com.rethinkdb.ast.ReqlAst;
 
-import com.rethinkdb.net.Converter;
+import com.rethinkdb.utils.Internals;
 import org.jetbrains.annotations.Nullable;
 
 public class Binary extends ReqlExpr {
@@ -38,8 +38,8 @@ protected Binary(TermType termType, Arguments args, OptArgs optargs) {
     @Override
     public Object build(){
         if (binaryData != null) {
-            return Converter.toBinary(binaryData);
-        }else{
+            return Internals.asBinaryPseudotype(binaryData);
+        } else {
             return super.build();
         }
     }

src/main/java/com/rethinkdb/gen/ast/BitAnd.java

@@ -16,7 +16,7 @@ public class BitAnd extends ReqlExpr {
     public BitAnd(Object arg) {
         this(new Arguments(arg), null);
     }
-    public BitAnd(Arguments args){
+    public BitAnd(Arguments args) {
         this(args, null);
     }
     public BitAnd(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/BitNot.java

@@ -16,7 +16,7 @@ public class BitNot extends ReqlExpr {
     public BitNot(Object arg) {
         this(new Arguments(arg), null);
     }
-    public BitNot(Arguments args){
+    public BitNot(Arguments args) {
         this(args, null);
     }
     public BitNot(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/BitOr.java

@@ -16,7 +16,7 @@ public class BitOr extends ReqlExpr {
     public BitOr(Object arg) {
         this(new Arguments(arg), null);
     }
-    public BitOr(Arguments args){
+    public BitOr(Arguments args) {
         this(args, null);
     }
     public BitOr(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/BitSal.java

@@ -16,7 +16,7 @@ public class BitSal extends ReqlExpr {
     public BitSal(Object arg) {
         this(new Arguments(arg), null);
     }
-    public BitSal(Arguments args){
+    public BitSal(Arguments args) {
         this(args, null);
     }
     public BitSal(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/BitSar.java

@@ -16,7 +16,7 @@ public class BitSar extends ReqlExpr {
     public BitSar(Object arg) {
         this(new Arguments(arg), null);
     }
-    public BitSar(Arguments args){
+    public BitSar(Arguments args) {
         this(args, null);
     }
     public BitSar(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/BitXor.java

@@ -16,7 +16,7 @@ public class BitXor extends ReqlExpr {
     public BitXor(Object arg) {
         this(new Arguments(arg), null);
     }
-    public BitXor(Arguments args){
+    public BitXor(Arguments args) {
         this(args, null);
     }
     public BitXor(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Bracket.java

@@ -16,7 +16,7 @@ public class Bracket extends ReqlExpr {
     public Bracket(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Bracket(Arguments args){
+    public Bracket(Arguments args) {
         this(args, null);
     }
     public Bracket(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Branch.java

@@ -16,7 +16,7 @@ public class Branch extends ReqlExpr {
     public Branch(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Branch(Arguments args){
+    public Branch(Arguments args) {
         this(args, null);
     }
     public Branch(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/Ceil.java

@@ -16,7 +16,7 @@ public class Ceil extends ReqlExpr {
     public Ceil(Object arg) {
         this(new Arguments(arg), null);
     }
-    public Ceil(Arguments args){
+    public Ceil(Arguments args) {
         this(args, null);
     }
     public Ceil(Arguments args, OptArgs optargs) {

src/main/java/com/rethinkdb/gen/ast/ChangeAt.java

@@ -16,7 +16,7 @@ public class ChangeAt extends ReqlExpr {
     public ChangeAt(Object arg) {
         this(new Arguments(arg), null);
     }
-    public ChangeAt(Arguments args){
+    public ChangeAt(Arguments args) {
         this(args, null);
     }
     public ChangeAt(Arguments args, OptArgs optargs) {