diff --git a/src/main/java/com/rethinkdb/RethinkDB.java b/src/main/java/com/rethinkdb/RethinkDB.java index afc16e9e..d6216dbe 100644 --- a/src/main/java/com/rethinkdb/RethinkDB.java +++ b/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. - *

- * WARNING:If you're trying to get or configure the {@link com.rethinkdb.net.Result}'s mapper, - * use {@link RethinkDB#getResultMapper()} instead. - * - * @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. - *

- * WARNING:If you're trying to set the {@link com.rethinkdb.net.Result}'s mapper, - * use {@link RethinkDB#setResultMapper(ObjectMapper)} instead. - * - * @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. * diff --git a/src/main/java/com/rethinkdb/ast/Query.java b/src/main/java/com/rethinkdb/ast/Query.java index d3ddb8d7..0056e2cd 100644 --- a/src/main/java/com/rethinkdb/ast/Query.java +++ b/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) diff --git a/src/main/java/com/rethinkdb/ast/Util.java b/src/main/java/com/rethinkdb/ast/Util.java deleted file mode 100644 index 739ab00d..00000000 --- a/src/main/java/com/rethinkdb/ast/Util.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.rethinkdb.ast; - -import com.rethinkdb.RethinkDB; -import com.rethinkdb.gen.ast.*; -import com.rethinkdb.gen.exc.ReqlDriverCompileError; -import com.rethinkdb.gen.exc.ReqlDriverError; -import com.rethinkdb.model.Arguments; -import com.rethinkdb.model.MapObject; -import com.rethinkdb.model.ReqlLambda; - -import java.lang.reflect.Array; -import java.time.LocalDateTime; -import java.time.OffsetDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Collection; -import java.util.List; -import java.util.Map; - - -public class Util { - public static int startingDepth = 100; - - private Util() { - } - - /** - * Convert an object to {@link ReqlAst} - * - * @param val the original object. - * @return ReqlAst - */ - public static ReqlAst toReqlAst(Object val) { - return toReqlAst(val, startingDepth); - } - - /** - * Convert an object to {@link ReqlExpr} - * - * @param val the original object. - * @return ReqlAst - */ - public static ReqlExpr toReqlExpr(Object val) { - ReqlAst converted = toReqlAst(val); - if (converted instanceof ReqlExpr) { - return (ReqlExpr) converted; - } else { - throw new ReqlDriverError("Cannot convert %s to ReqlExpr", val); - } - } - - private static ReqlAst toReqlAst(Object val, int remainingDepth) { - if (remainingDepth <= 0) { - throw new ReqlDriverCompileError("Recursion limit reached converting to ReqlAst"); - } - if (val instanceof ReqlAst) { - return (ReqlAst) val; - } - - if (val instanceof Collection) { - Arguments innerValues = new Arguments(); - for (Object innerValue : (Collection) val) { - innerValues.add(toReqlAst(innerValue, remainingDepth - 1)); - } - return new MakeArray(innerValues, null); - } - - if (val instanceof Map) { - Map obj = new MapObject<>(); - ((Map) val).forEach((key, value) -> { - if (key.getClass().isEnum()) { - obj.put(((Enum) key).name(), toReqlAst(value, remainingDepth - 1)); - } else if (key instanceof String) { - obj.put((String) key, toReqlAst(value, remainingDepth - 1)); - } else { - throw new ReqlDriverCompileError("Object keys can only be strings"); - } - }); - return MakeObj.fromMap(obj); - } - - if (val instanceof ReqlLambda) { - return Func.fromLambda((ReqlLambda) val); - } - - final DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX"); - - if (val instanceof LocalDateTime) { - ZoneId zid = ZoneId.systemDefault(); - DateTimeFormatter fmt2 = fmt.withZone(zid); - return Iso8601.fromString(((LocalDateTime) val).format(fmt2)); - } - if (val instanceof ZonedDateTime) { - return Iso8601.fromString(((ZonedDateTime) val).format(fmt)); - } - if (val instanceof OffsetDateTime) { - return Iso8601.fromString(((OffsetDateTime) val).format(fmt)); - } - - if (val instanceof Integer) { - return new Datum(val); - } - - if (val instanceof Number) { - return new Datum(val); - } - - if (val instanceof Boolean) { - return new Datum(val); - } - - if (val instanceof String) { - return new Datum(val); - } - - if (val == null) { - return new Datum(null); - } - - Class valClass = val.getClass(); - if (valClass.isEnum()) { - return new Datum(((Enum) val).name()); - } - - if (valClass.isArray()) { - if (val instanceof byte[]) { - return new Binary(((byte[]) val)); - } - Arguments innerValues = new Arguments(); - int length = Array.getLength(val); - for (int i = 0; i < length; i++) { - innerValues.add(toReqlAst(Array.get(val, i))); - } - return new MakeArray(innerValues, null); - } - - // val is a non-null POJO, let's use jackson - return toReqlAst(RethinkDB.getResultMapper().convertValue(val, Map.class), remainingDepth - 1); - } -} diff --git a/src/main/java/com/rethinkdb/gen/ast/Add.java b/src/main/java/com/rethinkdb/gen/ast/Add.java index ce242b88..5e81002d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Add.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/And.java b/src/main/java/com/rethinkdb/gen/ast/And.java index a4a1df44..018e7383 100644 --- a/src/main/java/com/rethinkdb/gen/ast/And.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Append.java b/src/main/java/com/rethinkdb/gen/ast/Append.java index 9207a3f4..61274f66 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Append.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/April.java b/src/main/java/com/rethinkdb/gen/ast/April.java index 97100c9b..2e66375d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/April.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Args.java b/src/main/java/com/rethinkdb/gen/ast/Args.java index 197112bc..b17c1214 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Args.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Asc.java b/src/main/java/com/rethinkdb/gen/ast/Asc.java index f47b97d8..6e2038a0 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Asc.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/August.java b/src/main/java/com/rethinkdb/gen/ast/August.java index cc577030..3262b73f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/August.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Avg.java b/src/main/java/com/rethinkdb/gen/ast/Avg.java index 3ebd80f6..786898a3 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Avg.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Between.java b/src/main/java/com/rethinkdb/gen/ast/Between.java index 5529844a..681512d9 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Between.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Binary.java b/src/main/java/com/rethinkdb/gen/ast/Binary.java index 038764be..885e4005 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Binary.java +++ b/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(); } } diff --git a/src/main/java/com/rethinkdb/gen/ast/BitAnd.java b/src/main/java/com/rethinkdb/gen/ast/BitAnd.java index e48a6402..66035460 100644 --- a/src/main/java/com/rethinkdb/gen/ast/BitAnd.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/BitNot.java b/src/main/java/com/rethinkdb/gen/ast/BitNot.java index 7dd71714..b6f3e47d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/BitNot.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/BitOr.java b/src/main/java/com/rethinkdb/gen/ast/BitOr.java index ab524543..0887ed50 100644 --- a/src/main/java/com/rethinkdb/gen/ast/BitOr.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/BitSal.java b/src/main/java/com/rethinkdb/gen/ast/BitSal.java index 24eb28b1..accfbaf9 100644 --- a/src/main/java/com/rethinkdb/gen/ast/BitSal.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/BitSar.java b/src/main/java/com/rethinkdb/gen/ast/BitSar.java index a39330e2..cc54a170 100644 --- a/src/main/java/com/rethinkdb/gen/ast/BitSar.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/BitXor.java b/src/main/java/com/rethinkdb/gen/ast/BitXor.java index 9b8d4dda..c413b2f4 100644 --- a/src/main/java/com/rethinkdb/gen/ast/BitXor.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Bracket.java b/src/main/java/com/rethinkdb/gen/ast/Bracket.java index 1588dd60..ffa3d25e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Bracket.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Branch.java b/src/main/java/com/rethinkdb/gen/ast/Branch.java index fbc1831a..bbbb48cc 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Branch.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Ceil.java b/src/main/java/com/rethinkdb/gen/ast/Ceil.java index c0900b48..847f9f69 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Ceil.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ChangeAt.java b/src/main/java/com/rethinkdb/gen/ast/ChangeAt.java index 243c965a..d377ebc9 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ChangeAt.java +++ b/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) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Changes.java b/src/main/java/com/rethinkdb/gen/ast/Changes.java index 3a1f8983..3b103bec 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Changes.java +++ b/src/main/java/com/rethinkdb/gen/ast/Changes.java @@ -16,7 +16,7 @@ public class Changes extends ReqlExpr { public Changes(Object arg) { this(new Arguments(arg), null); } - public Changes(Arguments args){ + public Changes(Arguments args) { this(args, null); } public Changes(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Circle.java b/src/main/java/com/rethinkdb/gen/ast/Circle.java index 5ef85a24..017a47d2 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Circle.java +++ b/src/main/java/com/rethinkdb/gen/ast/Circle.java @@ -16,7 +16,7 @@ public class Circle extends ReqlExpr { public Circle(Object arg) { this(new Arguments(arg), null); } - public Circle(Arguments args){ + public Circle(Arguments args) { this(args, null); } public Circle(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/CoerceTo.java b/src/main/java/com/rethinkdb/gen/ast/CoerceTo.java index cba7c072..4207efb8 100644 --- a/src/main/java/com/rethinkdb/gen/ast/CoerceTo.java +++ b/src/main/java/com/rethinkdb/gen/ast/CoerceTo.java @@ -16,7 +16,7 @@ public class CoerceTo extends ReqlExpr { public CoerceTo(Object arg) { this(new Arguments(arg), null); } - public CoerceTo(Arguments args){ + public CoerceTo(Arguments args) { this(args, null); } public CoerceTo(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ConcatMap.java b/src/main/java/com/rethinkdb/gen/ast/ConcatMap.java index 9178f7aa..a59d20b0 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ConcatMap.java +++ b/src/main/java/com/rethinkdb/gen/ast/ConcatMap.java @@ -16,7 +16,7 @@ public class ConcatMap extends ReqlExpr { public ConcatMap(Object arg) { this(new Arguments(arg), null); } - public ConcatMap(Arguments args){ + public ConcatMap(Arguments args) { this(args, null); } public ConcatMap(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Config.java b/src/main/java/com/rethinkdb/gen/ast/Config.java index b0a819dc..a6268ed8 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Config.java +++ b/src/main/java/com/rethinkdb/gen/ast/Config.java @@ -16,7 +16,7 @@ public class Config extends ReqlExpr { public Config(Object arg) { this(new Arguments(arg), null); } - public Config(Arguments args){ + public Config(Arguments args) { this(args, null); } public Config(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Contains.java b/src/main/java/com/rethinkdb/gen/ast/Contains.java index 67d58e71..d900d74e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Contains.java +++ b/src/main/java/com/rethinkdb/gen/ast/Contains.java @@ -16,7 +16,7 @@ public class Contains extends ReqlExpr { public Contains(Object arg) { this(new Arguments(arg), null); } - public Contains(Arguments args){ + public Contains(Arguments args) { this(args, null); } public Contains(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Count.java b/src/main/java/com/rethinkdb/gen/ast/Count.java index 440bec12..2b32ea8f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Count.java +++ b/src/main/java/com/rethinkdb/gen/ast/Count.java @@ -16,7 +16,7 @@ public class Count extends ReqlExpr { public Count(Object arg) { this(new Arguments(arg), null); } - public Count(Arguments args){ + public Count(Arguments args) { this(args, null); } public Count(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Date.java b/src/main/java/com/rethinkdb/gen/ast/Date.java index 7e84a5ff..c1f50ff4 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Date.java +++ b/src/main/java/com/rethinkdb/gen/ast/Date.java @@ -16,7 +16,7 @@ public class Date extends ReqlExpr { public Date(Object arg) { this(new Arguments(arg), null); } - public Date(Arguments args){ + public Date(Arguments args) { this(args, null); } public Date(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Datum.java b/src/main/java/com/rethinkdb/gen/ast/Datum.java index d3bb54fd..426db617 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Datum.java +++ b/src/main/java/com/rethinkdb/gen/ast/Datum.java @@ -12,14 +12,13 @@ import com.rethinkdb.ast.ReqlAst; public class Datum extends ReqlExpr { - public final java.lang.Object datum; + public Datum(java.lang.Object arg) { super(TermType.DATUM, null, null); datum = arg; } - @Override protected Object build() { // Overridden because Datums are leaf-nodes and therefore diff --git a/src/main/java/com/rethinkdb/gen/ast/Day.java b/src/main/java/com/rethinkdb/gen/ast/Day.java index bb79c904..f7447207 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Day.java +++ b/src/main/java/com/rethinkdb/gen/ast/Day.java @@ -16,7 +16,7 @@ public class Day extends ReqlExpr { public Day(Object arg) { this(new Arguments(arg), null); } - public Day(Arguments args){ + public Day(Arguments args) { this(args, null); } public Day(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/DayOfWeek.java b/src/main/java/com/rethinkdb/gen/ast/DayOfWeek.java index 07dde6c4..e259093d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/DayOfWeek.java +++ b/src/main/java/com/rethinkdb/gen/ast/DayOfWeek.java @@ -16,7 +16,7 @@ public class DayOfWeek extends ReqlExpr { public DayOfWeek(Object arg) { this(new Arguments(arg), null); } - public DayOfWeek(Arguments args){ + public DayOfWeek(Arguments args) { this(args, null); } public DayOfWeek(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/DayOfYear.java b/src/main/java/com/rethinkdb/gen/ast/DayOfYear.java index 080f3f1d..c29f5d3e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/DayOfYear.java +++ b/src/main/java/com/rethinkdb/gen/ast/DayOfYear.java @@ -16,7 +16,7 @@ public class DayOfYear extends ReqlExpr { public DayOfYear(Object arg) { this(new Arguments(arg), null); } - public DayOfYear(Arguments args){ + public DayOfYear(Arguments args) { this(args, null); } public DayOfYear(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Db.java b/src/main/java/com/rethinkdb/gen/ast/Db.java index 39403ba5..df0fa7cb 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Db.java +++ b/src/main/java/com/rethinkdb/gen/ast/Db.java @@ -16,7 +16,7 @@ public class Db extends ReqlAst { public Db(Object arg) { this(new Arguments(arg), null); } - public Db(Arguments args){ + public Db(Arguments args) { this(args, null); } public Db(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/DbCreate.java b/src/main/java/com/rethinkdb/gen/ast/DbCreate.java index 1cbcf722..045c2a51 100644 --- a/src/main/java/com/rethinkdb/gen/ast/DbCreate.java +++ b/src/main/java/com/rethinkdb/gen/ast/DbCreate.java @@ -16,7 +16,7 @@ public class DbCreate extends ReqlExpr { public DbCreate(Object arg) { this(new Arguments(arg), null); } - public DbCreate(Arguments args){ + public DbCreate(Arguments args) { this(args, null); } public DbCreate(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/DbDrop.java b/src/main/java/com/rethinkdb/gen/ast/DbDrop.java index 7093e573..47ab4811 100644 --- a/src/main/java/com/rethinkdb/gen/ast/DbDrop.java +++ b/src/main/java/com/rethinkdb/gen/ast/DbDrop.java @@ -16,7 +16,7 @@ public class DbDrop extends ReqlExpr { public DbDrop(Object arg) { this(new Arguments(arg), null); } - public DbDrop(Arguments args){ + public DbDrop(Arguments args) { this(args, null); } public DbDrop(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/DbList.java b/src/main/java/com/rethinkdb/gen/ast/DbList.java index 777e6766..ec5bf2ed 100644 --- a/src/main/java/com/rethinkdb/gen/ast/DbList.java +++ b/src/main/java/com/rethinkdb/gen/ast/DbList.java @@ -16,7 +16,7 @@ public class DbList extends ReqlExpr { public DbList(Object arg) { this(new Arguments(arg), null); } - public DbList(Arguments args){ + public DbList(Arguments args) { this(args, null); } public DbList(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/December.java b/src/main/java/com/rethinkdb/gen/ast/December.java index 3d4335e8..73a94c85 100644 --- a/src/main/java/com/rethinkdb/gen/ast/December.java +++ b/src/main/java/com/rethinkdb/gen/ast/December.java @@ -16,7 +16,7 @@ public class December extends ReqlExpr { public December(Object arg) { this(new Arguments(arg), null); } - public December(Arguments args){ + public December(Arguments args) { this(args, null); } public December(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Default.java b/src/main/java/com/rethinkdb/gen/ast/Default.java index 6a156bc9..bd3674af 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Default.java +++ b/src/main/java/com/rethinkdb/gen/ast/Default.java @@ -16,7 +16,7 @@ public class Default extends ReqlExpr { public Default(Object arg) { this(new Arguments(arg), null); } - public Default(Arguments args){ + public Default(Arguments args) { this(args, null); } public Default(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Delete.java b/src/main/java/com/rethinkdb/gen/ast/Delete.java index 8b0de6ae..f316da0e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Delete.java +++ b/src/main/java/com/rethinkdb/gen/ast/Delete.java @@ -16,7 +16,7 @@ public class Delete extends ReqlExpr { public Delete(Object arg) { this(new Arguments(arg), null); } - public Delete(Arguments args){ + public Delete(Arguments args) { this(args, null); } public Delete(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/DeleteAt.java b/src/main/java/com/rethinkdb/gen/ast/DeleteAt.java index 9e1f7106..673c131a 100644 --- a/src/main/java/com/rethinkdb/gen/ast/DeleteAt.java +++ b/src/main/java/com/rethinkdb/gen/ast/DeleteAt.java @@ -16,7 +16,7 @@ public class DeleteAt extends ReqlExpr { public DeleteAt(Object arg) { this(new Arguments(arg), null); } - public DeleteAt(Arguments args){ + public DeleteAt(Arguments args) { this(args, null); } public DeleteAt(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Desc.java b/src/main/java/com/rethinkdb/gen/ast/Desc.java index 08ae884a..0d8c1d0b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Desc.java +++ b/src/main/java/com/rethinkdb/gen/ast/Desc.java @@ -16,7 +16,7 @@ public class Desc extends ReqlExpr { public Desc(Object arg) { this(new Arguments(arg), null); } - public Desc(Arguments args){ + public Desc(Arguments args) { this(args, null); } public Desc(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Difference.java b/src/main/java/com/rethinkdb/gen/ast/Difference.java index 4405f40e..2e772edf 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Difference.java +++ b/src/main/java/com/rethinkdb/gen/ast/Difference.java @@ -16,7 +16,7 @@ public class Difference extends ReqlExpr { public Difference(Object arg) { this(new Arguments(arg), null); } - public Difference(Arguments args){ + public Difference(Arguments args) { this(args, null); } public Difference(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Distance.java b/src/main/java/com/rethinkdb/gen/ast/Distance.java index f5a6f778..768d026a 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Distance.java +++ b/src/main/java/com/rethinkdb/gen/ast/Distance.java @@ -16,7 +16,7 @@ public class Distance extends ReqlExpr { public Distance(Object arg) { this(new Arguments(arg), null); } - public Distance(Arguments args){ + public Distance(Arguments args) { this(args, null); } public Distance(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Distinct.java b/src/main/java/com/rethinkdb/gen/ast/Distinct.java index 614e2699..434370aa 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Distinct.java +++ b/src/main/java/com/rethinkdb/gen/ast/Distinct.java @@ -16,7 +16,7 @@ public class Distinct extends ReqlExpr { public Distinct(Object arg) { this(new Arguments(arg), null); } - public Distinct(Arguments args){ + public Distinct(Arguments args) { this(args, null); } public Distinct(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Div.java b/src/main/java/com/rethinkdb/gen/ast/Div.java index c5228b12..c5478469 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Div.java +++ b/src/main/java/com/rethinkdb/gen/ast/Div.java @@ -16,7 +16,7 @@ public class Div extends ReqlExpr { public Div(Object arg) { this(new Arguments(arg), null); } - public Div(Arguments args){ + public Div(Arguments args) { this(args, null); } public Div(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Downcase.java b/src/main/java/com/rethinkdb/gen/ast/Downcase.java index 33ae6b0c..e41caaab 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Downcase.java +++ b/src/main/java/com/rethinkdb/gen/ast/Downcase.java @@ -16,7 +16,7 @@ public class Downcase extends ReqlExpr { public Downcase(Object arg) { this(new Arguments(arg), null); } - public Downcase(Arguments args){ + public Downcase(Arguments args) { this(args, null); } public Downcase(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/During.java b/src/main/java/com/rethinkdb/gen/ast/During.java index 7122f1b8..9e8eb8d8 100644 --- a/src/main/java/com/rethinkdb/gen/ast/During.java +++ b/src/main/java/com/rethinkdb/gen/ast/During.java @@ -16,7 +16,7 @@ public class During extends ReqlExpr { public During(Object arg) { this(new Arguments(arg), null); } - public During(Arguments args){ + public During(Arguments args) { this(args, null); } public During(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/EpochTime.java b/src/main/java/com/rethinkdb/gen/ast/EpochTime.java index 697f8aaa..061d09f0 100644 --- a/src/main/java/com/rethinkdb/gen/ast/EpochTime.java +++ b/src/main/java/com/rethinkdb/gen/ast/EpochTime.java @@ -16,7 +16,7 @@ public class EpochTime extends ReqlExpr { public EpochTime(Object arg) { this(new Arguments(arg), null); } - public EpochTime(Arguments args){ + public EpochTime(Arguments args) { this(args, null); } public EpochTime(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Eq.java b/src/main/java/com/rethinkdb/gen/ast/Eq.java index c96ac751..d5816e49 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Eq.java +++ b/src/main/java/com/rethinkdb/gen/ast/Eq.java @@ -16,7 +16,7 @@ public class Eq extends ReqlExpr { public Eq(Object arg) { this(new Arguments(arg), null); } - public Eq(Arguments args){ + public Eq(Arguments args) { this(args, null); } public Eq(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/EqJoin.java b/src/main/java/com/rethinkdb/gen/ast/EqJoin.java index 1e01a13d..d0f2e635 100644 --- a/src/main/java/com/rethinkdb/gen/ast/EqJoin.java +++ b/src/main/java/com/rethinkdb/gen/ast/EqJoin.java @@ -16,7 +16,7 @@ public class EqJoin extends ReqlExpr { public EqJoin(Object arg) { this(new Arguments(arg), null); } - public EqJoin(Arguments args){ + public EqJoin(Arguments args) { this(args, null); } public EqJoin(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Error.java b/src/main/java/com/rethinkdb/gen/ast/Error.java index b522990c..53e77dc0 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Error.java +++ b/src/main/java/com/rethinkdb/gen/ast/Error.java @@ -16,7 +16,7 @@ public class Error extends ReqlExpr { public Error(Object arg) { this(new Arguments(arg), null); } - public Error(Arguments args){ + public Error(Arguments args) { this(args, null); } public Error(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/February.java b/src/main/java/com/rethinkdb/gen/ast/February.java index 40256e24..05b043f6 100644 --- a/src/main/java/com/rethinkdb/gen/ast/February.java +++ b/src/main/java/com/rethinkdb/gen/ast/February.java @@ -16,7 +16,7 @@ public class February extends ReqlExpr { public February(Object arg) { this(new Arguments(arg), null); } - public February(Arguments args){ + public February(Arguments args) { this(args, null); } public February(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Fill.java b/src/main/java/com/rethinkdb/gen/ast/Fill.java index 4a30cf93..307ebe24 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Fill.java +++ b/src/main/java/com/rethinkdb/gen/ast/Fill.java @@ -16,7 +16,7 @@ public class Fill extends ReqlExpr { public Fill(Object arg) { this(new Arguments(arg), null); } - public Fill(Arguments args){ + public Fill(Arguments args) { this(args, null); } public Fill(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Filter.java b/src/main/java/com/rethinkdb/gen/ast/Filter.java index dadee812..f9b57e2e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Filter.java +++ b/src/main/java/com/rethinkdb/gen/ast/Filter.java @@ -16,7 +16,7 @@ public class Filter extends ReqlExpr { public Filter(Object arg) { this(new Arguments(arg), null); } - public Filter(Arguments args){ + public Filter(Arguments args) { this(args, null); } public Filter(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Floor.java b/src/main/java/com/rethinkdb/gen/ast/Floor.java index 9696779a..99f88d1b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Floor.java +++ b/src/main/java/com/rethinkdb/gen/ast/Floor.java @@ -16,7 +16,7 @@ public class Floor extends ReqlExpr { public Floor(Object arg) { this(new Arguments(arg), null); } - public Floor(Arguments args){ + public Floor(Arguments args) { this(args, null); } public Floor(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Fold.java b/src/main/java/com/rethinkdb/gen/ast/Fold.java index 56ff76aa..298929c2 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Fold.java +++ b/src/main/java/com/rethinkdb/gen/ast/Fold.java @@ -16,7 +16,7 @@ public class Fold extends ReqlExpr { public Fold(Object arg) { this(new Arguments(arg), null); } - public Fold(Arguments args){ + public Fold(Arguments args) { this(args, null); } public Fold(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ForEach.java b/src/main/java/com/rethinkdb/gen/ast/ForEach.java index 1c644f16..8c684f00 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ForEach.java +++ b/src/main/java/com/rethinkdb/gen/ast/ForEach.java @@ -16,7 +16,7 @@ public class ForEach extends ReqlExpr { public ForEach(Object arg) { this(new Arguments(arg), null); } - public ForEach(Arguments args){ + public ForEach(Arguments args) { this(args, null); } public ForEach(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Friday.java b/src/main/java/com/rethinkdb/gen/ast/Friday.java index 70122478..fe73f9ff 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Friday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Friday.java @@ -16,7 +16,7 @@ public class Friday extends ReqlExpr { public Friday(Object arg) { this(new Arguments(arg), null); } - public Friday(Arguments args){ + public Friday(Arguments args) { this(args, null); } public Friday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Func.java b/src/main/java/com/rethinkdb/gen/ast/Func.java index 66aebd34..ac4d4569 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Func.java +++ b/src/main/java/com/rethinkdb/gen/ast/Func.java @@ -12,7 +12,7 @@ import com.rethinkdb.ast.ReqlAst; import com.rethinkdb.model.ReqlLambda; -import com.rethinkdb.ast.Util; +import com.rethinkdb.utils.Internals; import java.util.concurrent.atomic.AtomicInteger; import java.util.Arrays; import java.util.List; @@ -24,11 +24,10 @@ protected Func(Arguments args){ super(TermType.FUNC, args, null); } public static Func fromLambda(ReqlLambda function) { - if(function instanceof ReqlFunction0) { - return new Func(Arguments.make(new MakeArray(Arrays.asList()), - Util.toReqlAst(((ReqlFunction0) function).apply()))); + if (function instanceof ReqlFunction0) { + return new Func(Arguments.make(new MakeArray(Arrays.asList()), Internals.toReqlAst(((ReqlFunction0) function).apply()))); } - else if(function instanceof ReqlFunction1){ + else if (function instanceof ReqlFunction1) { ReqlFunction1 func1 = (ReqlFunction1) function; int var1 = nextVarId(); List varIds = Arrays.asList( @@ -36,11 +35,9 @@ else if(function instanceof ReqlFunction1){ Object appliedFunction = func1.apply( new Var(var1) ); - return new Func(Arguments.make( - new MakeArray(varIds), - Util.toReqlAst(appliedFunction))); + return new Func(Arguments.make(new MakeArray(varIds), Internals.toReqlAst(appliedFunction))); } - else if(function instanceof ReqlFunction2){ + else if (function instanceof ReqlFunction2) { ReqlFunction2 func2 = (ReqlFunction2) function; int var1 = nextVarId(); int var2 = nextVarId(); @@ -49,11 +46,9 @@ else if(function instanceof ReqlFunction2){ Object appliedFunction = func2.apply( new Var(var1), new Var(var2) ); - return new Func(Arguments.make( - new MakeArray(varIds), - Util.toReqlAst(appliedFunction))); + return new Func(Arguments.make(new MakeArray(varIds), Internals.toReqlAst(appliedFunction))); } - else if(function instanceof ReqlFunction3){ + else if (function instanceof ReqlFunction3) { ReqlFunction3 func3 = (ReqlFunction3) function; int var1 = nextVarId(); int var2 = nextVarId(); @@ -63,11 +58,9 @@ else if(function instanceof ReqlFunction3){ Object appliedFunction = func3.apply( new Var(var1), new Var(var2), new Var(var3) ); - return new Func(Arguments.make( - new MakeArray(varIds), - Util.toReqlAst(appliedFunction))); + return new Func(Arguments.make(new MakeArray(varIds), Internals.toReqlAst(appliedFunction))); } - else if(function instanceof ReqlFunction4){ + else if (function instanceof ReqlFunction4) { ReqlFunction4 func4 = (ReqlFunction4) function; int var1 = nextVarId(); int var2 = nextVarId(); @@ -78,9 +71,7 @@ else if(function instanceof ReqlFunction4){ Object appliedFunction = func4.apply( new Var(var1), new Var(var2), new Var(var3), new Var(var4) ); - return new Func(Arguments.make( - new MakeArray(varIds), - Util.toReqlAst(appliedFunction))); + return new Func(Arguments.make(new MakeArray(varIds), Internals.toReqlAst(appliedFunction))); } else { throw new ReqlDriverError("Arity of ReqlLambda not recognized!"); diff --git a/src/main/java/com/rethinkdb/gen/ast/Funcall.java b/src/main/java/com/rethinkdb/gen/ast/Funcall.java index 01b3fab8..ea5d1e22 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Funcall.java +++ b/src/main/java/com/rethinkdb/gen/ast/Funcall.java @@ -16,7 +16,7 @@ public class Funcall extends ReqlExpr { public Funcall(Object arg) { this(new Arguments(arg), null); } - public Funcall(Arguments args){ + public Funcall(Arguments args) { this(args, null); } public Funcall(Arguments args, OptArgs optargs) { @@ -25,8 +25,7 @@ public Funcall(Arguments args, OptArgs optargs) { @Override - protected Object build() - { + protected Object build() { /* This object should be constructed with arguments first, and the function itself as the last parameter. This makes it easier for diff --git a/src/main/java/com/rethinkdb/gen/ast/Ge.java b/src/main/java/com/rethinkdb/gen/ast/Ge.java index 95558fde..dfc0229f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Ge.java +++ b/src/main/java/com/rethinkdb/gen/ast/Ge.java @@ -16,7 +16,7 @@ public class Ge extends ReqlExpr { public Ge(Object arg) { this(new Arguments(arg), null); } - public Ge(Arguments args){ + public Ge(Arguments args) { this(args, null); } public Ge(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Geojson.java b/src/main/java/com/rethinkdb/gen/ast/Geojson.java index 9176889f..ca7619d5 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Geojson.java +++ b/src/main/java/com/rethinkdb/gen/ast/Geojson.java @@ -16,7 +16,7 @@ public class Geojson extends ReqlExpr { public Geojson(Object arg) { this(new Arguments(arg), null); } - public Geojson(Arguments args){ + public Geojson(Arguments args) { this(args, null); } public Geojson(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Get.java b/src/main/java/com/rethinkdb/gen/ast/Get.java index 9a4f0166..a77bd8da 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Get.java +++ b/src/main/java/com/rethinkdb/gen/ast/Get.java @@ -16,7 +16,7 @@ public class Get extends ReqlExpr { public Get(Object arg) { this(new Arguments(arg), null); } - public Get(Arguments args){ + public Get(Arguments args) { this(args, null); } public Get(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/GetAll.java b/src/main/java/com/rethinkdb/gen/ast/GetAll.java index 0f6ae988..70413cb6 100644 --- a/src/main/java/com/rethinkdb/gen/ast/GetAll.java +++ b/src/main/java/com/rethinkdb/gen/ast/GetAll.java @@ -16,7 +16,7 @@ public class GetAll extends ReqlExpr { public GetAll(Object arg) { this(new Arguments(arg), null); } - public GetAll(Arguments args){ + public GetAll(Arguments args) { this(args, null); } public GetAll(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/GetField.java b/src/main/java/com/rethinkdb/gen/ast/GetField.java index 687127dd..380019fb 100644 --- a/src/main/java/com/rethinkdb/gen/ast/GetField.java +++ b/src/main/java/com/rethinkdb/gen/ast/GetField.java @@ -16,7 +16,7 @@ public class GetField extends ReqlExpr { public GetField(Object arg) { this(new Arguments(arg), null); } - public GetField(Arguments args){ + public GetField(Arguments args) { this(args, null); } public GetField(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/GetIntersecting.java b/src/main/java/com/rethinkdb/gen/ast/GetIntersecting.java index 8885086e..52abf6dd 100644 --- a/src/main/java/com/rethinkdb/gen/ast/GetIntersecting.java +++ b/src/main/java/com/rethinkdb/gen/ast/GetIntersecting.java @@ -16,7 +16,7 @@ public class GetIntersecting extends ReqlExpr { public GetIntersecting(Object arg) { this(new Arguments(arg), null); } - public GetIntersecting(Arguments args){ + public GetIntersecting(Arguments args) { this(args, null); } public GetIntersecting(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/GetNearest.java b/src/main/java/com/rethinkdb/gen/ast/GetNearest.java index e64a60b2..ee2f92be 100644 --- a/src/main/java/com/rethinkdb/gen/ast/GetNearest.java +++ b/src/main/java/com/rethinkdb/gen/ast/GetNearest.java @@ -16,7 +16,7 @@ public class GetNearest extends ReqlExpr { public GetNearest(Object arg) { this(new Arguments(arg), null); } - public GetNearest(Arguments args){ + public GetNearest(Arguments args) { this(args, null); } public GetNearest(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/GetWriteHook.java b/src/main/java/com/rethinkdb/gen/ast/GetWriteHook.java index 191108eb..d1b8bbaa 100644 --- a/src/main/java/com/rethinkdb/gen/ast/GetWriteHook.java +++ b/src/main/java/com/rethinkdb/gen/ast/GetWriteHook.java @@ -16,7 +16,7 @@ public class GetWriteHook extends ReqlExpr { public GetWriteHook(Object arg) { this(new Arguments(arg), null); } - public GetWriteHook(Arguments args){ + public GetWriteHook(Arguments args) { this(args, null); } public GetWriteHook(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Grant.java b/src/main/java/com/rethinkdb/gen/ast/Grant.java index 7383223f..0ecb4e58 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Grant.java +++ b/src/main/java/com/rethinkdb/gen/ast/Grant.java @@ -16,7 +16,7 @@ public class Grant extends ReqlExpr { public Grant(Object arg) { this(new Arguments(arg), null); } - public Grant(Arguments args){ + public Grant(Arguments args) { this(args, null); } public Grant(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Group.java b/src/main/java/com/rethinkdb/gen/ast/Group.java index 09b91f9d..c23f8d61 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Group.java +++ b/src/main/java/com/rethinkdb/gen/ast/Group.java @@ -16,7 +16,7 @@ public class Group extends ReqlExpr { public Group(Object arg) { this(new Arguments(arg), null); } - public Group(Arguments args){ + public Group(Arguments args) { this(args, null); } public Group(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Gt.java b/src/main/java/com/rethinkdb/gen/ast/Gt.java index 6a5e0299..2b60d642 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Gt.java +++ b/src/main/java/com/rethinkdb/gen/ast/Gt.java @@ -16,7 +16,7 @@ public class Gt extends ReqlExpr { public Gt(Object arg) { this(new Arguments(arg), null); } - public Gt(Arguments args){ + public Gt(Arguments args) { this(args, null); } public Gt(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/HasFields.java b/src/main/java/com/rethinkdb/gen/ast/HasFields.java index 50829ee6..aff71629 100644 --- a/src/main/java/com/rethinkdb/gen/ast/HasFields.java +++ b/src/main/java/com/rethinkdb/gen/ast/HasFields.java @@ -16,7 +16,7 @@ public class HasFields extends ReqlExpr { public HasFields(Object arg) { this(new Arguments(arg), null); } - public HasFields(Arguments args){ + public HasFields(Arguments args) { this(args, null); } public HasFields(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Hours.java b/src/main/java/com/rethinkdb/gen/ast/Hours.java index 7a1193e3..377a44af 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Hours.java +++ b/src/main/java/com/rethinkdb/gen/ast/Hours.java @@ -16,7 +16,7 @@ public class Hours extends ReqlExpr { public Hours(Object arg) { this(new Arguments(arg), null); } - public Hours(Arguments args){ + public Hours(Arguments args) { this(args, null); } public Hours(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Http.java b/src/main/java/com/rethinkdb/gen/ast/Http.java index 8c343008..1c1692e1 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Http.java +++ b/src/main/java/com/rethinkdb/gen/ast/Http.java @@ -16,7 +16,7 @@ public class Http extends ReqlExpr { public Http(Object arg) { this(new Arguments(arg), null); } - public Http(Arguments args){ + public Http(Arguments args) { this(args, null); } public Http(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/InTimezone.java b/src/main/java/com/rethinkdb/gen/ast/InTimezone.java index 320cba87..f9975bce 100644 --- a/src/main/java/com/rethinkdb/gen/ast/InTimezone.java +++ b/src/main/java/com/rethinkdb/gen/ast/InTimezone.java @@ -16,7 +16,7 @@ public class InTimezone extends ReqlExpr { public InTimezone(Object arg) { this(new Arguments(arg), null); } - public InTimezone(Arguments args){ + public InTimezone(Arguments args) { this(args, null); } public InTimezone(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Includes.java b/src/main/java/com/rethinkdb/gen/ast/Includes.java index d47b23c4..4c965033 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Includes.java +++ b/src/main/java/com/rethinkdb/gen/ast/Includes.java @@ -16,7 +16,7 @@ public class Includes extends ReqlExpr { public Includes(Object arg) { this(new Arguments(arg), null); } - public Includes(Arguments args){ + public Includes(Arguments args) { this(args, null); } public Includes(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IndexCreate.java b/src/main/java/com/rethinkdb/gen/ast/IndexCreate.java index a78f2bf6..67ef2a9d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IndexCreate.java +++ b/src/main/java/com/rethinkdb/gen/ast/IndexCreate.java @@ -16,7 +16,7 @@ public class IndexCreate extends ReqlExpr { public IndexCreate(Object arg) { this(new Arguments(arg), null); } - public IndexCreate(Arguments args){ + public IndexCreate(Arguments args) { this(args, null); } public IndexCreate(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IndexDrop.java b/src/main/java/com/rethinkdb/gen/ast/IndexDrop.java index 59789102..794d8d1f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IndexDrop.java +++ b/src/main/java/com/rethinkdb/gen/ast/IndexDrop.java @@ -16,7 +16,7 @@ public class IndexDrop extends ReqlExpr { public IndexDrop(Object arg) { this(new Arguments(arg), null); } - public IndexDrop(Arguments args){ + public IndexDrop(Arguments args) { this(args, null); } public IndexDrop(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IndexList.java b/src/main/java/com/rethinkdb/gen/ast/IndexList.java index ab2c6b58..9b877997 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IndexList.java +++ b/src/main/java/com/rethinkdb/gen/ast/IndexList.java @@ -16,7 +16,7 @@ public class IndexList extends ReqlExpr { public IndexList(Object arg) { this(new Arguments(arg), null); } - public IndexList(Arguments args){ + public IndexList(Arguments args) { this(args, null); } public IndexList(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IndexRename.java b/src/main/java/com/rethinkdb/gen/ast/IndexRename.java index 89211b0d..a04fcb69 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IndexRename.java +++ b/src/main/java/com/rethinkdb/gen/ast/IndexRename.java @@ -16,7 +16,7 @@ public class IndexRename extends ReqlExpr { public IndexRename(Object arg) { this(new Arguments(arg), null); } - public IndexRename(Arguments args){ + public IndexRename(Arguments args) { this(args, null); } public IndexRename(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IndexStatus.java b/src/main/java/com/rethinkdb/gen/ast/IndexStatus.java index 62ff2a4c..5954ce5b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IndexStatus.java +++ b/src/main/java/com/rethinkdb/gen/ast/IndexStatus.java @@ -16,7 +16,7 @@ public class IndexStatus extends ReqlExpr { public IndexStatus(Object arg) { this(new Arguments(arg), null); } - public IndexStatus(Arguments args){ + public IndexStatus(Arguments args) { this(args, null); } public IndexStatus(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IndexWait.java b/src/main/java/com/rethinkdb/gen/ast/IndexWait.java index eb71482d..d8dd01b9 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IndexWait.java +++ b/src/main/java/com/rethinkdb/gen/ast/IndexWait.java @@ -16,7 +16,7 @@ public class IndexWait extends ReqlExpr { public IndexWait(Object arg) { this(new Arguments(arg), null); } - public IndexWait(Arguments args){ + public IndexWait(Arguments args) { this(args, null); } public IndexWait(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Info.java b/src/main/java/com/rethinkdb/gen/ast/Info.java index 85cd59d7..63599b20 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Info.java +++ b/src/main/java/com/rethinkdb/gen/ast/Info.java @@ -16,7 +16,7 @@ public class Info extends ReqlExpr { public Info(Object arg) { this(new Arguments(arg), null); } - public Info(Arguments args){ + public Info(Arguments args) { this(args, null); } public Info(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/InnerJoin.java b/src/main/java/com/rethinkdb/gen/ast/InnerJoin.java index 89de768c..2f00eb0d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/InnerJoin.java +++ b/src/main/java/com/rethinkdb/gen/ast/InnerJoin.java @@ -16,7 +16,7 @@ public class InnerJoin extends ReqlExpr { public InnerJoin(Object arg) { this(new Arguments(arg), null); } - public InnerJoin(Arguments args){ + public InnerJoin(Arguments args) { this(args, null); } public InnerJoin(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Insert.java b/src/main/java/com/rethinkdb/gen/ast/Insert.java index 1a865a21..04ec8b19 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Insert.java +++ b/src/main/java/com/rethinkdb/gen/ast/Insert.java @@ -16,7 +16,7 @@ public class Insert extends ReqlExpr { public Insert(Object arg) { this(new Arguments(arg), null); } - public Insert(Arguments args){ + public Insert(Arguments args) { this(args, null); } public Insert(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/InsertAt.java b/src/main/java/com/rethinkdb/gen/ast/InsertAt.java index e8bfebd1..dddb8efc 100644 --- a/src/main/java/com/rethinkdb/gen/ast/InsertAt.java +++ b/src/main/java/com/rethinkdb/gen/ast/InsertAt.java @@ -16,7 +16,7 @@ public class InsertAt extends ReqlExpr { public InsertAt(Object arg) { this(new Arguments(arg), null); } - public InsertAt(Arguments args){ + public InsertAt(Arguments args) { this(args, null); } public InsertAt(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Intersects.java b/src/main/java/com/rethinkdb/gen/ast/Intersects.java index 3dbadc0e..6a2fa095 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Intersects.java +++ b/src/main/java/com/rethinkdb/gen/ast/Intersects.java @@ -16,7 +16,7 @@ public class Intersects extends ReqlExpr { public Intersects(Object arg) { this(new Arguments(arg), null); } - public Intersects(Arguments args){ + public Intersects(Arguments args) { this(args, null); } public Intersects(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/IsEmpty.java b/src/main/java/com/rethinkdb/gen/ast/IsEmpty.java index f98bb9d2..c09ff248 100644 --- a/src/main/java/com/rethinkdb/gen/ast/IsEmpty.java +++ b/src/main/java/com/rethinkdb/gen/ast/IsEmpty.java @@ -16,7 +16,7 @@ public class IsEmpty extends ReqlExpr { public IsEmpty(Object arg) { this(new Arguments(arg), null); } - public IsEmpty(Arguments args){ + public IsEmpty(Arguments args) { this(args, null); } public IsEmpty(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Iso8601.java b/src/main/java/com/rethinkdb/gen/ast/Iso8601.java index 6fd42979..426b01dc 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Iso8601.java +++ b/src/main/java/com/rethinkdb/gen/ast/Iso8601.java @@ -16,7 +16,7 @@ public class Iso8601 extends ReqlExpr { public Iso8601(Object arg) { this(new Arguments(arg), null); } - public Iso8601(Arguments args){ + public Iso8601(Arguments args) { this(args, null); } public Iso8601(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/January.java b/src/main/java/com/rethinkdb/gen/ast/January.java index a41492f5..e8315bea 100644 --- a/src/main/java/com/rethinkdb/gen/ast/January.java +++ b/src/main/java/com/rethinkdb/gen/ast/January.java @@ -16,7 +16,7 @@ public class January extends ReqlExpr { public January(Object arg) { this(new Arguments(arg), null); } - public January(Arguments args){ + public January(Arguments args) { this(args, null); } public January(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Javascript.java b/src/main/java/com/rethinkdb/gen/ast/Javascript.java index 08cf3260..a7bcd012 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Javascript.java +++ b/src/main/java/com/rethinkdb/gen/ast/Javascript.java @@ -16,7 +16,7 @@ public class Javascript extends ReqlExpr { public Javascript(Object arg) { this(new Arguments(arg), null); } - public Javascript(Arguments args){ + public Javascript(Arguments args) { this(args, null); } public Javascript(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Json.java b/src/main/java/com/rethinkdb/gen/ast/Json.java index ee90a010..7b977418 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Json.java +++ b/src/main/java/com/rethinkdb/gen/ast/Json.java @@ -16,7 +16,7 @@ public class Json extends ReqlExpr { public Json(Object arg) { this(new Arguments(arg), null); } - public Json(Arguments args){ + public Json(Arguments args) { this(args, null); } public Json(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/July.java b/src/main/java/com/rethinkdb/gen/ast/July.java index 9fba8d3f..2c8163be 100644 --- a/src/main/java/com/rethinkdb/gen/ast/July.java +++ b/src/main/java/com/rethinkdb/gen/ast/July.java @@ -16,7 +16,7 @@ public class July extends ReqlExpr { public July(Object arg) { this(new Arguments(arg), null); } - public July(Arguments args){ + public July(Arguments args) { this(args, null); } public July(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/June.java b/src/main/java/com/rethinkdb/gen/ast/June.java index 8d297799..5d82b9ff 100644 --- a/src/main/java/com/rethinkdb/gen/ast/June.java +++ b/src/main/java/com/rethinkdb/gen/ast/June.java @@ -16,7 +16,7 @@ public class June extends ReqlExpr { public June(Object arg) { this(new Arguments(arg), null); } - public June(Arguments args){ + public June(Arguments args) { this(args, null); } public June(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Keys.java b/src/main/java/com/rethinkdb/gen/ast/Keys.java index 100feb1b..5bdfa579 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Keys.java +++ b/src/main/java/com/rethinkdb/gen/ast/Keys.java @@ -16,7 +16,7 @@ public class Keys extends ReqlExpr { public Keys(Object arg) { this(new Arguments(arg), null); } - public Keys(Arguments args){ + public Keys(Arguments args) { this(args, null); } public Keys(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Le.java b/src/main/java/com/rethinkdb/gen/ast/Le.java index 86df5e3f..a2634d7e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Le.java +++ b/src/main/java/com/rethinkdb/gen/ast/Le.java @@ -16,7 +16,7 @@ public class Le extends ReqlExpr { public Le(Object arg) { this(new Arguments(arg), null); } - public Le(Arguments args){ + public Le(Arguments args) { this(args, null); } public Le(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Limit.java b/src/main/java/com/rethinkdb/gen/ast/Limit.java index 12a7c36b..64a453ce 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Limit.java +++ b/src/main/java/com/rethinkdb/gen/ast/Limit.java @@ -16,7 +16,7 @@ public class Limit extends ReqlExpr { public Limit(Object arg) { this(new Arguments(arg), null); } - public Limit(Arguments args){ + public Limit(Arguments args) { this(args, null); } public Limit(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Line.java b/src/main/java/com/rethinkdb/gen/ast/Line.java index b03baa2c..c6a5d4e7 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Line.java +++ b/src/main/java/com/rethinkdb/gen/ast/Line.java @@ -16,7 +16,7 @@ public class Line extends ReqlExpr { public Line(Object arg) { this(new Arguments(arg), null); } - public Line(Arguments args){ + public Line(Arguments args) { this(args, null); } public Line(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Literal.java b/src/main/java/com/rethinkdb/gen/ast/Literal.java index a00e0dd2..1f7a4e0f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Literal.java +++ b/src/main/java/com/rethinkdb/gen/ast/Literal.java @@ -16,7 +16,7 @@ public class Literal extends ReqlExpr { public Literal(Object arg) { this(new Arguments(arg), null); } - public Literal(Arguments args){ + public Literal(Arguments args) { this(args, null); } public Literal(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Lt.java b/src/main/java/com/rethinkdb/gen/ast/Lt.java index e655b5ac..82cee4b1 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Lt.java +++ b/src/main/java/com/rethinkdb/gen/ast/Lt.java @@ -16,7 +16,7 @@ public class Lt extends ReqlExpr { public Lt(Object arg) { this(new Arguments(arg), null); } - public Lt(Arguments args){ + public Lt(Arguments args) { this(args, null); } public Lt(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/MakeArray.java b/src/main/java/com/rethinkdb/gen/ast/MakeArray.java index 94b9a37d..b2d99577 100644 --- a/src/main/java/com/rethinkdb/gen/ast/MakeArray.java +++ b/src/main/java/com/rethinkdb/gen/ast/MakeArray.java @@ -16,7 +16,7 @@ public class MakeArray extends ReqlExpr { public MakeArray(Object arg) { this(new Arguments(arg), null); } - public MakeArray(Arguments args){ + public MakeArray(Arguments args) { this(args, null); } public MakeArray(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/MakeObj.java b/src/main/java/com/rethinkdb/gen/ast/MakeObj.java index 9a8a5228..5cdc4804 100644 --- a/src/main/java/com/rethinkdb/gen/ast/MakeObj.java +++ b/src/main/java/com/rethinkdb/gen/ast/MakeObj.java @@ -15,20 +15,20 @@ public class MakeObj extends ReqlExpr { public MakeObj(Object arg) { this(new Arguments(arg), null); } - public MakeObj(OptArgs opts){ + public MakeObj(OptArgs opts) { this(new Arguments(), opts); } - public MakeObj(Arguments args){ + public MakeObj(Arguments args) { this(args, null); } public MakeObj(Arguments args, OptArgs optargs) { this(TermType.MAKE_OBJ, args, optargs); } - protected MakeObj(TermType termType, Arguments args, OptArgs optargs){ + protected MakeObj(TermType termType, Arguments args, OptArgs optargs) { super(termType, args, optargs); } - public static MakeObj fromMap(java.util.Map map){ + public static MakeObj fromMap(java.util.Map map) { return new MakeObj(OptArgs.fromMap(map)); } } diff --git a/src/main/java/com/rethinkdb/gen/ast/Map.java b/src/main/java/com/rethinkdb/gen/ast/Map.java index 4dc14645..2c8872ec 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Map.java +++ b/src/main/java/com/rethinkdb/gen/ast/Map.java @@ -16,7 +16,7 @@ public class Map extends ReqlExpr { public Map(Object arg) { this(new Arguments(arg), null); } - public Map(Arguments args){ + public Map(Arguments args) { this(args, null); } public Map(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/March.java b/src/main/java/com/rethinkdb/gen/ast/March.java index 444ce4d6..45096c8d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/March.java +++ b/src/main/java/com/rethinkdb/gen/ast/March.java @@ -16,7 +16,7 @@ public class March extends ReqlExpr { public March(Object arg) { this(new Arguments(arg), null); } - public March(Arguments args){ + public March(Arguments args) { this(args, null); } public March(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Match.java b/src/main/java/com/rethinkdb/gen/ast/Match.java index fef43792..eb4e7070 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Match.java +++ b/src/main/java/com/rethinkdb/gen/ast/Match.java @@ -16,7 +16,7 @@ public class Match extends ReqlExpr { public Match(Object arg) { this(new Arguments(arg), null); } - public Match(Arguments args){ + public Match(Arguments args) { this(args, null); } public Match(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Max.java b/src/main/java/com/rethinkdb/gen/ast/Max.java index 8b2ff851..9ba568b2 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Max.java +++ b/src/main/java/com/rethinkdb/gen/ast/Max.java @@ -16,7 +16,7 @@ public class Max extends ReqlExpr { public Max(Object arg) { this(new Arguments(arg), null); } - public Max(Arguments args){ + public Max(Arguments args) { this(args, null); } public Max(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Maxval.java b/src/main/java/com/rethinkdb/gen/ast/Maxval.java index 71488ed0..79098d08 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Maxval.java +++ b/src/main/java/com/rethinkdb/gen/ast/Maxval.java @@ -16,7 +16,7 @@ public class Maxval extends ReqlExpr { public Maxval(Object arg) { this(new Arguments(arg), null); } - public Maxval(Arguments args){ + public Maxval(Arguments args) { this(args, null); } public Maxval(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/May.java b/src/main/java/com/rethinkdb/gen/ast/May.java index f3bfe666..4cc95732 100644 --- a/src/main/java/com/rethinkdb/gen/ast/May.java +++ b/src/main/java/com/rethinkdb/gen/ast/May.java @@ -16,7 +16,7 @@ public class May extends ReqlExpr { public May(Object arg) { this(new Arguments(arg), null); } - public May(Arguments args){ + public May(Arguments args) { this(args, null); } public May(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Merge.java b/src/main/java/com/rethinkdb/gen/ast/Merge.java index df00c3e5..66ba7ea1 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Merge.java +++ b/src/main/java/com/rethinkdb/gen/ast/Merge.java @@ -16,7 +16,7 @@ public class Merge extends ReqlExpr { public Merge(Object arg) { this(new Arguments(arg), null); } - public Merge(Arguments args){ + public Merge(Arguments args) { this(args, null); } public Merge(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Min.java b/src/main/java/com/rethinkdb/gen/ast/Min.java index 185d7a7c..8d7442a7 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Min.java +++ b/src/main/java/com/rethinkdb/gen/ast/Min.java @@ -16,7 +16,7 @@ public class Min extends ReqlExpr { public Min(Object arg) { this(new Arguments(arg), null); } - public Min(Arguments args){ + public Min(Arguments args) { this(args, null); } public Min(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Minutes.java b/src/main/java/com/rethinkdb/gen/ast/Minutes.java index 9a695ba3..93e4c63c 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Minutes.java +++ b/src/main/java/com/rethinkdb/gen/ast/Minutes.java @@ -16,7 +16,7 @@ public class Minutes extends ReqlExpr { public Minutes(Object arg) { this(new Arguments(arg), null); } - public Minutes(Arguments args){ + public Minutes(Arguments args) { this(args, null); } public Minutes(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Minval.java b/src/main/java/com/rethinkdb/gen/ast/Minval.java index dd016bbe..5774b9a1 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Minval.java +++ b/src/main/java/com/rethinkdb/gen/ast/Minval.java @@ -16,7 +16,7 @@ public class Minval extends ReqlExpr { public Minval(Object arg) { this(new Arguments(arg), null); } - public Minval(Arguments args){ + public Minval(Arguments args) { this(args, null); } public Minval(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Mod.java b/src/main/java/com/rethinkdb/gen/ast/Mod.java index 2554c779..eab53219 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Mod.java +++ b/src/main/java/com/rethinkdb/gen/ast/Mod.java @@ -16,7 +16,7 @@ public class Mod extends ReqlExpr { public Mod(Object arg) { this(new Arguments(arg), null); } - public Mod(Arguments args){ + public Mod(Arguments args) { this(args, null); } public Mod(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Monday.java b/src/main/java/com/rethinkdb/gen/ast/Monday.java index 415c3d17..04a242a5 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Monday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Monday.java @@ -16,7 +16,7 @@ public class Monday extends ReqlExpr { public Monday(Object arg) { this(new Arguments(arg), null); } - public Monday(Arguments args){ + public Monday(Arguments args) { this(args, null); } public Monday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Month.java b/src/main/java/com/rethinkdb/gen/ast/Month.java index 57721436..1755f5f6 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Month.java +++ b/src/main/java/com/rethinkdb/gen/ast/Month.java @@ -16,7 +16,7 @@ public class Month extends ReqlExpr { public Month(Object arg) { this(new Arguments(arg), null); } - public Month(Arguments args){ + public Month(Arguments args) { this(args, null); } public Month(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Mul.java b/src/main/java/com/rethinkdb/gen/ast/Mul.java index aaa07abd..54f7c69d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Mul.java +++ b/src/main/java/com/rethinkdb/gen/ast/Mul.java @@ -16,7 +16,7 @@ public class Mul extends ReqlExpr { public Mul(Object arg) { this(new Arguments(arg), null); } - public Mul(Arguments args){ + public Mul(Arguments args) { this(args, null); } public Mul(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Ne.java b/src/main/java/com/rethinkdb/gen/ast/Ne.java index d0b01f90..ad85e5ed 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Ne.java +++ b/src/main/java/com/rethinkdb/gen/ast/Ne.java @@ -16,7 +16,7 @@ public class Ne extends ReqlExpr { public Ne(Object arg) { this(new Arguments(arg), null); } - public Ne(Arguments args){ + public Ne(Arguments args) { this(args, null); } public Ne(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Not.java b/src/main/java/com/rethinkdb/gen/ast/Not.java index d7e4c784..34abef2c 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Not.java +++ b/src/main/java/com/rethinkdb/gen/ast/Not.java @@ -16,7 +16,7 @@ public class Not extends ReqlExpr { public Not(Object arg) { this(new Arguments(arg), null); } - public Not(Arguments args){ + public Not(Arguments args) { this(args, null); } public Not(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/November.java b/src/main/java/com/rethinkdb/gen/ast/November.java index 0222f09d..b2134cbc 100644 --- a/src/main/java/com/rethinkdb/gen/ast/November.java +++ b/src/main/java/com/rethinkdb/gen/ast/November.java @@ -16,7 +16,7 @@ public class November extends ReqlExpr { public November(Object arg) { this(new Arguments(arg), null); } - public November(Arguments args){ + public November(Arguments args) { this(args, null); } public November(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Now.java b/src/main/java/com/rethinkdb/gen/ast/Now.java index dd966810..b7a2b135 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Now.java +++ b/src/main/java/com/rethinkdb/gen/ast/Now.java @@ -16,7 +16,7 @@ public class Now extends ReqlExpr { public Now(Object arg) { this(new Arguments(arg), null); } - public Now(Arguments args){ + public Now(Arguments args) { this(args, null); } public Now(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Nth.java b/src/main/java/com/rethinkdb/gen/ast/Nth.java index 11816315..58b57908 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Nth.java +++ b/src/main/java/com/rethinkdb/gen/ast/Nth.java @@ -16,7 +16,7 @@ public class Nth extends ReqlExpr { public Nth(Object arg) { this(new Arguments(arg), null); } - public Nth(Arguments args){ + public Nth(Arguments args) { this(args, null); } public Nth(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/October.java b/src/main/java/com/rethinkdb/gen/ast/October.java index 8100f744..4b6a7c7c 100644 --- a/src/main/java/com/rethinkdb/gen/ast/October.java +++ b/src/main/java/com/rethinkdb/gen/ast/October.java @@ -16,7 +16,7 @@ public class October extends ReqlExpr { public October(Object arg) { this(new Arguments(arg), null); } - public October(Arguments args){ + public October(Arguments args) { this(args, null); } public October(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/OffsetsOf.java b/src/main/java/com/rethinkdb/gen/ast/OffsetsOf.java index cb4a44df..bb7ea491 100644 --- a/src/main/java/com/rethinkdb/gen/ast/OffsetsOf.java +++ b/src/main/java/com/rethinkdb/gen/ast/OffsetsOf.java @@ -16,7 +16,7 @@ public class OffsetsOf extends ReqlExpr { public OffsetsOf(Object arg) { this(new Arguments(arg), null); } - public OffsetsOf(Arguments args){ + public OffsetsOf(Arguments args) { this(args, null); } public OffsetsOf(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Or.java b/src/main/java/com/rethinkdb/gen/ast/Or.java index 042e73fb..81b5defa 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Or.java +++ b/src/main/java/com/rethinkdb/gen/ast/Or.java @@ -16,7 +16,7 @@ public class Or extends ReqlExpr { public Or(Object arg) { this(new Arguments(arg), null); } - public Or(Arguments args){ + public Or(Arguments args) { this(args, null); } public Or(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/OrderBy.java b/src/main/java/com/rethinkdb/gen/ast/OrderBy.java index 27b07d74..cdaae92e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/OrderBy.java +++ b/src/main/java/com/rethinkdb/gen/ast/OrderBy.java @@ -16,7 +16,7 @@ public class OrderBy extends ReqlExpr { public OrderBy(Object arg) { this(new Arguments(arg), null); } - public OrderBy(Arguments args){ + public OrderBy(Arguments args) { this(args, null); } public OrderBy(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/OuterJoin.java b/src/main/java/com/rethinkdb/gen/ast/OuterJoin.java index 66b71b87..361bd915 100644 --- a/src/main/java/com/rethinkdb/gen/ast/OuterJoin.java +++ b/src/main/java/com/rethinkdb/gen/ast/OuterJoin.java @@ -16,7 +16,7 @@ public class OuterJoin extends ReqlExpr { public OuterJoin(Object arg) { this(new Arguments(arg), null); } - public OuterJoin(Arguments args){ + public OuterJoin(Arguments args) { this(args, null); } public OuterJoin(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Pluck.java b/src/main/java/com/rethinkdb/gen/ast/Pluck.java index 533ffe4c..0b08a0b3 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Pluck.java +++ b/src/main/java/com/rethinkdb/gen/ast/Pluck.java @@ -16,7 +16,7 @@ public class Pluck extends ReqlExpr { public Pluck(Object arg) { this(new Arguments(arg), null); } - public Pluck(Arguments args){ + public Pluck(Arguments args) { this(args, null); } public Pluck(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Point.java b/src/main/java/com/rethinkdb/gen/ast/Point.java index e6e0221f..e044614e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Point.java +++ b/src/main/java/com/rethinkdb/gen/ast/Point.java @@ -16,7 +16,7 @@ public class Point extends ReqlExpr { public Point(Object arg) { this(new Arguments(arg), null); } - public Point(Arguments args){ + public Point(Arguments args) { this(args, null); } public Point(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Polygon.java b/src/main/java/com/rethinkdb/gen/ast/Polygon.java index 88174d47..de93c7c7 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Polygon.java +++ b/src/main/java/com/rethinkdb/gen/ast/Polygon.java @@ -16,7 +16,7 @@ public class Polygon extends ReqlExpr { public Polygon(Object arg) { this(new Arguments(arg), null); } - public Polygon(Arguments args){ + public Polygon(Arguments args) { this(args, null); } public Polygon(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/PolygonSub.java b/src/main/java/com/rethinkdb/gen/ast/PolygonSub.java index ffe31b86..1aba83d2 100644 --- a/src/main/java/com/rethinkdb/gen/ast/PolygonSub.java +++ b/src/main/java/com/rethinkdb/gen/ast/PolygonSub.java @@ -16,7 +16,7 @@ public class PolygonSub extends ReqlExpr { public PolygonSub(Object arg) { this(new Arguments(arg), null); } - public PolygonSub(Arguments args){ + public PolygonSub(Arguments args) { this(args, null); } public PolygonSub(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Prepend.java b/src/main/java/com/rethinkdb/gen/ast/Prepend.java index 6f51d8a6..646bb81c 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Prepend.java +++ b/src/main/java/com/rethinkdb/gen/ast/Prepend.java @@ -16,7 +16,7 @@ public class Prepend extends ReqlExpr { public Prepend(Object arg) { this(new Arguments(arg), null); } - public Prepend(Arguments args){ + public Prepend(Arguments args) { this(args, null); } public Prepend(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Random.java b/src/main/java/com/rethinkdb/gen/ast/Random.java index 0a254b27..645ba902 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Random.java +++ b/src/main/java/com/rethinkdb/gen/ast/Random.java @@ -16,7 +16,7 @@ public class Random extends ReqlExpr { public Random(Object arg) { this(new Arguments(arg), null); } - public Random(Arguments args){ + public Random(Arguments args) { this(args, null); } public Random(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Range.java b/src/main/java/com/rethinkdb/gen/ast/Range.java index 21b06b7f..34e7ece8 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Range.java +++ b/src/main/java/com/rethinkdb/gen/ast/Range.java @@ -16,7 +16,7 @@ public class Range extends ReqlExpr { public Range(Object arg) { this(new Arguments(arg), null); } - public Range(Arguments args){ + public Range(Arguments args) { this(args, null); } public Range(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Rebalance.java b/src/main/java/com/rethinkdb/gen/ast/Rebalance.java index 66f27206..9016cc82 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Rebalance.java +++ b/src/main/java/com/rethinkdb/gen/ast/Rebalance.java @@ -16,7 +16,7 @@ public class Rebalance extends ReqlExpr { public Rebalance(Object arg) { this(new Arguments(arg), null); } - public Rebalance(Arguments args){ + public Rebalance(Arguments args) { this(args, null); } public Rebalance(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Reconfigure.java b/src/main/java/com/rethinkdb/gen/ast/Reconfigure.java index 72b00da3..1c67f6e7 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Reconfigure.java +++ b/src/main/java/com/rethinkdb/gen/ast/Reconfigure.java @@ -16,7 +16,7 @@ public class Reconfigure extends ReqlExpr { public Reconfigure(Object arg) { this(new Arguments(arg), null); } - public Reconfigure(Arguments args){ + public Reconfigure(Arguments args) { this(args, null); } public Reconfigure(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Reduce.java b/src/main/java/com/rethinkdb/gen/ast/Reduce.java index 459151fc..d7a11daf 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Reduce.java +++ b/src/main/java/com/rethinkdb/gen/ast/Reduce.java @@ -16,7 +16,7 @@ public class Reduce extends ReqlExpr { public Reduce(Object arg) { this(new Arguments(arg), null); } - public Reduce(Arguments args){ + public Reduce(Arguments args) { this(args, null); } public Reduce(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Replace.java b/src/main/java/com/rethinkdb/gen/ast/Replace.java index 0b40cbeb..6b33a0fd 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Replace.java +++ b/src/main/java/com/rethinkdb/gen/ast/Replace.java @@ -16,7 +16,7 @@ public class Replace extends ReqlExpr { public Replace(Object arg) { this(new Arguments(arg), null); } - public Replace(Arguments args){ + public Replace(Arguments args) { this(args, null); } public Replace(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ReqlExpr.java b/src/main/java/com/rethinkdb/gen/ast/ReqlExpr.java index 4f7a8a1f..59e5c3ae 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ReqlExpr.java +++ b/src/main/java/com/rethinkdb/gen/ast/ReqlExpr.java @@ -13,7 +13,7 @@ public class ReqlExpr extends ReqlAst { - protected ReqlExpr(TermType termType, Arguments args, OptArgs optargs){ + protected ReqlExpr(TermType termType, Arguments args, OptArgs optargs) { super(termType, args, optargs); } diff --git a/src/main/java/com/rethinkdb/gen/ast/ReqlObject.java b/src/main/java/com/rethinkdb/gen/ast/ReqlObject.java index ed3eab2c..7a7cfc39 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ReqlObject.java +++ b/src/main/java/com/rethinkdb/gen/ast/ReqlObject.java @@ -16,7 +16,7 @@ public class ReqlObject extends ReqlExpr { public ReqlObject(Object arg) { this(new Arguments(arg), null); } - public ReqlObject(Arguments args){ + public ReqlObject(Arguments args) { this(args, null); } public ReqlObject(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Round.java b/src/main/java/com/rethinkdb/gen/ast/Round.java index 7c885518..94fefcf0 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Round.java +++ b/src/main/java/com/rethinkdb/gen/ast/Round.java @@ -16,7 +16,7 @@ public class Round extends ReqlExpr { public Round(Object arg) { this(new Arguments(arg), null); } - public Round(Arguments args){ + public Round(Arguments args) { this(args, null); } public Round(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Sample.java b/src/main/java/com/rethinkdb/gen/ast/Sample.java index 77eeb9b5..c49a2cb6 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Sample.java +++ b/src/main/java/com/rethinkdb/gen/ast/Sample.java @@ -16,7 +16,7 @@ public class Sample extends ReqlExpr { public Sample(Object arg) { this(new Arguments(arg), null); } - public Sample(Arguments args){ + public Sample(Arguments args) { this(args, null); } public Sample(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Saturday.java b/src/main/java/com/rethinkdb/gen/ast/Saturday.java index 76701c89..ea90bcbc 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Saturday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Saturday.java @@ -16,7 +16,7 @@ public class Saturday extends ReqlExpr { public Saturday(Object arg) { this(new Arguments(arg), null); } - public Saturday(Arguments args){ + public Saturday(Arguments args) { this(args, null); } public Saturday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Seconds.java b/src/main/java/com/rethinkdb/gen/ast/Seconds.java index e065447b..c67daff7 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Seconds.java +++ b/src/main/java/com/rethinkdb/gen/ast/Seconds.java @@ -16,7 +16,7 @@ public class Seconds extends ReqlExpr { public Seconds(Object arg) { this(new Arguments(arg), null); } - public Seconds(Arguments args){ + public Seconds(Arguments args) { this(args, null); } public Seconds(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/September.java b/src/main/java/com/rethinkdb/gen/ast/September.java index fbcd43d4..a5c1414b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/September.java +++ b/src/main/java/com/rethinkdb/gen/ast/September.java @@ -16,7 +16,7 @@ public class September extends ReqlExpr { public September(Object arg) { this(new Arguments(arg), null); } - public September(Arguments args){ + public September(Arguments args) { this(args, null); } public September(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/SetDifference.java b/src/main/java/com/rethinkdb/gen/ast/SetDifference.java index e6082cf3..f3f62dd4 100644 --- a/src/main/java/com/rethinkdb/gen/ast/SetDifference.java +++ b/src/main/java/com/rethinkdb/gen/ast/SetDifference.java @@ -16,7 +16,7 @@ public class SetDifference extends ReqlExpr { public SetDifference(Object arg) { this(new Arguments(arg), null); } - public SetDifference(Arguments args){ + public SetDifference(Arguments args) { this(args, null); } public SetDifference(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/SetInsert.java b/src/main/java/com/rethinkdb/gen/ast/SetInsert.java index ed214eef..76a68f05 100644 --- a/src/main/java/com/rethinkdb/gen/ast/SetInsert.java +++ b/src/main/java/com/rethinkdb/gen/ast/SetInsert.java @@ -16,7 +16,7 @@ public class SetInsert extends ReqlExpr { public SetInsert(Object arg) { this(new Arguments(arg), null); } - public SetInsert(Arguments args){ + public SetInsert(Arguments args) { this(args, null); } public SetInsert(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/SetIntersection.java b/src/main/java/com/rethinkdb/gen/ast/SetIntersection.java index 6966fb72..99afba87 100644 --- a/src/main/java/com/rethinkdb/gen/ast/SetIntersection.java +++ b/src/main/java/com/rethinkdb/gen/ast/SetIntersection.java @@ -16,7 +16,7 @@ public class SetIntersection extends ReqlExpr { public SetIntersection(Object arg) { this(new Arguments(arg), null); } - public SetIntersection(Arguments args){ + public SetIntersection(Arguments args) { this(args, null); } public SetIntersection(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/SetUnion.java b/src/main/java/com/rethinkdb/gen/ast/SetUnion.java index 0f43c9e0..d5e79135 100644 --- a/src/main/java/com/rethinkdb/gen/ast/SetUnion.java +++ b/src/main/java/com/rethinkdb/gen/ast/SetUnion.java @@ -16,7 +16,7 @@ public class SetUnion extends ReqlExpr { public SetUnion(Object arg) { this(new Arguments(arg), null); } - public SetUnion(Arguments args){ + public SetUnion(Arguments args) { this(args, null); } public SetUnion(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/SetWriteHook.java b/src/main/java/com/rethinkdb/gen/ast/SetWriteHook.java index de837ae6..57db1a2e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/SetWriteHook.java +++ b/src/main/java/com/rethinkdb/gen/ast/SetWriteHook.java @@ -16,7 +16,7 @@ public class SetWriteHook extends ReqlExpr { public SetWriteHook(Object arg) { this(new Arguments(arg), null); } - public SetWriteHook(Arguments args){ + public SetWriteHook(Arguments args) { this(args, null); } public SetWriteHook(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Skip.java b/src/main/java/com/rethinkdb/gen/ast/Skip.java index 025a72ff..59b0cc0c 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Skip.java +++ b/src/main/java/com/rethinkdb/gen/ast/Skip.java @@ -16,7 +16,7 @@ public class Skip extends ReqlExpr { public Skip(Object arg) { this(new Arguments(arg), null); } - public Skip(Arguments args){ + public Skip(Arguments args) { this(args, null); } public Skip(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Slice.java b/src/main/java/com/rethinkdb/gen/ast/Slice.java index 5c888793..f7c44c6b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Slice.java +++ b/src/main/java/com/rethinkdb/gen/ast/Slice.java @@ -16,7 +16,7 @@ public class Slice extends ReqlExpr { public Slice(Object arg) { this(new Arguments(arg), null); } - public Slice(Arguments args){ + public Slice(Arguments args) { this(args, null); } public Slice(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/SpliceAt.java b/src/main/java/com/rethinkdb/gen/ast/SpliceAt.java index 05255eb7..052e4fb7 100644 --- a/src/main/java/com/rethinkdb/gen/ast/SpliceAt.java +++ b/src/main/java/com/rethinkdb/gen/ast/SpliceAt.java @@ -16,7 +16,7 @@ public class SpliceAt extends ReqlExpr { public SpliceAt(Object arg) { this(new Arguments(arg), null); } - public SpliceAt(Arguments args){ + public SpliceAt(Arguments args) { this(args, null); } public SpliceAt(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Split.java b/src/main/java/com/rethinkdb/gen/ast/Split.java index 6e065944..366e896e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Split.java +++ b/src/main/java/com/rethinkdb/gen/ast/Split.java @@ -16,7 +16,7 @@ public class Split extends ReqlExpr { public Split(Object arg) { this(new Arguments(arg), null); } - public Split(Arguments args){ + public Split(Arguments args) { this(args, null); } public Split(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Status.java b/src/main/java/com/rethinkdb/gen/ast/Status.java index e28210bc..987fb823 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Status.java +++ b/src/main/java/com/rethinkdb/gen/ast/Status.java @@ -16,7 +16,7 @@ public class Status extends ReqlExpr { public Status(Object arg) { this(new Arguments(arg), null); } - public Status(Arguments args){ + public Status(Arguments args) { this(args, null); } public Status(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Sub.java b/src/main/java/com/rethinkdb/gen/ast/Sub.java index 9d83067f..b224ff94 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Sub.java +++ b/src/main/java/com/rethinkdb/gen/ast/Sub.java @@ -16,7 +16,7 @@ public class Sub extends ReqlExpr { public Sub(Object arg) { this(new Arguments(arg), null); } - public Sub(Arguments args){ + public Sub(Arguments args) { this(args, null); } public Sub(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Sum.java b/src/main/java/com/rethinkdb/gen/ast/Sum.java index 234184dc..66d5b0b1 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Sum.java +++ b/src/main/java/com/rethinkdb/gen/ast/Sum.java @@ -16,7 +16,7 @@ public class Sum extends ReqlExpr { public Sum(Object arg) { this(new Arguments(arg), null); } - public Sum(Arguments args){ + public Sum(Arguments args) { this(args, null); } public Sum(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Sunday.java b/src/main/java/com/rethinkdb/gen/ast/Sunday.java index 52c7c806..80c392d1 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Sunday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Sunday.java @@ -16,7 +16,7 @@ public class Sunday extends ReqlExpr { public Sunday(Object arg) { this(new Arguments(arg), null); } - public Sunday(Arguments args){ + public Sunday(Arguments args) { this(args, null); } public Sunday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Sync.java b/src/main/java/com/rethinkdb/gen/ast/Sync.java index 48f612e6..fe20087b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Sync.java +++ b/src/main/java/com/rethinkdb/gen/ast/Sync.java @@ -16,7 +16,7 @@ public class Sync extends ReqlExpr { public Sync(Object arg) { this(new Arguments(arg), null); } - public Sync(Arguments args){ + public Sync(Arguments args) { this(args, null); } public Sync(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Table.java b/src/main/java/com/rethinkdb/gen/ast/Table.java index 0465fedf..df16eebe 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Table.java +++ b/src/main/java/com/rethinkdb/gen/ast/Table.java @@ -16,7 +16,7 @@ public class Table extends ReqlExpr { public Table(Object arg) { this(new Arguments(arg), null); } - public Table(Arguments args){ + public Table(Arguments args) { this(args, null); } public Table(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/TableCreate.java b/src/main/java/com/rethinkdb/gen/ast/TableCreate.java index c996acb0..fc456214 100644 --- a/src/main/java/com/rethinkdb/gen/ast/TableCreate.java +++ b/src/main/java/com/rethinkdb/gen/ast/TableCreate.java @@ -16,7 +16,7 @@ public class TableCreate extends ReqlExpr { public TableCreate(Object arg) { this(new Arguments(arg), null); } - public TableCreate(Arguments args){ + public TableCreate(Arguments args) { this(args, null); } public TableCreate(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/TableDrop.java b/src/main/java/com/rethinkdb/gen/ast/TableDrop.java index d0bbda24..8c561d8a 100644 --- a/src/main/java/com/rethinkdb/gen/ast/TableDrop.java +++ b/src/main/java/com/rethinkdb/gen/ast/TableDrop.java @@ -16,7 +16,7 @@ public class TableDrop extends ReqlExpr { public TableDrop(Object arg) { this(new Arguments(arg), null); } - public TableDrop(Arguments args){ + public TableDrop(Arguments args) { this(args, null); } public TableDrop(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/TableList.java b/src/main/java/com/rethinkdb/gen/ast/TableList.java index 7e26740e..37d8ddd9 100644 --- a/src/main/java/com/rethinkdb/gen/ast/TableList.java +++ b/src/main/java/com/rethinkdb/gen/ast/TableList.java @@ -16,7 +16,7 @@ public class TableList extends ReqlExpr { public TableList(Object arg) { this(new Arguments(arg), null); } - public TableList(Arguments args){ + public TableList(Arguments args) { this(args, null); } public TableList(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Thursday.java b/src/main/java/com/rethinkdb/gen/ast/Thursday.java index 136e0064..f79e1eaa 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Thursday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Thursday.java @@ -16,7 +16,7 @@ public class Thursday extends ReqlExpr { public Thursday(Object arg) { this(new Arguments(arg), null); } - public Thursday(Arguments args){ + public Thursday(Arguments args) { this(args, null); } public Thursday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Time.java b/src/main/java/com/rethinkdb/gen/ast/Time.java index 6dd7e1eb..485383a5 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Time.java +++ b/src/main/java/com/rethinkdb/gen/ast/Time.java @@ -16,7 +16,7 @@ public class Time extends ReqlExpr { public Time(Object arg) { this(new Arguments(arg), null); } - public Time(Arguments args){ + public Time(Arguments args) { this(args, null); } public Time(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/TimeOfDay.java b/src/main/java/com/rethinkdb/gen/ast/TimeOfDay.java index 205de472..ad27d90b 100644 --- a/src/main/java/com/rethinkdb/gen/ast/TimeOfDay.java +++ b/src/main/java/com/rethinkdb/gen/ast/TimeOfDay.java @@ -16,7 +16,7 @@ public class TimeOfDay extends ReqlExpr { public TimeOfDay(Object arg) { this(new Arguments(arg), null); } - public TimeOfDay(Arguments args){ + public TimeOfDay(Arguments args) { this(args, null); } public TimeOfDay(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Timezone.java b/src/main/java/com/rethinkdb/gen/ast/Timezone.java index 31d8305b..12b0a12f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Timezone.java +++ b/src/main/java/com/rethinkdb/gen/ast/Timezone.java @@ -16,7 +16,7 @@ public class Timezone extends ReqlExpr { public Timezone(Object arg) { this(new Arguments(arg), null); } - public Timezone(Arguments args){ + public Timezone(Arguments args) { this(args, null); } public Timezone(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ToEpochTime.java b/src/main/java/com/rethinkdb/gen/ast/ToEpochTime.java index aa27c490..b95ff700 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ToEpochTime.java +++ b/src/main/java/com/rethinkdb/gen/ast/ToEpochTime.java @@ -16,7 +16,7 @@ public class ToEpochTime extends ReqlExpr { public ToEpochTime(Object arg) { this(new Arguments(arg), null); } - public ToEpochTime(Arguments args){ + public ToEpochTime(Arguments args) { this(args, null); } public ToEpochTime(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ToGeojson.java b/src/main/java/com/rethinkdb/gen/ast/ToGeojson.java index 468df38e..fcc1ccb3 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ToGeojson.java +++ b/src/main/java/com/rethinkdb/gen/ast/ToGeojson.java @@ -16,7 +16,7 @@ public class ToGeojson extends ReqlExpr { public ToGeojson(Object arg) { this(new Arguments(arg), null); } - public ToGeojson(Arguments args){ + public ToGeojson(Arguments args) { this(args, null); } public ToGeojson(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ToIso8601.java b/src/main/java/com/rethinkdb/gen/ast/ToIso8601.java index 5d195da7..f9adc7ce 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ToIso8601.java +++ b/src/main/java/com/rethinkdb/gen/ast/ToIso8601.java @@ -16,7 +16,7 @@ public class ToIso8601 extends ReqlExpr { public ToIso8601(Object arg) { this(new Arguments(arg), null); } - public ToIso8601(Arguments args){ + public ToIso8601(Arguments args) { this(args, null); } public ToIso8601(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/ToJsonString.java b/src/main/java/com/rethinkdb/gen/ast/ToJsonString.java index 6252f766..72f366f8 100644 --- a/src/main/java/com/rethinkdb/gen/ast/ToJsonString.java +++ b/src/main/java/com/rethinkdb/gen/ast/ToJsonString.java @@ -16,7 +16,7 @@ public class ToJsonString extends ReqlExpr { public ToJsonString(Object arg) { this(new Arguments(arg), null); } - public ToJsonString(Arguments args){ + public ToJsonString(Arguments args) { this(args, null); } public ToJsonString(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Tuesday.java b/src/main/java/com/rethinkdb/gen/ast/Tuesday.java index 1991b3f9..6658b7dc 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Tuesday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Tuesday.java @@ -16,7 +16,7 @@ public class Tuesday extends ReqlExpr { public Tuesday(Object arg) { this(new Arguments(arg), null); } - public Tuesday(Arguments args){ + public Tuesday(Arguments args) { this(args, null); } public Tuesday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/TypeOf.java b/src/main/java/com/rethinkdb/gen/ast/TypeOf.java index 4294e3e8..18a85a87 100644 --- a/src/main/java/com/rethinkdb/gen/ast/TypeOf.java +++ b/src/main/java/com/rethinkdb/gen/ast/TypeOf.java @@ -16,7 +16,7 @@ public class TypeOf extends ReqlExpr { public TypeOf(Object arg) { this(new Arguments(arg), null); } - public TypeOf(Arguments args){ + public TypeOf(Arguments args) { this(args, null); } public TypeOf(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Ungroup.java b/src/main/java/com/rethinkdb/gen/ast/Ungroup.java index e1bf12bc..8af19c8c 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Ungroup.java +++ b/src/main/java/com/rethinkdb/gen/ast/Ungroup.java @@ -16,7 +16,7 @@ public class Ungroup extends ReqlExpr { public Ungroup(Object arg) { this(new Arguments(arg), null); } - public Ungroup(Arguments args){ + public Ungroup(Arguments args) { this(args, null); } public Ungroup(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Union.java b/src/main/java/com/rethinkdb/gen/ast/Union.java index c7a036de..d497cea0 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Union.java +++ b/src/main/java/com/rethinkdb/gen/ast/Union.java @@ -16,7 +16,7 @@ public class Union extends ReqlExpr { public Union(Object arg) { this(new Arguments(arg), null); } - public Union(Arguments args){ + public Union(Arguments args) { this(args, null); } public Union(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Upcase.java b/src/main/java/com/rethinkdb/gen/ast/Upcase.java index 41640117..804b1a7f 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Upcase.java +++ b/src/main/java/com/rethinkdb/gen/ast/Upcase.java @@ -16,7 +16,7 @@ public class Upcase extends ReqlExpr { public Upcase(Object arg) { this(new Arguments(arg), null); } - public Upcase(Arguments args){ + public Upcase(Arguments args) { this(args, null); } public Upcase(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Update.java b/src/main/java/com/rethinkdb/gen/ast/Update.java index e6c9d5e4..21ad7475 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Update.java +++ b/src/main/java/com/rethinkdb/gen/ast/Update.java @@ -16,7 +16,7 @@ public class Update extends ReqlExpr { public Update(Object arg) { this(new Arguments(arg), null); } - public Update(Arguments args){ + public Update(Arguments args) { this(args, null); } public Update(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Uuid.java b/src/main/java/com/rethinkdb/gen/ast/Uuid.java index b0ad7f39..fb1e2074 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Uuid.java +++ b/src/main/java/com/rethinkdb/gen/ast/Uuid.java @@ -16,7 +16,7 @@ public class Uuid extends ReqlExpr { public Uuid(Object arg) { this(new Arguments(arg), null); } - public Uuid(Arguments args){ + public Uuid(Arguments args) { this(args, null); } public Uuid(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Values.java b/src/main/java/com/rethinkdb/gen/ast/Values.java index 2e97c77a..ca853e57 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Values.java +++ b/src/main/java/com/rethinkdb/gen/ast/Values.java @@ -16,7 +16,7 @@ public class Values extends ReqlExpr { public Values(Object arg) { this(new Arguments(arg), null); } - public Values(Arguments args){ + public Values(Arguments args) { this(args, null); } public Values(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Var.java b/src/main/java/com/rethinkdb/gen/ast/Var.java index 6c727b4e..ee74ed11 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Var.java +++ b/src/main/java/com/rethinkdb/gen/ast/Var.java @@ -16,7 +16,7 @@ public class Var extends ReqlExpr { public Var(Object arg) { this(new Arguments(arg), null); } - public Var(Arguments args){ + public Var(Arguments args) { this(args, null); } public Var(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Wait.java b/src/main/java/com/rethinkdb/gen/ast/Wait.java index ec51c5f4..1919bd54 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Wait.java +++ b/src/main/java/com/rethinkdb/gen/ast/Wait.java @@ -16,7 +16,7 @@ public class Wait extends ReqlExpr { public Wait(Object arg) { this(new Arguments(arg), null); } - public Wait(Arguments args){ + public Wait(Arguments args) { this(args, null); } public Wait(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Wednesday.java b/src/main/java/com/rethinkdb/gen/ast/Wednesday.java index bfd47139..9e1a18a3 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Wednesday.java +++ b/src/main/java/com/rethinkdb/gen/ast/Wednesday.java @@ -16,7 +16,7 @@ public class Wednesday extends ReqlExpr { public Wednesday(Object arg) { this(new Arguments(arg), null); } - public Wednesday(Arguments args){ + public Wednesday(Arguments args) { this(args, null); } public Wednesday(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/WithFields.java b/src/main/java/com/rethinkdb/gen/ast/WithFields.java index a82ec65b..7f1d3942 100644 --- a/src/main/java/com/rethinkdb/gen/ast/WithFields.java +++ b/src/main/java/com/rethinkdb/gen/ast/WithFields.java @@ -16,7 +16,7 @@ public class WithFields extends ReqlExpr { public WithFields(Object arg) { this(new Arguments(arg), null); } - public WithFields(Arguments args){ + public WithFields(Arguments args) { this(args, null); } public WithFields(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Without.java b/src/main/java/com/rethinkdb/gen/ast/Without.java index e1b3c834..2877d79d 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Without.java +++ b/src/main/java/com/rethinkdb/gen/ast/Without.java @@ -16,7 +16,7 @@ public class Without extends ReqlExpr { public Without(Object arg) { this(new Arguments(arg), null); } - public Without(Arguments args){ + public Without(Arguments args) { this(args, null); } public Without(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Year.java b/src/main/java/com/rethinkdb/gen/ast/Year.java index 6e03a82d..860c2cdb 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Year.java +++ b/src/main/java/com/rethinkdb/gen/ast/Year.java @@ -16,7 +16,7 @@ public class Year extends ReqlExpr { public Year(Object arg) { this(new Arguments(arg), null); } - public Year(Arguments args){ + public Year(Arguments args) { this(args, null); } public Year(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/ast/Zip.java b/src/main/java/com/rethinkdb/gen/ast/Zip.java index 37a3ade0..400a8b9e 100644 --- a/src/main/java/com/rethinkdb/gen/ast/Zip.java +++ b/src/main/java/com/rethinkdb/gen/ast/Zip.java @@ -16,7 +16,7 @@ public class Zip extends ReqlExpr { public Zip(Object arg) { this(new Arguments(arg), null); } - public Zip(Arguments args){ + public Zip(Arguments args) { this(args, null); } public Zip(Arguments args, OptArgs optargs) { diff --git a/src/main/java/com/rethinkdb/gen/model/TopLevel.java b/src/main/java/com/rethinkdb/gen/model/TopLevel.java index e9017c72..eb3ffb25 100644 --- a/src/main/java/com/rethinkdb/gen/model/TopLevel.java +++ b/src/main/java/com/rethinkdb/gen/model/TopLevel.java @@ -10,8 +10,8 @@ import com.rethinkdb.model.MapObject; import com.rethinkdb.gen.ast.Error; import com.rethinkdb.gen.ast.*; -import com.rethinkdb.ast.Util; import com.rethinkdb.gen.exc.ReqlDriverError; +import com.rethinkdb.utils.Internals; import java.util.Arrays; import java.util.ArrayList; @@ -21,7 +21,7 @@ public class TopLevel { public ReqlExpr expr(Object value){ - return Util.toReqlExpr(value); + return Internals.toReqlExpr(value); } public ReqlExpr row(Object... values) { diff --git a/src/main/java/com/rethinkdb/gen/proto/DatumType.java b/src/main/java/com/rethinkdb/gen/proto/DatumType.java index 1eb0f50b..7ce94b13 100644 --- a/src/main/java/com/rethinkdb/gen/proto/DatumType.java +++ b/src/main/java/com/rethinkdb/gen/proto/DatumType.java @@ -19,7 +19,7 @@ public enum DatumType { public final int value; - private DatumType(int value){ + private DatumType(int value) { this.value = value; } @@ -33,8 +33,7 @@ public static DatumType fromValue(int value) { case 6: return DatumType.R_OBJECT; case 7: return DatumType.R_JSON; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for DatumType", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for DatumType", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/ErrorType.java b/src/main/java/com/rethinkdb/gen/proto/ErrorType.java index 1d6595ea..8b830dd2 100644 --- a/src/main/java/com/rethinkdb/gen/proto/ErrorType.java +++ b/src/main/java/com/rethinkdb/gen/proto/ErrorType.java @@ -20,7 +20,7 @@ public enum ErrorType { public final int value; - private ErrorType(int value){ + private ErrorType(int value) { this.value = value; } @@ -35,8 +35,7 @@ public static ErrorType fromValue(int value) { case 5000000: return ErrorType.USER; case 6000000: return ErrorType.PERMISSION_ERROR; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for ErrorType", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for ErrorType", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/Protocol.java b/src/main/java/com/rethinkdb/gen/proto/Protocol.java index 6b88a8a3..ec922007 100644 --- a/src/main/java/com/rethinkdb/gen/proto/Protocol.java +++ b/src/main/java/com/rethinkdb/gen/proto/Protocol.java @@ -14,7 +14,7 @@ public enum Protocol { public final int value; - private Protocol(int value){ + private Protocol(int value) { this.value = value; } @@ -23,8 +23,7 @@ public static Protocol fromValue(int value) { case 656407617: return Protocol.PROTOBUF; case 2120839367: return Protocol.JSON; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for Protocol", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for Protocol", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/QueryType.java b/src/main/java/com/rethinkdb/gen/proto/QueryType.java index d848fcbf..a1ef2393 100644 --- a/src/main/java/com/rethinkdb/gen/proto/QueryType.java +++ b/src/main/java/com/rethinkdb/gen/proto/QueryType.java @@ -17,7 +17,7 @@ public enum QueryType { public final int value; - private QueryType(int value){ + private QueryType(int value) { this.value = value; } @@ -29,8 +29,7 @@ public static QueryType fromValue(int value) { case 4: return QueryType.NOREPLY_WAIT; case 5: return QueryType.SERVER_INFO; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for QueryType", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for QueryType", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/ResponseNote.java b/src/main/java/com/rethinkdb/gen/proto/ResponseNote.java index 6b529722..2c277d76 100644 --- a/src/main/java/com/rethinkdb/gen/proto/ResponseNote.java +++ b/src/main/java/com/rethinkdb/gen/proto/ResponseNote.java @@ -17,7 +17,7 @@ public enum ResponseNote { public final int value; - private ResponseNote(int value){ + private ResponseNote(int value) { this.value = value; } @@ -29,8 +29,7 @@ public static ResponseNote fromValue(int value) { case 4: return ResponseNote.UNIONED_FEED; case 5: return ResponseNote.INCLUDES_STATES; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for ResponseNote", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for ResponseNote", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/ResponseType.java b/src/main/java/com/rethinkdb/gen/proto/ResponseType.java index fb39b49f..1ccfb901 100644 --- a/src/main/java/com/rethinkdb/gen/proto/ResponseType.java +++ b/src/main/java/com/rethinkdb/gen/proto/ResponseType.java @@ -20,7 +20,7 @@ public enum ResponseType { public final int value; - private ResponseType(int value){ + private ResponseType(int value) { this.value = value; } @@ -35,8 +35,7 @@ public static ResponseType fromValue(int value) { case 17: return ResponseType.COMPILE_ERROR; case 18: return ResponseType.RUNTIME_ERROR; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for ResponseType", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for ResponseType", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/TermType.java b/src/main/java/com/rethinkdb/gen/proto/TermType.java index cd63e1e7..b610558c 100644 --- a/src/main/java/com/rethinkdb/gen/proto/TermType.java +++ b/src/main/java/com/rethinkdb/gen/proto/TermType.java @@ -198,7 +198,7 @@ public enum TermType { public final int value; - private TermType(int value){ + private TermType(int value) { this.value = value; } @@ -391,8 +391,7 @@ public static TermType fromValue(int value) { case 195: return TermType.BIT_SAL; case 196: return TermType.BIT_SAR; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for TermType", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for TermType", value)); } } diff --git a/src/main/java/com/rethinkdb/gen/proto/Version.java b/src/main/java/com/rethinkdb/gen/proto/Version.java index e2572f0a..f7500467 100644 --- a/src/main/java/com/rethinkdb/gen/proto/Version.java +++ b/src/main/java/com/rethinkdb/gen/proto/Version.java @@ -17,7 +17,7 @@ public enum Version { public final int value; - private Version(int value){ + private Version(int value) { this.value = value; } @@ -29,8 +29,7 @@ public static Version fromValue(int value) { case 1074539808: return Version.V0_4; case 885177795: return Version.V1_0; default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for Version", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for Version", value)); } } diff --git a/src/main/java/com/rethinkdb/model/Arguments.java b/src/main/java/com/rethinkdb/model/Arguments.java index 8697458d..5ded0fd6 100644 --- a/src/main/java/com/rethinkdb/model/Arguments.java +++ b/src/main/java/com/rethinkdb/model/Arguments.java @@ -2,21 +2,17 @@ import com.rethinkdb.ast.ReqlAst; -import com.rethinkdb.ast.Util; +import com.rethinkdb.utils.Internals; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class Arguments extends ArrayList { public Arguments() {} - @SuppressWarnings("unchecked") public Arguments(Object arg) { if (arg instanceof List) { - coerceAndAddAll((List) arg); + coerceAndAddAll((List) arg); } else { coerceAndAdd(arg); } @@ -34,7 +30,7 @@ public Arguments(Object[] args) { coerceAndAddAll(args); } - public Arguments(List args) { + public Arguments(List args) { coerceAndAddAll(args); } @@ -43,7 +39,7 @@ public static Arguments make(Object... args) { } public void coerceAndAdd(Object obj) { - add(Util.toReqlAst(obj)); + add(Internals.toReqlAst(obj)); } public void coerceAndAddAll(Object[] args) { @@ -52,7 +48,7 @@ public void coerceAndAddAll(Object[] args) { } } - public void coerceAndAddAll(List args) { + public void coerceAndAddAll(List args) { args.forEach(this::coerceAndAdd); } } diff --git a/src/main/java/com/rethinkdb/model/OptArgs.java b/src/main/java/com/rethinkdb/model/OptArgs.java index 3b9147dd..d2d4535e 100644 --- a/src/main/java/com/rethinkdb/model/OptArgs.java +++ b/src/main/java/com/rethinkdb/model/OptArgs.java @@ -1,7 +1,7 @@ package com.rethinkdb.model; import com.rethinkdb.ast.ReqlAst; -import com.rethinkdb.ast.Util; +import com.rethinkdb.utils.Internals; import java.util.LinkedHashMap; import java.util.List; @@ -10,14 +10,14 @@ public class OptArgs extends LinkedHashMap { public OptArgs with(String key, Object value) { if (key != null) { - put(key, Util.toReqlAst(value)); + put(key, Internals.toReqlAst(value)); } return this; } public OptArgs with(String key, List value) { if (key != null) { - put(key, Util.toReqlAst(value)); + put(key, Internals.toReqlAst(value)); } return this; } diff --git a/src/main/java/com/rethinkdb/model/ReqlLambda.java b/src/main/java/com/rethinkdb/model/ReqlLambda.java index 7bcbee44..3eacf5e5 100644 --- a/src/main/java/com/rethinkdb/model/ReqlLambda.java +++ b/src/main/java/com/rethinkdb/model/ReqlLambda.java @@ -1,5 +1,4 @@ package com.rethinkdb.model; public interface ReqlLambda { - } diff --git a/src/main/java/com/rethinkdb/net/Connection.java b/src/main/java/com/rethinkdb/net/Connection.java index 9e8cf86f..1765d385 100644 --- a/src/main/java/com/rethinkdb/net/Connection.java +++ b/src/main/java/com/rethinkdb/net/Connection.java @@ -10,6 +10,7 @@ import com.rethinkdb.model.Arguments; import com.rethinkdb.model.OptArgs; import com.rethinkdb.model.Server; +import com.rethinkdb.utils.Internals; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -197,7 +198,7 @@ public boolean isOpen() { public @NotNull CompletableFuture serverAsync() { return sendQuery(Query.createServerInfo(nextToken.incrementAndGet())).thenApply(res -> { if (res.type.equals(ResponseType.SERVER_INFO)) { - return Util.convertToPojo(res.data.get(0), new TypeReference() {}); + return Internals.toPojo(res.data.get(0), new TypeReference() {}); } throw new ReqlDriverError("Did not receive a SERVER_INFO response."); }); diff --git a/src/main/java/com/rethinkdb/net/Converter.java b/src/main/java/com/rethinkdb/net/Converter.java deleted file mode 100644 index 7fa03fbc..00000000 --- a/src/main/java/com/rethinkdb/net/Converter.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.rethinkdb.net; - - -import com.rethinkdb.gen.ast.Datum; -import com.rethinkdb.gen.exc.ReqlDriverError; -import com.rethinkdb.model.GroupedResult; -import com.rethinkdb.model.MapObject; -import com.rethinkdb.model.OptArgs; - -import java.time.Instant; -import java.time.OffsetDateTime; -import java.time.ZoneOffset; -import java.util.*; -import java.util.function.UnaryOperator; -import java.util.stream.Collectors; - -public class Converter { - public static final String PSEUDOTYPE_KEY = "$reql_type$"; - public static final String TIME = "TIME"; - public static final String GROUPED_DATA = "GROUPED_DATA"; - public static final String GEOMETRY = "GEOMETRY"; - public static final String BINARY = "BINARY"; - - /* Compact way of keeping these flags around through multiple recursive passes */ - public static class FormatOptions { - public final boolean rawTime; - public final boolean rawGroups; - public final boolean rawBinary; - - public FormatOptions(OptArgs args) { - Datum time_format = (Datum) args.get("time_format"); - this.rawTime = time_format != null && "raw".equals(time_format.datum); - - Datum binary_format = (Datum) args.get("binary_format"); - this.rawBinary = binary_format != null && "raw".equals(binary_format.datum); - - Datum group_format = (Datum) args.get("group_format"); - this.rawGroups = group_format != null && "raw".equals(group_format.datum); - } - } - - public static Object convertPseudotypes(Object obj, FormatOptions fmt) { - if (obj instanceof List) { - return ((List) obj).stream() - .map(item -> convertPseudotypes(item, fmt)) - .collect(Collectors.toList()); - } - if (obj instanceof Map) { - Map map = (Map) obj; - if (map.containsKey(PSEUDOTYPE_KEY)) { - return handlePseudotypes(map, fmt); - } - return map.entrySet().stream().collect( - LinkedHashMap::new, - (m, e) -> m.put(e.getKey(), convertPseudotypes(e.getValue(), fmt)), - LinkedHashMap::putAll - ); - } - - return obj; - } - - private static Object handlePseudotypes(Map value, FormatOptions fmt) { - switch ((String) value.get(PSEUDOTYPE_KEY)) { - case TIME: { - if (fmt.rawTime) { - return value; - } - try { - long epochMillis = (long) (((Number) value.get("epoch_time")).doubleValue() * 1000.0); - return OffsetDateTime.ofInstant(Instant.ofEpochMilli(epochMillis), ZoneOffset.of((String) value.get("timezone"))); - } catch (Exception ex) { - throw new ReqlDriverError("Error handling date", ex); - } - } - case GROUPED_DATA: { - if (fmt.rawGroups) { - return value; - } - return ((List) value.get("data")).stream() - .map(it -> new ArrayList<>((Collection) it)) - .map(it -> new GroupedResult<>(it.remove(0), it)) - .collect(Collectors.toList()); - } - case BINARY: { - if (fmt.rawBinary) { - return value; - } - return Base64.getMimeDecoder().decode((String) value.get("data")); - } - case GEOMETRY: { - // Nothing specific here - return value; - } - } - return value; - } - - public static Map toBinary(byte[] data) { - return new MapObject() - .with("$reql_type$", BINARY) - .with("data", Base64.getEncoder().encodeToString(data)); - } -} diff --git a/src/main/java/com/rethinkdb/net/HandshakeProtocol.java b/src/main/java/com/rethinkdb/net/HandshakeProtocol.java index d01b3a18..8cc4cee5 100644 --- a/src/main/java/com/rethinkdb/net/HandshakeProtocol.java +++ b/src/main/java/com/rethinkdb/net/HandshakeProtocol.java @@ -1,10 +1,10 @@ package com.rethinkdb.net; -import com.rethinkdb.gen.ast.Wait; import com.rethinkdb.gen.exc.ReqlAuthError; import com.rethinkdb.gen.exc.ReqlDriverError; import com.rethinkdb.gen.proto.Protocol; import com.rethinkdb.gen.proto.Version; +import com.rethinkdb.utils.Internals; import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; @@ -14,7 +14,6 @@ import java.util.Map; import static com.rethinkdb.net.Crypto.*; -import static com.rethinkdb.net.Util.readJSON; /** * Internal class used by {@link Connection#connect()} to do a proper handshake with the server. @@ -96,7 +95,7 @@ static class WaitingForProtocolRange extends HandshakeProtocol { @Override public HandshakeProtocol nextState(String response) { - Map json = Util.readJSON(response); + Map json = Internals.readJson(response); throwIfFailure(json); long minVersion = (long) json.get("min_protocol_version"); long maxVersion = (long) json.get("max_protocol_version"); @@ -133,7 +132,7 @@ static class WaitingForAuthResponse extends HandshakeProtocol { @Override public HandshakeProtocol nextState(String response) { - Map json = Util.readJSON(response); + Map json = Internals.readJson(response); throwIfFailure(json); String serverFirstMessage = (String) json.get("authentication"); ScramAttributes serverAuth = ScramAttributes.from(serverFirstMessage); @@ -223,7 +222,7 @@ public WaitingForAuthSuccess(byte[] serverSignature, ByteBuffer message) { @Override public HandshakeProtocol nextState(String response) { - Map json = Util.readJSON(response); + Map json = Internals.readJson(response); throwIfFailure(json); ScramAttributes auth = ScramAttributes .from((String) json.get("authentication")); diff --git a/src/main/java/com/rethinkdb/net/Response.java b/src/main/java/com/rethinkdb/net/Response.java index 311c3b02..2f7f3b0d 100644 --- a/src/main/java/com/rethinkdb/net/Response.java +++ b/src/main/java/com/rethinkdb/net/Response.java @@ -8,6 +8,7 @@ import com.rethinkdb.gen.proto.ResponseType; import com.rethinkdb.model.Backtrace; import com.rethinkdb.model.Profile; +import com.rethinkdb.utils.Internals; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -99,7 +100,7 @@ public static Response readFromSocket(ConnectionSocket socket) { ); } - Map json = Util.readJSON(buffer); + Map json = Internals.readJson(buffer); return new Response( token, ResponseType.fromValue(((Long) json.get("t")).intValue()), diff --git a/src/main/java/com/rethinkdb/net/Result.java b/src/main/java/com/rethinkdb/net/Result.java index f7f02cd4..e5f150e1 100644 --- a/src/main/java/com/rethinkdb/net/Result.java +++ b/src/main/java/com/rethinkdb/net/Result.java @@ -7,6 +7,7 @@ import com.rethinkdb.gen.exc.ReqlRuntimeError; import com.rethinkdb.gen.proto.ResponseType; import com.rethinkdb.model.Profile; +import com.rethinkdb.utils.Internals; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -83,7 +84,7 @@ public enum FetchMode { protected final Query query; protected final Response firstRes; protected final TypeReference typeRef; - protected final Converter.FormatOptions fmt; + protected final Internals.FormatOptions fmt; // can be altered depending on the operation protected FetchMode fetchMode; @@ -107,7 +108,7 @@ public Result(Connection connection, this.firstRes = firstRes; this.fetchMode = fetchMode; this.typeRef = typeRef; - fmt = new Converter.FormatOptions(query.globalOptions); + fmt = new Internals.FormatOptions(query.globalOptions); currentResponse.set(firstRes); handleFirstResponse(); } @@ -240,7 +241,7 @@ public boolean hasNext() { if (next == NIL) { return null; } - return Util.convertToPojo(next, typeRef); + return Internals.toPojo(next, typeRef); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -260,7 +261,7 @@ public boolean hasNext() { if (next == NIL) { return null; } - return Util.convertToPojo(next, typeRef); + return Internals.toPojo(next, typeRef); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -281,7 +282,7 @@ public boolean hasNext() { if (next == NIL) { return null; } - return Util.convertToPojo(next, typeRef); + return Internals.toPojo(next, typeRef); } catch (InterruptedException e) { throw new RuntimeException(e); } finally { @@ -308,7 +309,7 @@ public boolean hasNext() { if (next == NIL) { return null; } - return Util.convertToPojo(next, typeRef); + return Internals.toPojo(next, typeRef); } catch (InterruptedException e) { throw new RuntimeException(e); } finally { @@ -549,8 +550,7 @@ protected void emitData(Response res) { } } lastRequestCount.set(0); - List objects = (List) Converter.convertPseudotypes(res.data, fmt); - for (Object each : objects) { + for (Object each : (List) Internals.convertPseudotypes(res.data, fmt)) { if (connection.unwrapLists && firstRes.type.equals(ResponseType.SUCCESS_ATOM) && each instanceof List) { for (Object o : ((List) each)) { rawQueue.offer(o == null ? NIL : o); diff --git a/src/main/java/com/rethinkdb/net/Util.java b/src/main/java/com/rethinkdb/net/Util.java deleted file mode 100644 index cf97e6ab..00000000 --- a/src/main/java/com/rethinkdb/net/Util.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.rethinkdb.net; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; -import com.rethinkdb.RethinkDB; -import com.rethinkdb.gen.exc.ReqlDriverError; -import com.rethinkdb.utils.Types; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.time.OffsetDateTime; -import java.util.*; - -public class Util { - private static final TypeReference> mapTypeRef = Types.mapOf(String.class, Object.class); - - private Util() {} - - public static Map readJSON(String str) { - try { - return RethinkDB.getInternalMapper().readValue(str, mapTypeRef); - } catch (IOException e) { - throw new ReqlDriverError(e); - } - } - - public static Map readJSON(ByteBuffer buf) { - try { - return RethinkDB.getInternalMapper().readValue( - buf.array(), - buf.arrayOffset() + buf.position(), - buf.remaining(), - mapTypeRef - ); - } catch (IOException e) { - throw new ReqlDriverError(e); - } - } - - @SuppressWarnings("unchecked") - public static T convertToPojo(Object value, TypeReference typeRef) { - if (typeRef != null) { - JavaType type = RethinkDB.getInternalMapper().getTypeFactory().constructType(typeRef); - Class rawClass = (Class) type.getRawClass(); - if (rawClass.isEnum()) { - Enum[] enumConstants = ((Class>) rawClass).getEnumConstants(); - for (Enum enumConst : enumConstants) { - if (enumConst.name().equals(value)) { - return (T) enumConst; - } - } - } else if (rawClass.isAssignableFrom(value.getClass()) && type.containedTypeCount() == 0) { - // class is assignable from value and has no type parameters. - // since the only thing that matches those are primitives, strings and dates, it's safe - return rawClass.cast(value); - } else { - try { - return RethinkDB.getResultMapper().convertValue(value, typeRef); - } catch (Exception e) { - throw new ReqlDriverError("Tried to convert " + value + ", of type " + value.getClass() + ", to " + typeRef.getType() + ", but got " + e, e); - } - } - } - return (T) value; - } -} - - - diff --git a/src/main/java/com/rethinkdb/utils/Internals.java b/src/main/java/com/rethinkdb/utils/Internals.java new file mode 100644 index 00000000..8af8e873 --- /dev/null +++ b/src/main/java/com/rethinkdb/utils/Internals.java @@ -0,0 +1,260 @@ +package com.rethinkdb.utils; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.rethinkdb.RethinkDB; +import com.rethinkdb.ast.ReqlAst; +import com.rethinkdb.gen.ast.*; +import com.rethinkdb.gen.exc.ReqlDriverCompileError; +import com.rethinkdb.gen.exc.ReqlDriverError; +import com.rethinkdb.model.*; + +import java.io.IOException; +import java.lang.reflect.Array; +import java.nio.ByteBuffer; +import java.time.*; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; + +/** + * RethinkDB Common Internals. + * Methods and fields are subject to change at any moment. + */ +public class Internals { + private static final TypeReference> mapTypeRef = Types.mapOf(String.class, Object.class); + private static final ObjectMapper internalMapper = new ObjectMapper() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.USE_LONG_FOR_INTS); + private static final DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX"); + + + public static final String PSEUDOTYPE_KEY = "$reql_type$"; + public static final String TIME = "TIME"; + public static final String GROUPED_DATA = "GROUPED_DATA"; + public static final String GEOMETRY = "GEOMETRY"; + public static final String BINARY = "BINARY"; + + public static int startingDepth = 100; + + private Internals() { + } + + public static ObjectMapper getInternalMapper() { + return internalMapper; + } + + public static Map asBinaryPseudotype(byte[] data) { + return new MapObject() + .with("$reql_type$", BINARY) + .with("data", Base64.getEncoder().encodeToString(data)); + } + + public static Map readJson(ByteBuffer buf) { + try { + return getInternalMapper().readValue( + buf.array(), + buf.arrayOffset() + buf.position(), + buf.remaining(), + mapTypeRef + ); + } catch (IOException e) { + throw new ReqlDriverError(e); + } + } + + public static Map readJson(String str) { + try { + return getInternalMapper().readValue(str, mapTypeRef); + } catch (IOException e) { + throw new ReqlDriverError(e); + } + } + + public static Object convertPseudotypes(Object obj, FormatOptions fmt) { + if (obj instanceof List) { + return ((List) obj).stream() + .map(item -> convertPseudotypes(item, fmt)) + .collect(Collectors.toList()); + } + if (obj instanceof Map) { + Map map = (Map) obj; + if (map.containsKey(PSEUDOTYPE_KEY)) { + return handlePseudotypes(map, fmt); + } + return map.entrySet().stream().collect( + LinkedHashMap::new, + (m, e) -> m.put(e.getKey(), convertPseudotypes(e.getValue(), fmt)), + LinkedHashMap::putAll + ); + } + return obj; + } + + @SuppressWarnings("unchecked") + public static T toPojo(Object value, TypeReference typeRef) { + if (typeRef != null) { + JavaType type = getInternalMapper().getTypeFactory().constructType(typeRef); + Class rawClass = (Class) type.getRawClass(); + if (rawClass.isEnum()) { + Enum[] enumConstants = ((Class>) rawClass).getEnumConstants(); + for (Enum enumConst : enumConstants) { + if (enumConst.name().equals(value)) { + return (T) enumConst; + } + } + } else if (rawClass.isAssignableFrom(value.getClass()) && type.containedTypeCount() == 0) { + // class is assignable from value and has no type parameters. + // since the only thing that matches those are primitives, strings and dates, it's safe + return rawClass.cast(value); + } else { + try { + return RethinkDB.getResultMapper().convertValue(value, typeRef); + } catch (Exception e) { + throw new ReqlDriverError("Tried to convert " + value + ", of type " + value.getClass() + ", to " + typeRef.getType() + ", but got " + e, e); + } + } + } + return (T) value; + } + + public static ReqlAst toReqlAst(Object val) { + return toReqlAst(val, startingDepth); + } + + public static ReqlExpr toReqlExpr(Object val) { + ReqlAst converted = toReqlAst(val); + if (converted instanceof ReqlExpr) { + return (ReqlExpr) converted; + } else { + throw new ReqlDriverError("Cannot convert %s to ReqlExpr", val); + } + } + + private static Object handlePseudotypes(Map value, FormatOptions fmt) { + switch ((String) value.get(PSEUDOTYPE_KEY)) { + case TIME: { + if (fmt.rawTime) { + return value; + } + try { + long epochMillis = (long) (((Number) value.get("epoch_time")).doubleValue() * 1000.0); + return OffsetDateTime.ofInstant(Instant.ofEpochMilli(epochMillis), ZoneOffset.of((String) value.get("timezone"))); + } catch (Exception ex) { + throw new ReqlDriverError("Error handling date", ex); + } + } + case GROUPED_DATA: { + if (fmt.rawGroups) { + return value; + } + return ((List) value.get("data")).stream() + .map(it -> new ArrayList<>((Collection) it)) + .map(it -> new GroupedResult<>(it.remove(0), it)) + .collect(Collectors.toList()); + } + case BINARY: { + if (fmt.rawBinary) { + return value; + } + return Base64.getMimeDecoder().decode((String) value.get("data")); + } + case GEOMETRY: { + // Nothing specific here + return value; + } + } + return value; + } + + private static ReqlAst toReqlAst(Object val, int remainingDepth) { + if (val instanceof ReqlAst) { + return (ReqlAst) val; + } + + if (val == null || val instanceof Number || val instanceof Boolean || val instanceof String) { + return new Datum(val); + } + + if (val instanceof LocalDateTime) { + ZoneId zid = ZoneId.systemDefault(); + DateTimeFormatter fmt2 = fmt.withZone(zid); + return Iso8601.fromString(((LocalDateTime) val).format(fmt2)); + } + + if (val instanceof ZonedDateTime || val instanceof OffsetDateTime) { + return Iso8601.fromString(fmt.format(((Temporal) val))); + } + + Class valClass = val.getClass(); + if (valClass.isEnum()) { + return new Datum(((Enum) val).name()); + } + + if (remainingDepth <= 0) { + throw new ReqlDriverCompileError("Recursion limit reached converting to ReqlAst"); + } + + if (val instanceof ReqlLambda) { + return Func.fromLambda((ReqlLambda) val); + } + + if (val instanceof Collection) { + Arguments innerValues = new Arguments(); + for (Object innerValue : (Collection) val) { + innerValues.add(toReqlAst(innerValue, remainingDepth - 1)); + } + return new MakeArray(innerValues, null); + } + + if (val instanceof Map) { + Map obj = new MapObject<>(); + ((Map) val).forEach((key, value) -> { + if (key.getClass().isEnum()) { + obj.put(((Enum) key).name(), toReqlAst(value, remainingDepth - 1)); + } else if (key instanceof String) { + obj.put((String) key, toReqlAst(value, remainingDepth - 1)); + } else { + throw new ReqlDriverCompileError("Object keys can only be strings"); + } + }); + return MakeObj.fromMap(obj); + } + + if (valClass.isArray()) { + if (val instanceof byte[]) { + return new Binary(((byte[]) val)); + } + Arguments innerValues = new Arguments(); + int length = Array.getLength(val); + for (int i = 0; i < length; i++) { + innerValues.add(toReqlAst(Array.get(val, i))); + } + return new MakeArray(innerValues, null); + } + + // val is a non-null POJO, let's use jackson + return toReqlAst(RethinkDB.getResultMapper().convertValue(val, Map.class), remainingDepth - 1); + } + + public static class FormatOptions { + public final boolean rawTime; + public final boolean rawGroups; + public final boolean rawBinary; + + public FormatOptions(OptArgs args) { + Datum time_format = (Datum) args.get("time_format"); + this.rawTime = time_format != null && "raw".equals(time_format.datum); + + Datum binary_format = (Datum) args.get("binary_format"); + this.rawBinary = binary_format != null && "raw".equals(binary_format.datum); + + Datum group_format = (Datum) args.get("group_format"); + this.rawGroups = group_format != null && "raw".equals(group_format.datum); + } + } +} diff --git a/templates/AstSubclass.java b/templates/AstSubclass.java index 94ccb5ec..e3504839 100644 --- a/templates/AstSubclass.java +++ b/templates/AstSubclass.java @@ -14,14 +14,14 @@ public class ${classname} extends ${superclass} { public ${classname}(Object arg) { this(new Arguments(arg), null); } - public ${classname}(Arguments args){ + public ${classname}(Arguments args) { this(args, null); } public ${classname}(Arguments args, OptArgs optargs) { super(TermType.${term_name}, args, optargs); } %else: - protected ${classname}(TermType termType, Arguments args, OptArgs optargs){ + protected ${classname}(TermType termType, Arguments args, OptArgs optargs) { super(termType, args, optargs); } %endif diff --git a/templates/Enum.java b/templates/Enum.java index a3fdb35c..99c8e949 100644 --- a/templates/Enum.java +++ b/templates/Enum.java @@ -9,7 +9,7 @@ public enum ${classname} { public final ${value_type} value; - private ${classname}(${value_type} value){ + private ${classname}(${value_type} value) { this.value = value; } @@ -19,8 +19,7 @@ public enum ${classname} { case ${val}: return ${classname}.${key}; % endfor default: - throw new IllegalArgumentException(String.format( - "%s is not a legal value for ${classname}", value)); + throw new IllegalArgumentException(String.format("%s is not a legal value for ${classname}", value)); } } diff --git a/templates/TopLevel.java b/templates/TopLevel.java index c1d0cd45..d5656724 100644 --- a/templates/TopLevel.java +++ b/templates/TopLevel.java @@ -6,8 +6,8 @@ import com.rethinkdb.model.MapObject; import com.rethinkdb.gen.ast.Error; import com.rethinkdb.gen.ast.*; -import com.rethinkdb.ast.Util; import com.rethinkdb.gen.exc.ReqlDriverError; +import com.rethinkdb.utils.Internals; import java.util.Arrays; import java.util.ArrayList; @@ -17,7 +17,7 @@ public class TopLevel { public ReqlExpr expr(Object value){ - return Util.toReqlExpr(value); + return Internals.toReqlExpr(value); } public ReqlExpr row(Object... values) { diff --git a/templates/ast/Binary.java b/templates/ast/Binary.java index fb7cfae0..549c0d9d 100644 --- a/templates/ast/Binary.java +++ b/templates/ast/Binary.java @@ -1,7 +1,7 @@ <%inherit file="../AstSubclass.java"/> <%block name="add_imports"> -import com.rethinkdb.net.Converter; +import com.rethinkdb.utils.Internals; import org.jetbrains.annotations.Nullable; @@ -31,8 +31,8 @@ @Override public Object build(){ if (binaryData != null) { - return Converter.toBinary(binaryData); - }else{ + return Internals.asBinaryPseudotype(binaryData); + } else { return super.build(); } } diff --git a/templates/ast/Datum.java b/templates/ast/Datum.java index 9d838d45..583ba874 100644 --- a/templates/ast/Datum.java +++ b/templates/ast/Datum.java @@ -1,13 +1,13 @@ <%inherit file="../AstSubclass.java" /> -<%block name="member_vars"> - public final java.lang.Object datum; +<%block name="member_vars">\ + public final java.lang.Object datum; + <%block name="constructors"> public Datum(java.lang.Object arg) { super(TermType.DATUM, null, null); datum = arg; - } - + } <%block name="static_factories"/> diff --git a/templates/ast/Func.java b/templates/ast/Func.java index a68060c8..ed7eeba8 100644 --- a/templates/ast/Func.java +++ b/templates/ast/Func.java @@ -2,7 +2,7 @@ <%block name="add_imports"> import com.rethinkdb.model.ReqlLambda; -import com.rethinkdb.ast.Util; +import com.rethinkdb.utils.Internals; import java.util.concurrent.atomic.AtomicInteger; import java.util.Arrays; import java.util.List; @@ -25,12 +25,11 @@ protected Func(Arguments args){ <%block name="static_factories">\ public static Func fromLambda(ReqlLambda function) { - if(function instanceof ReqlFunction0) { - return new Func(Arguments.make(new MakeArray(Arrays.asList()), - Util.toReqlAst(((ReqlFunction0) function).apply()))); + if (function instanceof ReqlFunction0) { + return new Func(Arguments.make(new MakeArray(Arrays.asList()), Internals.toReqlAst(((ReqlFunction0) function).apply()))); } % for i in range(1, max_arity+1): - else if(function instanceof ReqlFunction${i}){ + else if (function instanceof ReqlFunction${i}) { ReqlFunction${i} func${i} = (ReqlFunction${i}) function; % for j in range(1, i+1): int var${j} = nextVarId(); @@ -40,9 +39,7 @@ else if(function instanceof ReqlFunction${i}){ Object appliedFunction = func${i}.apply( ${", ".join("new Var(var%s)"%(j,) for j in range(1, j+1))} ); - return new Func(Arguments.make( - new MakeArray(varIds), - Util.toReqlAst(appliedFunction))); + return new Func(Arguments.make(new MakeArray(varIds), Internals.toReqlAst(appliedFunction))); } % endfor else { diff --git a/templates/ast/Funcall.java b/templates/ast/Funcall.java index a35aadc3..42ef6eff 100644 --- a/templates/ast/Funcall.java +++ b/templates/ast/Funcall.java @@ -2,8 +2,7 @@ <%block name="special_methods"> @Override - protected Object build() - { + protected Object build() { /* This object should be constructed with arguments first, and the function itself as the last parameter. This makes it easier for diff --git a/templates/ast/MakeObj.java b/templates/ast/MakeObj.java index ca9a9e51..5644c593 100644 --- a/templates/ast/MakeObj.java +++ b/templates/ast/MakeObj.java @@ -3,21 +3,21 @@ public MakeObj(Object arg) { this(new Arguments(arg), null); } - public MakeObj(OptArgs opts){ + public MakeObj(OptArgs opts) { this(new Arguments(), opts); } - public MakeObj(Arguments args){ + public MakeObj(Arguments args) { this(args, null); } public MakeObj(Arguments args, OptArgs optargs) { this(TermType.MAKE_OBJ, args, optargs); } - protected MakeObj(TermType termType, Arguments args, OptArgs optargs){ + protected MakeObj(TermType termType, Arguments args, OptArgs optargs) { super(termType, args, optargs); } <%block name="special_methods">\ - public static MakeObj fromMap(java.util.Map map){ + public static MakeObj fromMap(java.util.Map map) { return new MakeObj(OptArgs.fromMap(map)); }